Author: damjan
Date: Sat Dec 10 08:18:48 2016
New Revision: 1773502
URL: http://svn.apache.org/viewvc?rev=1773502&view=rev
Log:
Port main/embeddedobj to gbuild.
Patch by: me
Added:
openoffice/trunk/main/embeddedobj/Library_embobj.mk
openoffice/trunk/main/embeddedobj/Library_emboleobj.mk
openoffice/trunk/main/embeddedobj/Makefile (with props)
openoffice/trunk/main/embeddedobj/Module_embeddedobj.mk
openoffice/trunk/main/embeddedobj/prj/makefile.mk
Removed:
openoffice/trunk/main/embeddedobj/inc/makefile.mk
openoffice/trunk/main/embeddedobj/source/commonembedding/makefile.mk
openoffice/trunk/main/embeddedobj/source/general/makefile.mk
openoffice/trunk/main/embeddedobj/source/msole/makefile.mk
openoffice/trunk/main/embeddedobj/util/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/embeddedobj/prj/build.lst
openoffice/trunk/main/embeddedobj/prj/d.lst
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1773502&r1=1773501&r2=1773502&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Sat Dec 10 08:18:48 2016
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_moduledirs,o
dbaccess \
drawinglayer \
editeng \
+ embeddedobj \
eventattacher \
fileaccess \
formula \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1773502&r1=1773501&r2=1773502&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Sat Dec 10 08:18:48 2016
@@ -61,6 +61,8 @@ $(eval $(call gb_Helper_register_librari
drawinglayer \
svgio \
editeng \
+ embobj \
+ emboleobj \
evtatt \
file \
fileacc \
Added: openoffice/trunk/main/embeddedobj/Library_embobj.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/embeddedobj/Library_embobj.mk?rev=1773502&view=auto
==============================================================================
--- openoffice/trunk/main/embeddedobj/Library_embobj.mk (added)
+++ openoffice/trunk/main/embeddedobj/Library_embobj.mk Sat Dec 10 08:18:48 2016
@@ -0,0 +1,65 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,embobj))
+
+$(eval $(call
gb_Library_add_precompiled_header,embobj,$(SRCDIR)/embeddedobj/inc/pch/precompiled_embeddedobj))
+
+$(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj))
+
+$(eval $(call gb_Library_set_include,embobj,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/embeddedobj/inc/pch \
+ -I$(SRCDIR)/embeddedobj/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,embobj,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,embobj,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,embobj,\
+ embeddedobj/source/commonembedding/miscobj \
+ embeddedobj/source/commonembedding/specialobject \
+ embeddedobj/source/commonembedding/persistence \
+ embeddedobj/source/commonembedding/embedobj \
+ embeddedobj/source/commonembedding/inplaceobj \
+ embeddedobj/source/commonembedding/visobj \
+ embeddedobj/source/general/dummyobject \
+ embeddedobj/source/general/xcreator \
+ embeddedobj/source/commonembedding/xfactory \
+ embeddedobj/source/commonembedding/register \
+ embeddedobj/source/general/docholder \
+ embeddedobj/source/general/intercept \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/embeddedobj/Library_emboleobj.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/embeddedobj/Library_emboleobj.mk?rev=1773502&view=auto
==============================================================================
--- openoffice/trunk/main/embeddedobj/Library_emboleobj.mk (added)
+++ openoffice/trunk/main/embeddedobj/Library_emboleobj.mk Sat Dec 10 08:18:48
2016
@@ -0,0 +1,94 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,emboleobj))
+
+$(eval $(call
gb_Library_add_precompiled_header,emboleobj,$(SRCDIR)/embeddedobj/inc/pch/precompiled_embeddedobj))
+
+ifeq ($(OS),WNT)
+$(eval $(call
gb_Library_set_componentfile,emboleobj,embeddedobj/source/msole/emboleobj.windows))
+else
+$(eval $(call
gb_Library_set_componentfile,emboleobj,embeddedobj/source/msole/emboleobj))
+endif
+
+$(eval $(call gb_Library_set_include,emboleobj,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/embeddedobj/inc/pch \
+ -I$(SRCDIR)/embeddedobj/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,emboleobj,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,emboleobj,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ stl \
+ tl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,emboleobj,\
+ gdi32 \
+ ole32 \
+ oleaut32 \
+ uuid \
+))
+else ifeq ($(OS),OS2)
+$(eval $(call gb_Library_add_linked_libs,emboleobj,\
+ gdi32 \
+ ole32 \
+ oleaut32 \
+ uuid \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,emboleobj,\
+ embeddedobj/source/msole/closepreventer \
+ embeddedobj/source/msole/oleregister \
+ embeddedobj/source/msole/xolefactory \
+ embeddedobj/source/msole/olepersist \
+ embeddedobj/source/msole/oleembed \
+ embeddedobj/source/msole/olevisual \
+ embeddedobj/source/msole/olemisc \
+ embeddedobj/source/msole/ownview \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_exception_objects,emboleobj,\
+ embeddedobj/source/msole/graphconvert \
+ embeddedobj/source/msole/olecomponent \
+ embeddedobj/source/msole/olewrapclient \
+ embeddedobj/source/msole/xdialogcreator \
+ embeddedobj/source/msole/advisesink \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/embeddedobj/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/embeddedobj/Makefile?rev=1773502&view=auto
==============================================================================
--- openoffice/trunk/main/embeddedobj/Makefile (added)
+++ openoffice/trunk/main/embeddedobj/Makefile Sat Dec 10 08:18:48 2016
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Propchange: openoffice/trunk/main/embeddedobj/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/embeddedobj/Module_embeddedobj.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/embeddedobj/Module_embeddedobj.mk?rev=1773502&view=auto
==============================================================================
--- openoffice/trunk/main/embeddedobj/Module_embeddedobj.mk (added)
+++ openoffice/trunk/main/embeddedobj/Module_embeddedobj.mk Sat Dec 10 08:18:48
2016
@@ -0,0 +1,31 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,embeddedobj))
+
+$(eval $(call gb_Module_add_targets,embeddedobj,\
+ Library_embobj \
+ Library_emboleobj \
+))
+
+# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/embeddedobj/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/embeddedobj/prj/build.lst?rev=1773502&r1=1773501&r2=1773502&view=diff
==============================================================================
--- openoffice/trunk/main/embeddedobj/prj/build.lst (original)
+++ openoffice/trunk/main/embeddedobj/prj/build.lst Sat Dec 10 08:18:48 2016
@@ -1,7 +1,2 @@
eo embeddedobj : offapi sal cppu cppuhelper comphelper tools
unotools vos 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
Modified: openoffice/trunk/main/embeddedobj/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/embeddedobj/prj/d.lst?rev=1773502&r1=1773501&r2=1773502&view=diff
==============================================================================
--- openoffice/trunk/main/embeddedobj/prj/d.lst (original)
+++ openoffice/trunk/main/embeddedobj/prj/d.lst Sat Dec 10 08:18:48 2016
@@ -1,8 +0,0 @@
-mkdir: %_DEST%\xml%_EXT%\registry\spool
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\dtd\*.dtd %_DEST%\bin%_EXT%\*.*
-..\%__SRC%\misc\embobj.component %_DEST%\xml%_EXT%\embobj.component
-..\%__SRC%\misc\emboleobj.component %_DEST%\xml%_EXT%\emboleobj.component
Added: openoffice/trunk/main/embeddedobj/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/embeddedobj/prj/makefile.mk?rev=1773502&view=auto
==============================================================================
--- openoffice/trunk/main/embeddedobj/prj/makefile.mk (added)
+++ openoffice/trunk/main/embeddedobj/prj/makefile.mk Sat Dec 10 08:18:48 2016
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
$(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1773502&r1=1773501&r2=1773502&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Sat Dec 10
08:18:48 2016
@@ -72,6 +72,7 @@ my_components = \
component/dbaccess/util/dba \
component/dbaccess/util/dbu \
component/dbaccess/util/sdbt \
+ component/embeddedobj/util/embobj \
component/eventattacher/source/evtatt \
component/fileaccess/util/fileacc \
component/formula/util/for \
@@ -132,7 +133,6 @@ my_components = \
deployment \
deploymentgui \
dlgprov \
- embobj \
filterconfig1 \
flash \
flat \
@@ -239,7 +239,9 @@ my_components += spell
my_components += wpft
.END
-.IF "$(DISABLE_ATL)" == ""
+.IF "$(OS)" == "WNT"
+my_components += emboleobj.windows
+.ELSE
my_components += emboleobj
.END
