Convert sccomp to gbuild

8 files changed, 211 insertions, 97 deletions

diff --git a/sccomp/AllLangResTarget_solver.mk b/sccomp/AllLangResTarget_solver.mk
new file mode 100644
index 000000000000..98c3817e2c6c
--- /dev/null
+++ b/sccomp/AllLangResTarget_solver.mk
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,solver))
+
+$(eval $(call gb_AllLangResTarget_add_srs,solver,solver/res))
+$(eval $(call gb_SrsTarget_SrsTarget,solver/res))
+
+$(eval $(call gb_SrsTarget_set_include,solver/res,\
+	$$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sccomp/source/solver) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,solver/res,\
+	sccomp/source/solver/solver.src \
+))
+
+# vim: set noet sw=4:
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
new file mode 100644
index 000000000000..586c23776f31
--- /dev/null
+++ b/sccomp/Library_solver.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,solver))
+
+$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/solver))
+
+$(eval $(call gb_Library_set_include,solver,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/sccomp/source/solver) \
+))
+
+$(eval $(call gb_Library_add_api,solver,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,solver,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+	tl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_external,solver,lpsolve55))
+
+$(eval $(call gb_Library_add_exception_objects,solver,\
+	sccomp/source/solver/solver \
+))
diff --git a/sccomp/Makefile b/sccomp/Makefile
new file mode 100644
index 000000000000..5bedaf0b9dcf
--- /dev/null
+++ b/sccomp/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+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/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk
new file mode 100644
index 000000000000..92d311315aa9
--- /dev/null
+++ b/sccomp/Module_sccomp.mk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,sccomp))
+
+$(eval $(call gb_Module_add_targets,sccomp,\
+	AllLangResTarget_solver \
+	Library_solver \
+))
+
+# vim: set noet sw=4:
diff --git a/sccomp/prj/build.lst b/sccomp/prj/build.lst
index 31d12acf1f8f..6f3bd231f857 100644
--- a/sccomp/prj/build.lst
+++ b/sccomp/prj/build.lst
@@ -1,4 +1,3 @@
 scc	sccomp	:    TRANSLATIONS:translations offapi comphelper LPSOLVE:lpsolve tools DESKTOP:rsc LIBXSLT:libxslt NULL
 scc	sccomp									usr1	-	all	scc_mkout NULL
-scc	sccomp\prj								get		-	all	scc_prj NULL
-scc	sccomp\source\solver					nmake	-	all	scc_solver NULL
+scc	sccomp\prj								nmake	-	all	scc_prj NULL
diff --git a/sccomp/prj/d.lst b/sccomp/prj/d.lst
index f618da87f6cf..e69de29bb2d1 100644
--- a/sccomp/prj/d.lst
+++ b/sccomp/prj/d.lst
@@ -1,10 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
-..\%__SRC%\lib\lib*.so %_DEST%\lib
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin\*.bin
-..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-..\%__SRC%\misc\solver.component %_DEST%\xml\solver.component
diff --git a/sccomp/prj/makefile.mk b/sccomp/prj/makefile.mk
new file mode 100644
index 000000000000..d30ff8a47e6b
--- /dev/null
+++ b/sccomp/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/sccomp/source/solver/makefile.mk b/sccomp/source/solver/makefile.mk
deleted file mode 100644
index b1c65e88c64c..000000000000
--- a/sccomp/source/solver/makefile.mk
+++ /dev/null
@@ -1,85 +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=sccomp
-TARGET=solver
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-USE_DEFFILE=TRUE
-LIBTARGET=NO
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-
-SLOFILES=$(SLO)$/solver.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=solver.src
-
-# --- Library -----------------------------------
-
-SHL1TARGET=     $(TARGET)$(DLLPOSTFIX)
-
-SHL1OBJS=       $(SLOFILES)
-
-SHL1STDLIBS=    $(COMPHELPERLIB)    \
-                $(CPPUHELPERLIB)    \
-                $(CPPULIB)          \
-                $(SALLIB)           \
-                $(TOOLSLIB)         \
-                $(LPSOLVELIB)
-
-SHL1DEPN=       makefile.mk
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP= $(SOLARENV)/src/component.map
-DEF1NAME=       $(SHL1TARGET)
-
-# --- Resources --------------------------------
-
-RESLIB1LIST=$(SRS)$/solver.srs
-
-RESLIB1NAME=solver
-RESLIB1SRSFILES=$(RESLIB1LIST)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-
-ALLTAR : $(MISC)/solver.component
-
-$(MISC)/solver.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        solver.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt solver.component