diff options
author | David Tardon <dtardon@redhat.com> | 2011-12-26 12:31:21 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-12-26 17:40:26 +0100 |
commit | 764f2b2790e02f80ec67e85f23472dd4db6fc977 (patch) | |
tree | d9b623063df8e0b93b31630c292144781a3c3d33 | |
parent | revamp Rdb class (diff) | |
download | core-764f2b2790e02f80ec67e85f23472dd4db6fc977.tar.gz core-764f2b2790e02f80ec67e85f23472dd4db6fc977.zip |
gbuildize ure
-rw-r--r-- | RepositoryModule_ooo.mk | 1 | ||||
-rw-r--r-- | ure/Makefile (renamed from ure/source/makefile.mk) | 57 | ||||
-rw-r--r-- | ure/Module_ure.mk | 37 | ||||
-rw-r--r-- | ure/Package_distribution.mk | 38 | ||||
-rw-r--r-- | ure/Package_uretest.mk | 32 | ||||
-rw-r--r-- | ure/Rdb_ure.mk | 56 | ||||
-rw-r--r-- | ure/Zip_uretest.mk | 54 | ||||
-rw-r--r-- | ure/prj/build.lst | 2 | ||||
-rw-r--r-- | ure/prj/d.lst | 11 | ||||
-rw-r--r-- | ure/prj/makefile.mk | 1 | ||||
-rw-r--r-- | ure/source/delzip | 0 |
11 files changed, 231 insertions, 58 deletions
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 281b19850771..1e4ff6eea8a4 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -101,6 +101,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ UnoControls \ unotools \ unoxml \ + ure \ uui \ vbahelper \ vcl \ diff --git a/ure/source/makefile.mk b/ure/Makefile index 1f7589065e15..7bbbe6c703e6 100644 --- a/ure/source/makefile.mk +++ b/ure/Makefile @@ -1,7 +1,8 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # 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 @@ -25,51 +26,15 @@ # #************************************************************************* -PRJ = .. -PRJNAME = ure -TARGET = source - -ZIP1TARGET = uretest -ZIP1FLAGS = -r -ZIP1LIST = uretest - -my_components = \ - acceptor \ - component/binaryurp/source/binaryurp \ - bootstrap \ - connector \ - introspection \ - invocadapt \ - invocation \ - namingservice \ - proxyfac \ - reflection \ - stocservices \ - streams \ - textinstream \ - textoutstream \ - uuresolver - -.IF "$(SOLAR_JAVA)" != "" - -my_components += \ - javaloader \ - javavm \ - juh - -.ENDIF - -.INCLUDE: settings.mk -.INCLUDE: target.mk +gb_PARTIALBUILD := T +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk +else -ALLTAR : $(MISC)/services.rdb +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk -$(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ - $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component") - $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ - $(SOLARENV)/bin/packcomponents.xslt $(MISC)/services.input +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -$(MISC)/services.input : - echo \ - '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \ - > $@ +endif +# vim: set noet sw=4 ts=4: diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk new file mode 100644 index 000000000000..0f75d4c812c7 --- /dev/null +++ b/ure/Module_ure.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; 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. +# +# Major Contributor(s): +# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# 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,ure)) + +$(eval $(call gb_Module_add_targets,ure,\ + Package_distribution \ + Package_uretest \ + Rdb_ure \ + Zip_uretest \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/ure/Package_distribution.mk b/ure/Package_distribution.mk new file mode 100644 index 000000000000..81a39cf7a0a2 --- /dev/null +++ b/ure/Package_distribution.mk @@ -0,0 +1,38 @@ +# -*- Mode: makefile-gmake; 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. +# +# Major Contributor(s): +# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# 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_Package_Package,ure_distribution,$(SRCDIR)/ure/source)) + +$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/README,README)) +$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/THIRDPARTYLICENSEREADME.html,THIRDPARTYLICENSEREADME.html)) +$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/jvmfwk3.ini,jvmfwk3.ini)) +$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/jvmfwk3rc,jvmfwk3rc)) +$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/startup.sh,startup.sh)) +$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/uno.ini,uno.ini)) +$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/unorc,unorc)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/ure/Package_uretest.mk b/ure/Package_uretest.mk new file mode 100644 index 000000000000..6e2d2363c845 --- /dev/null +++ b/ure/Package_uretest.mk @@ -0,0 +1,32 @@ +# -*- Mode: makefile-gmake; 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. +# +# Major Contributor(s): +# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# 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_Package_Package,ure_uretest,$(patsubst %/,%,$(dir $(call gb_Zip_get_target,uretest))))) + +$(eval $(call gb_Package_add_file,ure_uretest,bin/uretest.zip,uretest.zip)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk new file mode 100644 index 000000000000..b3b6531b95d4 --- /dev/null +++ b/ure/Rdb_ure.mk @@ -0,0 +1,56 @@ +# -*- Mode: makefile-gmake; 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. +# +# Major Contributor(s): +# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# 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_Rdb_Rdb,ure/services)) + +$(eval $(call gb_Rdb_add_components,ure/services,\ + acceptor \ + binaryurp/source/binaryurp \ + bootstrap \ + connector \ + introspection \ + invocadapt \ + invocation \ + namingservice \ + proxyfac \ + reflection \ + stocservices \ + streams \ + textinstream \ + textoutstream \ + uuresolver \ +)) + +ifneq ($(SOLAR_JAVA),) +$(eval $(call gb_Rdb_add_components,ure/services,\ + javaloader \ + javavm \ + juh \ +)) +endif + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/ure/Zip_uretest.mk b/ure/Zip_uretest.mk new file mode 100644 index 000000000000..2c2bbb167de1 --- /dev/null +++ b/ure/Zip_uretest.mk @@ -0,0 +1,54 @@ +# -*- Mode: makefile-gmake; 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. +# +# Major Contributor(s): +# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# 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_Zip_Zip,uretest,$(SRCDIR)/ure/source)) + +$(eval $(call gb_Zip_add_files,uretest,\ + uretest/JavaClient.java \ + uretest/JavaMain.java \ + uretest/JavaNative.java \ + uretest/JavaTest.java \ + uretest/Makefile \ + uretest/Makefile.pln \ + uretest/README \ + uretest/Runner.java \ + uretest/Tester.java \ + uretest/cppmain.cc \ + uretest/cppserver.cc \ + uretest/cpptest.cc \ + uretest/javaclient.mf.template \ + uretest/javamain.mf.template \ + uretest/javanative.mf.template \ + uretest/javatest.mf.template \ + uretest/runner.mf.template \ + uretest/tester.mf.template \ + uretest/types.idl \ + uretest/types.mf.template \ + uretest/version.map \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/ure/prj/build.lst b/ure/prj/build.lst index 7618bf3299b7..57ce50deb981 100644 --- a/ure/prj/build.lst +++ b/ure/prj/build.lst @@ -1,2 +1,2 @@ ur ure : LIBXSLT:libxslt binaryurp cli_ure io javaunohelper remotebridges solenv stoc NULL -ur ure\source nmake - all ur_source NULL +ur ure\prj nmake - all ur_prj NULL diff --git a/ure/prj/d.lst b/ure/prj/d.lst index f9e28443b177..e69de29bb2d1 100644 --- a/ure/prj/d.lst +++ b/ure/prj/d.lst @@ -1,11 +0,0 @@ -mkdir: %_DEST%\bin\ure -mkdir: %_DEST%\xml\ure -..\%__SRC%\bin\uretest.zip %COMMON_DEST%\bin\uretest.zip -..\%__SRC%\misc\services.rdb %_DEST%\xml\ure\services.rdb -..\source\README %_DEST%\bin\ure\README -..\source\THIRDPARTYLICENSEREADME.html %_DEST%\bin\ure\THIRDPARTYLICENSEREADME.html -..\source\jvmfwk3.ini %_DEST%\bin\ure\jvmfwk3.ini -..\source\jvmfwk3rc %_DEST%\bin\ure\jvmfwk3rc -..\source\startup.sh %_DEST%\bin\ure\startup.sh -..\source\uno.ini %_DEST%\bin\ure\uno.ini -..\source\unorc %_DEST%\bin\ure\unorc diff --git a/ure/prj/makefile.mk b/ure/prj/makefile.mk new file mode 100644 index 000000000000..0997622e00f6 --- /dev/null +++ b/ure/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk diff --git a/ure/source/delzip b/ure/source/delzip deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/ure/source/delzip +++ /dev/null |