diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-07 11:05:57 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-07 11:14:00 +0100 |
commit | ffb1e88afae5b83d58337a84a27f9c6293f6fcd9 (patch) | |
tree | 310035ce90ebab180139d171480fb12e06aae977 | |
parent | Make gb_Extension_use_default_description/license explicit (diff) | |
download | core-ffb1e88afae5b83d58337a84a27f9c6293f6fcd9.tar.gz core-ffb1e88afae5b83d58337a84a27f9c6293f6fcd9.zip |
Gbuild'ify desktop/test/deployment/passive/
...to manually build solver/*/bin/test-passive.oxt via "make
Extension_test-passive". There's still room for improvement in gbuild, though:
* There should be no need to add the extension's native library and jar UNO
components (which nothing else links againts) to the central Repository.mk.
* There should be no need to move manifest.xml around.
* There should be no need to move .java files around.
* Let "make Extension_test-passive.clean" clean up again.
Change-Id: Ib44558061c4c0fda6be5943bd02b5a42cd15c52e
-rw-r--r-- | Repository.mk | 2 | ||||
-rw-r--r-- | desktop/Extension_test-passive.mk | 27 | ||||
-rw-r--r-- | desktop/Jar_passive_java.mk | 30 | ||||
-rw-r--r-- | desktop/Library_passive_native.mk | 26 | ||||
-rw-r--r-- | desktop/Module_desktop.mk | 11 | ||||
-rw-r--r-- | desktop/Pyuno_passive_python.mk | 18 | ||||
-rw-r--r-- | desktop/Rdb_passive_generic.mk | 17 | ||||
-rw-r--r-- | desktop/Rdb_passive_platform.mk | 16 | ||||
-rw-r--r-- | desktop/test/deployment/passive/META-INF/manifest.xml (renamed from desktop/test/deployment/passive/manifest.xml) | 0 | ||||
-rw-r--r-- | desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java (renamed from desktop/test/deployment/passive/Dispatch.java) | 0 | ||||
-rw-r--r-- | desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Provider.java (renamed from desktop/test/deployment/passive/Provider.java) | 0 | ||||
-rw-r--r-- | desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Services.java (renamed from desktop/test/deployment/passive/Services.java) | 0 |
12 files changed, 147 insertions, 0 deletions
diff --git a/Repository.mk b/Repository.mk index 2e5948605ee7..95a69dbd8073 100644 --- a/Repository.mk +++ b/Repository.mk @@ -668,6 +668,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ SunPresentationMinimizer \ mysqlc \ + passive_native \ )) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ @@ -784,6 +785,7 @@ $(eval $(call gb_Helper_register_jars,OXT, \ EvolutionarySolver \ mediawiki \ nlpsolver \ + passive_java \ sun-report-builder \ )) diff --git a/desktop/Extension_test-passive.mk b/desktop/Extension_test-passive.mk new file mode 100644 index 000000000000..354ce26abe65 --- /dev/null +++ b/desktop/Extension_test-passive.mk @@ -0,0 +1,27 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Extension_Extension,test-passive,desktop/test/deployment/passive)) + +$(eval $(call gb_Extension_add_file,test-passive,generic.components,$(call gb_Rdb_get_target,passive_generic))) + +$(eval $(call gb_Extension_add_file,test-passive,platform.components,$(call gb_Rdb_get_target,passive_platform))) + +$(eval $(call gb_Extension_add_files,test-passive,, \ + $(SRCDIR)/desktop/test/deployment/passive/Addons.xcu \ + $(SRCDIR)/desktop/test/deployment/passive/ProtocolHandler.xcu \ + $(SRCDIR)/desktop/test/deployment/passive/passive_python.py \ + $(call gb_Jar_get_outdir_target,passive_java) \ +)) + +$(eval $(call gb_Extension_add_libraries,test-passive, \ + passive_native \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/Jar_passive_java.mk b/desktop/Jar_passive_java.mk new file mode 100644 index 000000000000..e1023a5d5230 --- /dev/null +++ b/desktop/Jar_passive_java.mk @@ -0,0 +1,30 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Jar_Jar,passive_java)) + +$(eval $(call gb_Jar_add_sourcefiles,passive_java, \ + desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch \ + desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Provider \ + desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Services \ +)) + +$(eval $(call gb_Jar_set_componentfile,passive_java,desktop/test/deployment/passive/passive_java,OXT)) + +$(eval $(call gb_Jar_set_manifest,passive_java,$(SRCDIR)/desktop/test/deployment/passive/MANIFEST.MF)) + +$(eval $(call gb_Jar_set_packageroot,passive_java,com)) + +$(eval $(call gb_Jar_use_jars,passive_java, \ + juh \ + ridl \ + unoil \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/Library_passive_native.mk b/desktop/Library_passive_native.mk new file mode 100644 index 000000000000..2181941662cf --- /dev/null +++ b/desktop/Library_passive_native.mk @@ -0,0 +1,26 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Library_Library,passive_native)) + +$(eval $(call gb_Library_add_exception_objects,passive_native, \ + desktop/test/deployment/passive/passive_native \ +)) + +$(eval $(call gb_Library_set_componentfile,passive_native,desktop/test/deployment/passive/passive_native)) + +$(eval $(call gb_Library_use_libraries,passive_native, \ + cppu \ + cppuhelper \ + sal \ +)) + +$(eval $(call gb_Library_use_sdk_api,passive_native)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 1122360f4691..538553ac7dd1 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -131,4 +131,15 @@ $(eval $(call gb_Module_add_targets,desktop,\ endif +ifneq (,$(filter Extension_test-passive,$(MAKECMDGOALS))) +$(eval $(call gb_Module_add_targets,desktop, \ + Extension_test-passive \ + Jar_passive_java \ + Library_passive_native \ + Pyuno_passive_python \ + Rdb_passive_generic \ + Rdb_passive_platform \ +)) +endif + # vim: set ts=4 sw=4 et: diff --git a/desktop/Pyuno_passive_python.mk b/desktop/Pyuno_passive_python.mk new file mode 100644 index 000000000000..d13431d71e0d --- /dev/null +++ b/desktop/Pyuno_passive_python.mk @@ -0,0 +1,18 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Pyuno_Pyuno,passive_python,$(SRCDIR)/desktop/test/deployment/passive)) + +$(eval $(call gb_Pyuno_add_files,passive_python, \ + passive_python.py \ +)) + +$(eval $(call gb_Pyuno_set_componentfile_full,passive_python,desktop/test/deployment/passive/passive_python,./,passive_python.py)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/Rdb_passive_generic.mk b/desktop/Rdb_passive_generic.mk new file mode 100644 index 000000000000..f05d9c26cf31 --- /dev/null +++ b/desktop/Rdb_passive_generic.mk @@ -0,0 +1,17 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Rdb_Rdb,passive_generic)) + +$(eval $(call gb_Rdb_add_components,passive_generic, \ + desktop/test/deployment/passive/passive_java \ + desktop/test/deployment/passive/passive_python \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/Rdb_passive_platform.mk b/desktop/Rdb_passive_platform.mk new file mode 100644 index 000000000000..72ffe6c19a69 --- /dev/null +++ b/desktop/Rdb_passive_platform.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Rdb_Rdb,passive_platform)) + +$(eval $(call gb_Rdb_add_components,passive_platform, \ + desktop/test/deployment/passive/passive_native \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/test/deployment/passive/manifest.xml b/desktop/test/deployment/passive/META-INF/manifest.xml index 1d57a8eb41ae..1d57a8eb41ae 100644 --- a/desktop/test/deployment/passive/manifest.xml +++ b/desktop/test/deployment/passive/META-INF/manifest.xml diff --git a/desktop/test/deployment/passive/Dispatch.java b/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java index 762a09cbc4de..762a09cbc4de 100644 --- a/desktop/test/deployment/passive/Dispatch.java +++ b/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java diff --git a/desktop/test/deployment/passive/Provider.java b/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Provider.java index 13d59ecf1b04..13d59ecf1b04 100644 --- a/desktop/test/deployment/passive/Provider.java +++ b/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Provider.java diff --git a/desktop/test/deployment/passive/Services.java b/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Services.java index b14ba710274c..b14ba710274c 100644 --- a/desktop/test/deployment/passive/Services.java +++ b/desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Services.java |