[Libreoffice-commits] .: embeddedobj/inc embeddedobj/Library_embobj.mk embeddedobj/Library_emboleobj.mk embeddedobj/Makefile embeddedobj/Module_embeddedobj.mk embeddedobj/prj embeddedobj/source embeddedobj/util Makefile postprocess/packcomponents Repository.mk RepositoryModule_ooo.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_regression_test.mk
Matus Kukan
mkukan at kemper.freedesktop.org
Thu Mar 1 11:56:34 PST 2012
Makefile | 2
Repository.mk | 2
RepositoryModule_ooo.mk | 1
embeddedobj/Library_embobj.mk | 65 +++++++++++
embeddedobj/Library_emboleobj.mk | 89 ++++++++++++++++
embeddedobj/Makefile | 7 +
embeddedobj/Module_embeddedobj.mk | 35 ++++++
embeddedobj/inc/makefile.mk | 39 -------
embeddedobj/prj/build.lst | 7 -
embeddedobj/prj/d.lst | 8 -
embeddedobj/prj/l10n | 1
embeddedobj/prj/makefile.mk | 1
embeddedobj/source/commonembedding/makefile.mk | 56 ----------
embeddedobj/source/general/makefile.mk | 60 -----------
embeddedobj/source/msole/exports.dxp | 1
embeddedobj/source/msole/makefile.mk | 136 -------------------------
embeddedobj/util/exports.dxp | 1
embeddedobj/util/makefile.mk | 95 -----------------
postprocess/packcomponents/makefile.mk | 8 +
sc/CppunitTest_sc_filters_test.mk | 5
sc/CppunitTest_sc_subsequent_filters_test.mk | 5
sd/CppunitTest_sd_filters_test.mk | 5
sd/CppunitTest_sd_regression_test.mk | 5
23 files changed, 212 insertions(+), 422 deletions(-)
New commits:
commit d76e2d1cc396d0f1f57a0ba774be4194d8bf3459
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Feb 29 11:39:38 2012 +0100
embeddedobj: convert to gbuild
diff --git a/Makefile b/Makefile
index e9a1880..1739a10 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,7 @@ desktop\
drawinglayer\
dtrans\
editeng\
+embeddedobj\
eventattacher\
extensions\
fileaccess\
@@ -152,7 +153,6 @@ crashrep\
ct2n\
curl\
dictionaries \
-embeddedobj\
embedserv\
epm\
expat\
diff --git a/Repository.mk b/Repository.mk
index 9e7907a..a18cff9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -354,6 +354,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
deploymentgui \
dict_ja \
dict_zh \
+ embobj \
+ emboleobj \
fileacc \
index_data \
java_uno_accessbridge \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 28378aa..cca8623 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
drawinglayer \
dtrans \
editeng \
+ embeddedobj \
eventattacher \
extensions \
fileaccess \
diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk
new file mode 100644
index 0000000..b820eb6
--- /dev/null
+++ b/embeddedobj/Library_embobj.mk
@@ -0,0 +1,65 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,embobj))
+
+$(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj))
+
+$(eval $(call gb_Library_set_include,embobj,\
+ -I$(SRCDIR)/embeddedobj/source/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,embobj,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,embobj,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,embobj,\
+ embeddedobj/source/commonembedding/embedobj \
+ embeddedobj/source/commonembedding/inplaceobj \
+ embeddedobj/source/commonembedding/miscobj \
+ embeddedobj/source/commonembedding/persistence \
+ embeddedobj/source/commonembedding/register \
+ embeddedobj/source/commonembedding/specialobject \
+ embeddedobj/source/commonembedding/visobj \
+ embeddedobj/source/commonembedding/xfactory \
+ embeddedobj/source/general/docholder \
+ embeddedobj/source/general/dummyobject \
+ embeddedobj/source/general/intercept \
+ embeddedobj/source/general/xcreator \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/embeddedobj/Library_emboleobj.mk b/embeddedobj/Library_emboleobj.mk
new file mode 100644
index 0000000..4889693
--- /dev/null
+++ b/embeddedobj/Library_emboleobj.mk
@@ -0,0 +1,89 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,emboleobj))
+
+ifeq ($(OS),WNT)
+emboleobj_suffix := .windows
+else
+emboleobj_suffix :=
+endif
+
+$(eval $(call gb_Library_set_componentfile,emboleobj,embeddedobj/source/msole/emboleobj$(emboleobj_suffix)))
+
+$(eval $(call gb_Library_set_include,emboleobj,\
+ -I$(SRCDIR)/embeddedobj/source/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,emboleobj,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,emboleobj,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,emboleobj,\
+ embeddedobj/source/msole/closepreventer \
+ embeddedobj/source/msole/oleembed \
+ embeddedobj/source/msole/olemisc \
+ embeddedobj/source/msole/olepersist \
+ embeddedobj/source/msole/oleregister \
+ embeddedobj/source/msole/olevisual \
+ embeddedobj/source/msole/ownview \
+ embeddedobj/source/msole/xolefactory \
+))
+
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Library_add_linked_libs,emboleobj,\
+ embobj \
+ gdi32 \
+ ole32 \
+ oleaut32 \
+ uuid \
+))
+
+$(eval $(call gb_Library_add_exception_objects,emboleobj,\
+ embeddedobj/source/msole/advisesink \
+ embeddedobj/source/msole/graphconvert \
+ embeddedobj/source/msole/olecomponent \
+ embeddedobj/source/msole/olewrapclient \
+ embeddedobj/source/msole/xdialogcreator \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/embeddedobj/Makefile b/embeddedobj/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/embeddedobj/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/embeddedobj/Module_embeddedobj.mk b/embeddedobj/Module_embeddedobj.mk
new file mode 100644
index 0000000..5e811da
--- /dev/null
+++ b/embeddedobj/Module_embeddedobj.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,embeddedobj))
+
+$(eval $(call gb_Module_add_targets,embeddedobj,\
+ Library_embobj \
+ Library_emboleobj \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/embeddedobj/inc/makefile.mk b/embeddedobj/inc/makefile.mk
deleted file mode 100755
index 060094c..0000000
--- a/embeddedobj/inc/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=embeddedobj
-TARGET=embeddedobj
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/embeddedobj/prj/build.lst b/embeddedobj/prj/build.lst
index af0d8e1..eed683e 100644
--- a/embeddedobj/prj/build.lst
+++ b/embeddedobj/prj/build.lst
@@ -1,7 +1,2 @@
eo embeddedobj : offapi sal cppu cppuhelper comphelper tools unotools LIBXSLT:libxslt NULL
-eo embeddedobj usr1 - all eo_mkout NULL
-eo embeddedobj\inc nmake - all eo_inc NULL
-eo embeddedobj\source\commonembedding nmake - all eo_commonembed eo_inc NULL
-eo embeddedobj\source\general nmake - all eo_general eo_inc NULL
-eo embeddedobj\util nmake - all eo_util eo_commonembed eo_general eo_inc NULL
-eo embeddedobj\source\msole nmake - all eo_msole eo_util eo_inc NULL
+eo embeddedobj\prj nmake - all eo_prj NULL
diff --git a/embeddedobj/prj/d.lst b/embeddedobj/prj/d.lst
index 551439c..e69de29 100644
--- a/embeddedobj/prj/d.lst
+++ b/embeddedobj/prj/d.lst
@@ -1,8 +0,0 @@
-mkdir: %_DEST%\xml\registry\spool
-..\%__SRC%\misc\*.map %_DEST%\bin\*.map
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\dtd\*.dtd %_DEST%\bin\*.*
-..\%__SRC%\misc\embobj.component %_DEST%\xml\embobj.component
-..\%__SRC%\misc\emboleobj.component %_DEST%\xml\emboleobj.component
diff --git a/embeddedobj/prj/l10n b/embeddedobj/prj/l10n
deleted file mode 100755
index 69f0d9e..0000000
--- a/embeddedobj/prj/l10n
+++ /dev/null
@@ -1 +0,0 @@
-#i49922# In this module en-US and de are used as source language
diff --git a/embeddedobj/prj/makefile.mk b/embeddedobj/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/embeddedobj/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/embeddedobj/source/commonembedding/makefile.mk b/embeddedobj/source/commonembedding/makefile.mk
deleted file mode 100755
index d731b72..0000000
--- a/embeddedobj/source/commonembedding/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=embeddedobj
-TARGET=commonembed
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-LIBTARGET=NO
-USE_DEFFILE=NO
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/register.obj\
- $(SLO)$/xfactory.obj\
- $(SLO)$/miscobj.obj\
- $(SLO)$/embedobj.obj\
- $(SLO)$/specialobject.obj\
- $(SLO)$/persistence.obj\
- $(SLO)$/inplaceobj.obj\
- $(SLO)$/visobj.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/embeddedobj/source/general/makefile.mk b/embeddedobj/source/general/makefile.mk
deleted file mode 100755
index 2aab057..0000000
--- a/embeddedobj/source/general/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=embeddedobj
-TARGET=embedobj
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-LIBTARGET=NO
-USE_DEFFILE=NO
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/xcreator.obj\
- $(SLO)$/docholder.obj\
- $(SLO)$/dummyobject.obj\
- $(SLO)$/intercept.obj
-
-
-EXCEPTIONSFILES= \
- $(SLO)$/xcreator.obj\
- $(SLO)$/docholder.obj\
- $(SLO)$/dummyobject.obj\
- $(SLO)$/intercept.obj
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/embeddedobj/source/msole/exports.dxp b/embeddedobj/source/msole/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/embeddedobj/source/msole/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk
deleted file mode 100755
index 0912147..0000000
--- a/embeddedobj/source/msole/makefile.mk
+++ /dev/null
@@ -1,136 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=embeddedobj
-TARGET=emboleobj
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# .IF "$(DISABLE_ATL)"==""
-
-LIBTARGET=NO
-USE_DEFFILE=YES
-
-# --- Files --------------------------------------------------------
-
-SHL1TARGET= $(TARGET)
-
-SHL1IMPLIB= i$(TARGET)
-
-SLOFILES = \
- $(SLO)$/closepreventer.obj\
- $(SLO)$/oleregister.obj\
- $(SLO)$/xolefactory.obj\
- $(SLO)$/olepersist.obj\
- $(SLO)$/oleembed.obj\
- $(SLO)$/olevisual.obj\
- $(SLO)$/olemisc.obj\
- $(SLO)$/ownview.obj
-
-EXCEPTIONSFILES= \
- $(SLO)$/closepreventer.obj\
- $(SLO)$/oleregister.obj\
- $(SLO)$/xolefactory.obj\
- $(SLO)$/olepersist.obj\
- $(SLO)$/oleembed.obj\
- $(SLO)$/olevisual.obj\
- $(SLO)$/olemisc.obj\
- $(SLO)$/ownview.obj
-
-.IF "$(GUI)"=="WNT"
-
-SLOFILES += \
- $(SLO)$/graphconvert.obj\
- $(SLO)$/olecomponent.obj\
- $(SLO)$/olewrapclient.obj\
- $(SLO)$/xdialogcreator.obj\
- $(SLO)$/advisesink.obj
-
-EXCEPTIONSFILES += \
- $(SLO)$/graphconvert.obj\
- $(SLO)$/olecomponent.obj\
- $(SLO)$/olewrapclient.obj\
- $(SLO)$/xdialogcreator.obj\
- $(SLO)$/advisesink.obj
-
-.ENDIF
-
-SHL1OBJS= $(SLOFILES)
-
-SHL1STDLIBS=\
- $(UNOTOOLSLIB)\
- $(SALLIB)\
- $(CPPULIB)\
- $(CPPUHELPERLIB)\
- $(COMPHELPERLIB)\
- $(TOOLSLIB)
-
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="GCC"
-EMBOBJLIB=-lembobj
-.ELSE
-EMBOBJLIB=iembobj.lib
-.ENDIF
-
-SHL1STDLIBS+=\
- $(EMBOBJLIB)\
- $(OLE32LIB)\
- $(GDI32LIB)\
- $(UUIDLIB)\
- $(OLEAUT32LIB)
-
-DEF1EXPORTFILE= exports.dxp
-
-.ENDIF
-
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-
-# .ENDIF
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/emboleobj.component
-
-.IF "$(OS)" == "WNT"
-my_platform = .windows
-.END
-
-$(MISC)/emboleobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- emboleobj.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt emboleobj$(my_platform).component
diff --git a/embeddedobj/util/exports.dxp b/embeddedobj/util/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/embeddedobj/util/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/embeddedobj/util/makefile.mk b/embeddedobj/util/makefile.mk
deleted file mode 100755
index c70009b..0000000
--- a/embeddedobj/util/makefile.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=embeddedobj
-TARGET=embobj
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-LIB1OBJFILES= \
- $(SLO)$/miscobj.obj\
- $(SLO)$/specialobject.obj\
- $(SLO)$/persistence.obj\
- $(SLO)$/embedobj.obj\
- $(SLO)$/inplaceobj.obj\
- $(SLO)$/visobj.obj\
- $(SLO)$/dummyobject.obj\
- $(SLO)$/xcreator.obj\
- $(SLO)$/xfactory.obj\
- $(SLO)$/register.obj\
- $(SLO)$/docholder.obj\
- $(SLO)$/intercept.obj
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-
-SHL1TARGET= $(TARGET)
-
-SHL1STDLIBS=\
- $(SALLIB)\
- $(CPPULIB)\
- $(COMPHELPERLIB)\
- $(CPPUHELPERLIB)
-
-SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)
-
-SHL1LIBS= $(LIB1TARGET)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \
- $(LIB1TARGET)
-
-DEFLIB1NAME=$(TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-# --- Targets -------------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
- @echo ------------------------------
- @echo CLEAR_THE_FILE > $@
- @echo __CT >>$@
-
-
-ALLTAR : $(MISC)/embobj.component
-
-$(MISC)/embobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- embobj.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt embobj.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 2e85057..c46ceab 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -52,6 +52,7 @@ my_components = \
component/dbaccess/util/dbu \
component/dbaccess/util/sdbt \
component/dtrans/util/mcnttype \
+ component/embeddedobj/util/embobj \
component/eventattacher/source/evtatt \
component/fileaccess/source/fileacc \
component/filter/source/config/cache/filterconfig1 \
@@ -144,7 +145,6 @@ my_components = \
dbase \
dbpool2 \
dbtools \
- embobj \
flat \
localebe1 \
mysql \
@@ -204,7 +204,11 @@ my_components += component/desktop/unx/splash/splash
.ENDIF
.IF "$(DISABLE_ATL)" == ""
-my_components += emboleobj
+.IF "$(OS)" == "WNT"
+my_components += component/embeddedobj/source/msole/emboleobj.windows
+.ELSE
+my_components += component/embeddedobj/source/msole/emboleobj
+.ENDIF
.END
.IF "$(DISABLE_NEON)" != "TRUE"
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 32f7d47..ae6d7ac 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -94,6 +94,7 @@ $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
+ embeddedobj/util/embobj \
eventattacher/source/evtatt \
fileaccess/source/fileacc \
filter/source/config/cache/filterconfig1 \
@@ -121,10 +122,6 @@ $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_filters_test,\
- embobj \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_filters_test,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 77d47bd..e36f58c 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_CppunitTest_add_components,sc_subsequent_filters_test,\
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
+ embeddedobj/util/embobj \
eventattacher/source/evtatt \
fileaccess/source/fileacc \
filter/source/config/cache/filterconfig1 \
@@ -131,10 +132,6 @@ $(eval $(call gb_CppunitTest_add_components,sc_subsequent_filters_test,\
endif
endif
-$(eval $(call gb_CppunitTest_add_old_components,sc_subsequent_filters_test,\
- embobj \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_subsequent_filters_test,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 12f3048..1933439 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
+ embeddedobj/util/embobj \
fileaccess/source/fileacc \
filter/source/config/cache/filterconfig1 \
framework/util/fwk \
@@ -110,10 +111,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sd_filters_test,\
- embobj \
-))
-
$(eval $(call gb_CppunitTest_set_args,sd_filters_test,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index ee42c72..2e35f5d 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_CppunitTest_add_components,sd_regression_test,\
configmgr/source/configmgr \
dbaccess/util/dba \
desktop/source/deployment/deployment \
+ embeddedobj/util/embobj \
fileaccess/source/fileacc \
filter/source/config/cache/filterconfig1 \
filter/source/svg/svgfilter \
@@ -121,10 +122,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_regression_test,\
xmlsecurity/util/xmlsecurity \
))
-$(eval $(call gb_CppunitTest_add_old_components,sd_regression_test,\
- embobj \
-))
-
$(eval $(call gb_CppunitTest_set_args,sd_regression_test,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
More information about the Libreoffice-commits
mailing list