Port main/embeddedobj to gbuild.

Patch by: me

Port main/embeddedobj to gbuild.
Patch by: me
b3ac276a · Damjan Jovanovic · ba822272 · b3ac276a · b3ac276a · b3ac276a
Kaydet (Commit) b3ac276a authored Ara 10, 2016 tarafından Damjan Jovanovic
11 changed files
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
    dbaccess \
    drawinglayer \
    editeng \
+    embeddedobj \
    eventattacher \
    fileaccess \
    formula \

--- a/Repository.mk
+++ b/Repository.mk
@@ -61,6 +61,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
    drawinglayer \
    svgio \
    editeng \
+    embobj \
+    emboleobj \
    evtatt \
    file \
    fileacc \

--- a/embeddedobj/util/makefile.mk
+++ b/embeddedobj/util/makefile.mk
@@ -21,73 +21,45 @@
-PRJ=..
+$(eval $(call gb_Library_Library,embobj))
-PRJNAME=embeddedobj
+$(eval $(call gb_Library_add_precompiled_header,embobj,$(SRCDIR)/embeddedobj/inc/pch/precompiled_embeddedobj))
-TARGET=embobj
-#LIBTARGET=NO
+$(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj))
-#USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_Library_set_include,embobj,\
+        $$(INCLUDE) \
-# --- Settings -----------------------------------------------------------
+	-I$(SRCDIR)/embeddedobj/inc/pch \
+	-I$(SRCDIR)/embeddedobj/source/inc \
-.INCLUDE :  settings.mk
+))
-# --- Files --------------------------------------------------------
+$(eval $(call gb_Library_add_api,embobj,\
+	offapi \
-LIB1OBJFILES= \
+	udkapi \
-        $(SLO)$/miscobj.obj\
+))
-        $(SLO)$/specialobject.obj\
-        $(SLO)$/persistence.obj\
+$(eval $(call gb_Library_add_linked_libs,embobj,\
-        $(SLO)$/embedobj.obj\
+	comphelper \
-        $(SLO)$/inplaceobj.obj\
+	cppu \
-        $(SLO)$/visobj.obj\
+	cppuhelper \
-        $(SLO)$/dummyobject.obj\
+	sal \
-        $(SLO)$/xcreator.obj\
+	stl \
-        $(SLO)$/xfactory.obj\
+	$(gb_STDLIBS) \
-        $(SLO)$/register.obj\
+))
-        $(SLO)$/docholder.obj\
-        $(SLO)$/intercept.obj
+$(eval $(call gb_Library_add_exception_objects,embobj,\
+	embeddedobj/source/commonembedding/miscobj \
-LIB1TARGET=$(SLB)$/$(TARGET).lib
+	embeddedobj/source/commonembedding/specialobject \
+	embeddedobj/source/commonembedding/persistence \
-SHL1TARGET= $(TARGET)
+	embeddedobj/source/commonembedding/embedobj \
+	embeddedobj/source/commonembedding/inplaceobj \
-SHL1STDLIBS=\
+	embeddedobj/source/commonembedding/visobj \
-    $(SALLIB)\
+	embeddedobj/source/general/dummyobject \
-    $(CPPULIB)\
+	embeddedobj/source/general/xcreator \
-    $(COMPHELPERLIB)\
+	embeddedobj/source/commonembedding/xfactory \
-    $(CPPUHELPERLIB)
+	embeddedobj/source/commonembedding/register \
+	embeddedobj/source/general/docholder \
-SHL1DEPN=
+	embeddedobj/source/general/intercept \
-SHL1IMPLIB= i$(TARGET)
+))
-SHL1LIBS=	$(LIB1TARGET)
+# vim: set noet sw=4 ts=4:
-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
--- a/embeddedobj/Library_emboleobj.mk
+++ b/embeddedobj/Library_emboleobj.mk
+#**************************************************************
+#  
+#  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:
--- a/embeddedobj/source/commonembedding/makefile.mk
+++ b/embeddedobj/source/commonembedding/makefile.mk
@@ -19,34 +19,14 @@
 #  
 #**************************************************************
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-PRJ=..$/..
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-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
+# vim: set noet sw=4 ts=4:
--- a/embeddedobj/source/general/makefile.mk
+++ b/embeddedobj/source/general/makefile.mk
@@ -21,36 +21,11 @@
-PRJ=..$/..
+$(eval $(call gb_Module_Module,embeddedobj))
-PRJNAME=embeddedobj
+$(eval $(call gb_Module_add_targets,embeddedobj,\
-TARGET=embedobj
+	Library_embobj \
+	Library_emboleobj \
+))
-# --- 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
+# vim: set noet sw=4 ts=4:
--- a/embeddedobj/prj/build.lst
+++ b/embeddedobj/prj/build.lst
 eo	embeddedobj	:	offapi sal cppu cppuhelper comphelper tools unotools vos LIBXSLT:libxslt NULL
-eo	embeddedobj									usr1	-	all	eo_mkout NULL
+eo	embeddedobj\prj									nmake	-	all	eo_prj 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
--- a/embeddedobj/prj/d.lst
+++ b/embeddedobj/prj/d.lst
-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
--- a/embeddedobj/inc/makefile.mk
+++ b/embeddedobj/inc/makefile.mk
@@ -20,24 +20,25 @@
 #**************************************************************
-PRJ=..
-PRJNAME=embeddedobj
-TARGET=embeddedobj
-# --- Settings -----------------------------------------------------
-.INCLUDE :  settings.mk
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-.INCLUDE :  target.mk
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-.ENDIF			# "$(ENABLE_PCH)"!=""
+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
--- a/embeddedobj/source/msole/makefile.mk
+++ b/embeddedobj/source/msole/makefile.mk
-#**************************************************************
-#  
-#  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=..$/..
-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)\
-    $(VOSLIB)\
-    $(CPPULIB)\
-    $(CPPUHELPERLIB)\
-    $(COMPHELPERLIB)\
-    $(TOOLSLIB)
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
-.IF "$(COM)"=="GCC"
-EMBOBJLIB=-lembobj
-.ELSE
-EMBOBJLIB=iembobj.lib
-.ENDIF
-SHL1STDLIBS+=\
-    $(EMBOBJLIB)\
-    $(OLE32LIB)\
-    $(GDI32LIB)\
-    $(UUIDLIB)\
-    $(OLEAUT32LIB)
-DEF1EXPORTFILE=	exports.dxp
-.ELIF "$(GUI)"=="OS2"
-SHL1STDLIBS+=\
-    iembobj.lib
-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
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -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