convert xml2cmp to gbuild

Repository.mk

@@ -36,6 +36,8 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     mkunroll \
     rscdep \
     so_checksum \
+    srvdepy \
+    xml2cmp \
 ))
 
 $(eval $(call gb_Helper_register_executables,OOO, \
@@ -255,6 +257,8 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
     salcpprt \
 	vclmain \
 	writerperfect \
+    x2c_support \
+    x2c_xcd \
 ))
 
 ifeq ($(OS),WNT)

RepositoryModule_ooo.mk

@@ -86,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     wizards \
     writerfilter \
     writerperfect \
+    xml2cmp \
     xmloff \
     xmlreader \
     xmlscript \

xml2cmp/Executable_srvdepy.mk

+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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_Executable_Executable,srvdepy))
+
+$(eval $(call gb_Executable_add_exception_objects,srvdepy,\
+	xml2cmp/source/finder/dependy \
+	xml2cmp/source/finder/dep_main \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,srvdepy,\
+	x2c_support \
+	x2c_xcd \
+))

xml2cmp/Executable_xml2cmp.mk

+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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_Executable_Executable,xml2cmp))
+
+$(eval $(call gb_Executable_add_exception_objects,xml2cmp,\
+	xml2cmp/source/xcd/main \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,xml2cmp,\
+	x2c_support \
+	x2c_xcd \
+))

xml2cmp/util/makefile.mk → xml2cmp/Makefile

@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,34 +25,14 @@
 #
 #*************************************************************************
 
-PRJ=..
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-PRJNAME=xml2cmp
-TARGET=xml2cmp
-TARGETTYPE=CUI
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-# --- Settings -----------------------------------------------------
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-.INCLUDE :  settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-APP1TARGET=	$(TARGET)
-APP1STACK=	1000000
-
-UWINAPILIB=$(0)
-LIBSALCPPRT=$(0)
-
-APP1LIBS=	$(LB)$/x2c_xcd.lib $(LB)$/x2c_support.lib
-APP1DEPN=   $(LB)$/x2c_xcd.lib $(LB)$/x2c_support.lib
-APP1RPATH=  NONE
-
-.INCLUDE :  target.mk
+# vim: set noet sw=4 ts=4:

xml2cmp/Module_xml2cmp.mk

+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,xml2cmp))
+
+ifneq ($(CROSS_COMPILING),YES)
+$(eval $(call gb_Module_add_targets,xml2cmp,\
+	StaticLibrary_x2c_support \
+	StaticLibrary_x2c_xcd \
+	Executable_srvdepy \
+	Executable_xml2cmp \
+))
+endif
+

xml2cmp/StaticLibrary_x2c_support.mk

+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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_StaticLibrary_StaticLibrary,x2c_support))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,x2c_support,\
+	xml2cmp/source/support/cmdline \
+	xml2cmp/source/support/heap \
+	xml2cmp/source/support/sistr \
+	xml2cmp/source/support/syshelp \
+	xml2cmp/source/support/badcast \
+))

xml2cmp/StaticLibrary_x2c_xcd.mk

+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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_StaticLibrary_StaticLibrary,x2c_xcd))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,x2c_xcd,\
+	xml2cmp/source/xcd/cr_html \
+	xml2cmp/source/xcd/cr_index \
+	xml2cmp/source/xcd/cr_metho \
+	xml2cmp/source/xcd/filebuff \
+	xml2cmp/source/xcd/parse \
+	xml2cmp/source/xcd/xmlelem \
+	xml2cmp/source/xcd/xmltree \
+))

xml2cmp/prj/build.lst

-xc  xml2cmp : soltools NULL
-xc  xml2cmp                         usr1    -	all	xc_mkout NULL
-xc  xml2cmp\prj                     get -	all	xc_prj NULL
-xc  xml2cmp\source\support                  nmake   -   all	xc_supp NULL
-xc  xml2cmp\source\xcd                  nmake   -	all	xc_xcd NULL
-xc  xml2cmp\util                        nmake   -   all xc_util xc_supp xc_xcd NULL
-xc  xml2cmp\source\finder                   nmake   -   all xc_sfi  xc_supp xc_xcd NULL
+xc  xml2cmp : NULL
+xc  xml2cmp\prj nmake -	all xc_prj NULL

xml2cmp/prj/d.lst

-..\%__SRC%\bin\xml2cmp.exe %_DEST%\bin\xml2cmp.exe
-..\%__SRC%\bin\xml2cmp %_DEST%\bin\xml2cmp
-..\%__SRC%\bin\srvdepy.exe %_DEST%\bin\srvdepy.exe
-..\%__SRC%\bin\srvdepy %_DEST%\bin\srvdepy

xml2cmp/source/support/makefile.mk → xml2cmp/prj/makefile.mk

@@ -25,33 +25,16 @@
 #
 #*************************************************************************
 
-PRJ=..$/..
+PRJ=..
+TARGET=prj
 
-PRJNAME=xml2cmp
-TARGET=x2c_support
-TARGETTYPE=CUI
+.INCLUDE : settings.mk
 
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
 .ENDIF
 
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/cmdline.obj		\
-    $(OBJ)$/heap.obj        \
-    $(OBJ)$/sistr.obj		\
-    $(OBJ)$/syshelp.obj		\
-    $(OBJ)$/badcast.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog

xml2cmp/source/finder/makefile.mk

-#*************************************************************************
-#
-# 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=xml2cmp
-TARGET=srvdepy
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-    $(OBJ)$/dependy.obj	\
-    $(OBJ)$/dep_main.obj
-
-# --- Targets ------------------------------------------------------
-
-APP1TARGET=	$(TARGET)
-APP1STACK=	1000000
-
-LIBSALCPPRT=$(0)
-
-.IF "$(GUI)"=="WNT"
-UWINAPILIB=$(0)
-.ENDIF
-
-APP1LIBS=	$(LB)$/$(TARGET).lib $(LB)$/x2c_xcdl.lib $(LB)$/x2c_support.lib
-APP1DEPN=	$(LB)$/$(TARGET).lib $(LB)$/x2c_xcdl.lib $(LB)$/x2c_support.lib
-
-.INCLUDE :  target.mk

xml2cmp/source/xcd/makefile.mk

-#*************************************************************************
-#
-# 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=xml2cmp
-TARGET=x2c_xcd
-TARGETTYPE=CUI
-
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  settings.mk
-
-.IF "$(CROSS_COMPILING)"=="YES"
-all:
-    @echo Nothing done when cross-compiling
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-LIBONLYFILES=\
-    $(OBJ)$/cr_html.obj		\
-    $(OBJ)$/cr_index.obj	\
-    $(OBJ)$/cr_metho.obj	\
-    $(OBJ)$/filebuff.obj	\
-    $(OBJ)$/parse.obj		\
-    $(OBJ)$/xmlelem.obj		\
-    $(OBJ)$/xmltree.obj
-
-OBJFILES=\
-    $(OBJ)$/main.obj		\
-    $(LIBONLYFILES)
-
-LIB1TARGET=$(LB)$/$(TARGET).lib
-LIB1OBJFILES=\
-    $(OBJFILES)
-
-LIB2TARGET=$(LB)$/$(TARGET)l.lib
-LIB2OBJFILES=\
-    $(LIBONLYFILES)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk