Port main/udm to gbuild.

Patch by: me

9 files changed, 112 insertions, 108 deletions

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 069d07b540fd..4a2bde9f7578 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     uui \
     vbahelper \
     vcl \
+    udm \
     wizards \
     writerfilter \
     x11_extensions \
diff --git a/Repository.mk b/Repository.mk
index 26ca124efd11..5210cff67266 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -193,6 +193,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     ooopathutils \
     salcpprt \
     vclmain \
+    udm \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/udm/Makefile b/udm/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/udm/Makefile
@@ -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:
diff --git a/udm/source/html/makefile.mk b/udm/Module_udm.mk
index 440af1088b06..c352236495c0 100644
--- a/udm/source/html/makefile.mk
+++ b/udm/Module_udm.mk
@@ -21,32 +21,11 @@
 
 
 
-PRJ=..$/..
-
-PRJNAME=udm
-TARGET=csi_html
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/htmlitem.obj	
-
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
+$(eval $(call gb_Module_Module,udm))
 
+$(eval $(call gb_Module_add_targets,udm,\
+	Package_inc \
+	StaticLibrary_udm \
+))
 
+# vim: set noet sw=4 ts=4:
diff --git a/udm/source/mkinc/fullcpp.mk b/udm/Package_inc.mk
index a5bece75315e..e66f107f00d4 100644
--- a/udm/source/mkinc/fullcpp.mk
+++ b/udm/Package_inc.mk
@@ -21,36 +21,7 @@
 
 
 
+$(eval $(call gb_Package_Package,udm_inc,$(SRCDIR)/udm/inc/udm))
 
-
-# --- Settings -----------------------------------------------------
-# Has to be included AFTER settings.mk !
-
-
-# Precompiled header:
-
-
-.IF "$(GUI)"=="WNT"
-
-# RTTI
-CFLAGS+= -GR
-
-.IF "$(NP_LOCALBUILD)"!=""
-
-
-# Precompiled Headers
-PCH_NAME=  udm
-.IF "$(DBG_LEVEL)"<"2"
-CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
-.ELSE
-CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBUILD
-.ENDIF
-
-.ENDIF
-
-.ENDIF
-
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-CFLAGSCXX+= -frtti
-.ENDIF
-
+$(eval $(call gb_Package_add_file,udm_inc,inc/udm/html/htmlitem.hxx,html/htmlitem.hxx))
+$(eval $(call gb_Package_add_file,udm_inc,inc/udm/xml/xmlitem.hxx,xml/xmlitem.hxx))
diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk
new file mode 100644
index 000000000000..0e751d7462ab
--- /dev/null
+++ b/udm/StaticLibrary_udm.mk
@@ -0,0 +1,47 @@
+#**************************************************************
+#  
+#  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_StaticLibrary_StaticLibrary,udm))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_StaticLibrary_add_cflags,udm,-GR))
+else ifeq ($(OS),LINUX)
+$(eval $(call gb_StaticLibrary_add_cflags,udm,-frtti))
+else ifeq ($(OS),FREEBSD)
+$(eval $(call gb_StaticLibrary_add_cflags,udm,-frtti))
+else ifeq ($(OS),NETBSD)
+$(eval $(call gb_StaticLibrary_add_cflags,udm,-frtti))
+endif
+
+$(eval $(call gb_StaticLibrary_set_include,udm,\
+        $$(INCLUDE) \
+	-I$(SRCDIR)/udm/source/inc \
+	-I$(SRCDIR)/udm/inc \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,udm,\
+	udm/source/html/htmlitem \
+	udm/source/xml/xmlitem \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/udm/prj/build.lst b/udm/prj/build.lst
index 9ff891b861fd..af7eac11264f 100644
--- a/udm/prj/build.lst
+++ b/udm/prj/build.lst
@@ -1,12 +1,2 @@
 ud	udm	:  cosv NULL
-ud	udm								usr1	-	all	ud_mkout NULL
-ud	udm\prj							get		-	all	ud_prj NULL
-ud	udm\inc							get		-	all	ud_inc NULL
-ud	udm\inc\udm		  				get		-	all	udi_udm NULL
-ud	udm\inc\udm\html  				get		-	all	udiu_html NULL
-ud	udm\inc\udm\xml	  				get		-	all	udiu_xml NULL
-ud	udm\source						get	    -	all	ud_src NULL
-ud	udm\source\html					nmake	-	all	uds_html NULL
-ud	udm\source\xml					nmake	-	all	uds_xml NULL
-ud	udm\util						nmake	-	all ud_util uds_xml uds_html NULL
-#================================================================================
+ud	udm\prj							nmake		-	all	ud_prj NULL
diff --git a/udm/prj/d.lst b/udm/prj/d.lst
index 150256da59b8..e69de29bb2d1 100644
--- a/udm/prj/d.lst
+++ b/udm/prj/d.lst
@@ -1,9 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\udm
-mkdir: %_DEST%\inc%_EXT%\udm\html
-mkdir: %_DEST%\inc%_EXT%\udm\xml
-
-..\%__SRC%\lib\udm.lib %_DEST%\lib%_EXT%\udm.lib
-..\%__SRC%\lib\libudm.a %_DEST%\lib%_EXT%\libudm.a
-..\inc\udm\html\*.hxx %_DEST%\inc%_EXT%\udm\html\*.hxx
-..\inc\udm\xml\*.hxx %_DEST%\inc%_EXT%\udm\xml\*.hxx
-
diff --git a/udm/source/xml/makefile.mk b/udm/prj/makefile.mk
index 2df331b26247..c62c6a657d16 100644
--- a/udm/source/xml/makefile.mk
+++ b/udm/prj/makefile.mk
@@ -21,32 +21,24 @@
 
 
 
-PRJ=..$/..
-
-PRJNAME=udm
-TARGET=csi_xml
-
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-
-
-.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
-
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/xmlitem.obj
-
-
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
+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