Kaydet (Commit) ffb1e88a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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
üst 12f9287b
......@@ -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 \
))
......
# -*- 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:
# -*- 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:
# -*- 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:
......@@ -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:
# -*- 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:
# -*- 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:
# -*- 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:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment