convert binaryurp to gbuild

9 files changed, 214 insertions, 135 deletions

diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk
new file mode 100644
index 000000000000..51b5e839528c
--- /dev/null
+++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# 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
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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_CppunitTest_CppunitTest,binaryurp_test-cache))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-cache,\
+	sal \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-cache,\
+	binaryurp/qa/test-cache \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
new file mode 100644
index 000000000000..0e0b76911b71
--- /dev/null
+++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
@@ -0,0 +1,50 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# 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
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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_CppunitTest_CppunitTest,binaryurp_test-unmarshal))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-unmarshal,\
+	cppu \
+	cppuhelper \
+	sal \
+	salhelper \
+))
+
+$(eval $(call gb_CppunitTest_add_library_objects,binaryurp_test-unmarshal,\
+	binaryurp \
+))
+
+$(eval $(call gb_CppunitTest_add_api,binaryurp_test-unmarshal,\
+	udkapi \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-unmarshal,\
+	binaryurp/qa/test-unmarshal \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk
new file mode 100644
index 000000000000..ff06941aeb5e
--- /dev/null
+++ b/binaryurp/Library_binaryurp.mk
@@ -0,0 +1,60 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# 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
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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_Library_Library,binaryurp))
+
+$(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp))
+
+$(eval $(call gb_Library_add_api,binaryurp,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,binaryurp,\
+	cppu \
+	cppuhelper \
+	sal \
+	salhelper \
+))
+
+$(eval $(call gb_Library_add_exception_objects,binaryurp,\
+	binaryurp/source/binaryany \
+	binaryurp/source/bridge \
+	binaryurp/source/bridgefactory \
+	binaryurp/source/currentcontext \
+	binaryurp/source/incomingrequest \
+	binaryurp/source/lessoperators \
+	binaryurp/source/marshal \
+	binaryurp/source/outgoingrequests \
+	binaryurp/source/proxy \
+	binaryurp/source/reader \
+	binaryurp/source/unmarshal \
+	binaryurp/source/writer \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/binaryurp/source/makefile.mk b/binaryurp/Makefile
index ca9e7c72b65d..3abf1ae8b6bb 100644
--- a/binaryurp/source/makefile.mk
+++ b/binaryurp/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -23,47 +24,16 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#***********************************************************************/
-
-PRJ = ..
-PRJNAME = binaryurp
-TARGET = binaryurp
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-DLLPRE =
-
-SLOFILES = \
-    $(SLO)/binaryany.obj \
-    $(SLO)/bridge.obj \
-    $(SLO)/bridgefactory.obj \
-    $(SLO)/currentcontext.obj \
-    $(SLO)/incomingrequest.obj \
-    $(SLO)/lessoperators.obj \
-    $(SLO)/marshal.obj \
-    $(SLO)/outgoingrequests.obj \
-    $(SLO)/proxy.obj \
-    $(SLO)/reader.obj \
-    $(SLO)/unmarshal.obj \
-    $(SLO)/writer.obj
+#*************************************************************************
 
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = URELIB
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
-SHL1TARGET = binaryurp.uno
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-.INCLUDE: target.mk
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-ALLTAR : $(MISC)/binaryurp.component
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-$(MISC)/binaryurp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        binaryurp.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt binaryurp.component
+# vim: set noet sw=4 ts=4:
diff --git a/binaryurp/Module_binaryurp.mk b/binaryurp/Module_binaryurp.mk
new file mode 100644
index 000000000000..ac7474e37b0f
--- /dev/null
+++ b/binaryurp/Module_binaryurp.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# 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
+#       Matúš Kukan <matus.kukan@gmail.com>
+# 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,binaryurp))
+
+$(eval $(call gb_Module_add_targets,binaryurp,\
+	Library_binaryurp \
+))
+
+$(eval $(call gb_Module_add_check_targets,binaryurp,\
+	CppunitTest_binaryurp_test-cache \
+	CppunitTest_binaryurp_test-unmarshal \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/binaryurp/prj/build.lst b/binaryurp/prj/build.lst
index 2681035e1ae6..413b430154f7 100644
--- a/binaryurp/prj/build.lst
+++ b/binaryurp/prj/build.lst
@@ -1,3 +1,2 @@
 bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal salhelper stlport NULL
-bu binaryurp\source nmake - all bu_source NULL
-bu binaryurp\qa nmake - all bu_qa bu_source NULL
+bu binaryurp\prj nmake - all bu_prj NULL
diff --git a/binaryurp/prj/d.lst b/binaryurp/prj/d.lst
index af6a9d474ba4..e69de29bb2d1 100644
--- a/binaryurp/prj/d.lst
+++ b/binaryurp/prj/d.lst
@@ -1,4 +0,0 @@
-..\%__SRC%\bin\binaryurp.uno.dll %_DEST%\bin\binaryurp.uno.dll
-..\%__SRC%\lib\binaryurp.uno.dylib %_DEST%\lib\binaryurp.uno.dylib
-..\%__SRC%\lib\binaryurp.uno.so %_DEST%\lib\binaryurp.uno.so
-..\%__SRC%\misc\binaryurp.component %_DEST%\xml\binaryurp.component
diff --git a/binaryurp/qa/version.map b/binaryurp/prj/makefile.mk
index ef2ab497cb5e..85b25665cc83 100644
--- a/binaryurp/qa/version.map
+++ b/binaryurp/prj/makefile.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2000, 2011 Oracle and/or its affiliates.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -23,12 +23,18 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#***********************************************************************/
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
 
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
-    local:
-        *;
-};
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/binaryurp/qa/makefile.mk b/binaryurp/qa/makefile.mk
deleted file mode 100644
index 8b3d86990678..000000000000
--- a/binaryurp/qa/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#***********************************************************************/
-
-PRJ = ..
-PRJNAME = binaryurp
-TARGET = qa
-
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-.IF "$(OS)" == "IOS"
-CFLAGSCXX += $(OBJCXXFLAGS)
-.ENDIF
-
-DLLPRE =
-
-SLOFILES = $(SLO)/test-cache.obj $(SLO)/test-unmarshal.obj
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLO)/test-cache.obj
-SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
-SHL1TARGET = test-cache
-SHL1VERSIONMAP = version.map
-DEF1NAME = $(SHL1TARGET)
-
-SHL2IMPLIB = i$(SHL2TARGET)
-SHL2OBJS = \
-    $(SLO)/test-unmarshal.obj \
-    $(SLO)/binaryany.obj \
-    $(SLO)/bridge.obj \
-    $(SLO)/bridgefactory.obj \
-    $(SLO)/currentcontext.obj \
-    $(SLO)/incomingrequest.obj \
-    $(SLO)/lessoperators.obj \
-    $(SLO)/marshal.obj \
-    $(SLO)/outgoingrequests.obj \
-    $(SLO)/proxy.obj \
-    $(SLO)/reader.obj \
-    $(SLO)/unmarshal.obj \
-    $(SLO)/writer.obj
-SHL2RPATH = NONE
-SHL2STDLIBS = \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(CPPUNITLIB) \
-    $(SALHELPERLIB) \
-    $(SALLIB)
-SHL2TARGET = test-unmarshal
-SHL2VERSIONMAP = version.map
-DEF2NAME = $(SHL2TARGET)
-
-.INCLUDE: target.mk
-.INCLUDE: _cppunit.mk