diff options
25 files changed, 137 insertions, 137 deletions
diff --git a/apache-commons/ExternalPackage_apache_commons_logging.mk b/apache-commons/ExternalPackage_apache_commons_logging.mk new file mode 100644 index 000000000000..41cd2c6d41c2 --- /dev/null +++ b/apache-commons/ExternalPackage_apache_commons_logging.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_ExternalPackage_ExternalPackage,apache_commons_logging_inc,apache_commons_logging)) + +$(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging_inc,apache_commons_logging)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,apache_commons_logging_inc,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar)) + +# vim: set noet sw=4 ts=4: diff --git a/apache-commons/Module_apache-commons.mk b/apache-commons/Module_apache-commons.mk index a89f69e6e94b..4bb62cbc6451 100644 --- a/apache-commons/Module_apache-commons.mk +++ b/apache-commons/Module_apache-commons.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,apache_commons)) ifneq ($(SOLAR_JAVA),) ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,apache_commons,\ + ExternalPackage_apache_commons_logging \ ExternalProject_apache_commons_codec \ ExternalProject_apache_commons_httpclient \ ExternalProject_apache_commons_lang \ @@ -19,7 +20,6 @@ $(eval $(call gb_Module_add_targets,apache_commons,\ Package_apache_commons_codec \ Package_apache_commons_httpclient \ Package_apache_commons_lang \ - Package_apache_commons_logging \ UnpackedTarball_apache_commons_codec \ UnpackedTarball_apache_commons_httpclient \ UnpackedTarball_apache_commons_lang \ diff --git a/apache-commons/Package_apache_commons_logging.mk b/apache-commons/Package_apache_commons_logging.mk deleted file mode 100644 index 24a14eaea950..000000000000 --- a/apache-commons/Package_apache_commons_logging.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- 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_Package_Package,apache_commons_logging_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_logging))) - -$(eval $(call gb_Package_use_external_project,apache_commons_logging_inc,apache_commons_logging)) - -$(eval $(call gb_Package_add_file,apache_commons_logging_inc,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar)) - -# vim: set noet sw=4 ts=4: diff --git a/beanshell/Package_beanshell.mk b/beanshell/ExternalPackage_beanshell.mk index bb4b829cce08..1346b889cbd0 100644 --- a/beanshell/Package_beanshell.mk +++ b/beanshell/ExternalPackage_beanshell.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,beanshell,$(call gb_UnpackedTarball_get_dir,beanshell))) +$(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell)) -$(eval $(call gb_Package_use_external_project,beanshell,beanshell)) +$(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell)) -$(eval $(call gb_Package_add_file,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar)) # vim: set noet sw=4 ts=4: diff --git a/beanshell/Module_beanshell.mk b/beanshell/Module_beanshell.mk index e739b3698ef6..035529aa4dec 100644 --- a/beanshell/Module_beanshell.mk +++ b/beanshell/Module_beanshell.mk @@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,beanshell)) ifneq ($(SOLAR_JAVA),) ifneq ($(filter BSH,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,beanshell,\ + ExternalPackage_beanshell \ ExternalProject_beanshell \ - Package_beanshell \ UnpackedTarball_beanshell \ )) endif diff --git a/hsqldb/Package_hsqldb.mk b/hsqldb/ExternalPackage_hsqldb.mk index 2088d6f43f8c..770ca063d714 100644 --- a/hsqldb/Package_hsqldb.mk +++ b/hsqldb/ExternalPackage_hsqldb.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,hsqldb_project,$(call gb_UnpackedTarball_get_dir,hsqldb))) +$(eval $(call gb_ExternalPackage_ExternalPackage,hsqldb_project,hsqldb)) -$(eval $(call gb_Package_use_external_project,hsqldb_project,hsqldb)) +$(eval $(call gb_ExternalPackage_use_external_project,hsqldb_project,hsqldb)) -$(eval $(call gb_Package_add_file,hsqldb_project,bin/hsqldb.jar,lib/hsqldb.jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,hsqldb_project,bin/hsqldb.jar,lib/hsqldb.jar)) # vim: set noet sw=4 ts=4: diff --git a/hsqldb/Module_hsqldb.mk b/hsqldb/Module_hsqldb.mk index ef31358d3fcb..87726211f514 100644 --- a/hsqldb/Module_hsqldb.mk +++ b/hsqldb/Module_hsqldb.mk @@ -11,8 +11,8 @@ $(eval $(call gb_Module_Module,hsqldb)) ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Module_add_targets,hsqldb,\ + ExternalPackage_hsqldb \ ExternalProject_hsqldb \ - Package_hsqldb \ UnpackedTarball_hsqldb \ )) endif diff --git a/jfreereport/Package_jfreereport_flow_engine.mk b/jfreereport/ExternalPackage_jfreereport_flow_engine.mk index eacddb3c1867..00e8ded5743d 100644 --- a/jfreereport/Package_jfreereport_flow_engine.mk +++ b/jfreereport/ExternalPackage_jfreereport_flow_engine.mk @@ -10,10 +10,10 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_Package_Package,jfreereport_flow_engine,$(call gb_UnpackedTarball_get_dir,jfreereport_flow_engine))) +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreereport_flow_engine)) -$(eval $(call gb_Package_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine)) +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine)) -$(eval $(call gb_Package_add_file,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar)) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_flute.mk b/jfreereport/ExternalPackage_jfreereport_flute.mk index eddb4281e147..2892342d90c4 100644 --- a/jfreereport/Package_jfreereport_flute.mk +++ b/jfreereport/ExternalPackage_jfreereport_flute.mk @@ -10,10 +10,10 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_Package_Package,jfreereport_flute,$(call gb_UnpackedTarball_get_dir,jfreereport_flute))) +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flute,jfreereport_flute)) -$(eval $(call gb_Package_use_external_project,jfreereport_flute,jfreereport_flute)) +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flute,jfreereport_flute)) -$(eval $(call gb_Package_add_file,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_libbase.mk b/jfreereport/ExternalPackage_jfreereport_libbase.mk index 073cce50cb2b..ee42a44c8fec 100644 --- a/jfreereport/Package_jfreereport_libbase.mk +++ b/jfreereport/ExternalPackage_jfreereport_libbase.mk @@ -10,10 +10,10 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_Package_Package,jfreereport_libbase,$(call gb_UnpackedTarball_get_dir,jfreereport_libbase))) +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase)) -$(eval $(call gb_Package_use_external_project,jfreereport_libbase,jfreereport_libbase)) +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libbase,jfreereport_libbase)) -$(eval $(call gb_Package_add_file,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_liblayout.mk b/jfreereport/ExternalPackage_jfreereport_libfonts.mk index d06c3a31beb1..fd89ded99c2b 100644 --- a/jfreereport/Package_jfreereport_liblayout.mk +++ b/jfreereport/ExternalPackage_jfreereport_libfonts.mk @@ -10,10 +10,10 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_Package_Package,jfreereport_liblayout,$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout))) +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libfonts,jfreereport_libfonts)) -$(eval $(call gb_Package_use_external_project,jfreereport_liblayout,jfreereport_liblayout)) +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libfonts,jfreereport_libfonts)) -$(eval $(call gb_Package_add_file,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libfonts,bin/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_libformula.mk b/jfreereport/ExternalPackage_jfreereport_libformula.mk new file mode 100644 index 000000000000..674d4b27397e --- /dev/null +++ b/jfreereport/ExternalPackage_jfreereport_libformula.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libformula,jfreereport_libformula)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libformula,jfreereport_libformula)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libformula,bin/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_libfonts.mk b/jfreereport/ExternalPackage_jfreereport_liblayout.mk index 22152c019afd..84f56369e8f2 100644 --- a/jfreereport/Package_jfreereport_libfonts.mk +++ b/jfreereport/ExternalPackage_jfreereport_liblayout.mk @@ -10,10 +10,10 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_Package_Package,jfreereport_libfonts,$(call gb_UnpackedTarball_get_dir,jfreereport_libfonts))) +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreereport_liblayout)) -$(eval $(call gb_Package_use_external_project,jfreereport_libfonts,jfreereport_libfonts)) +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout)) -$(eval $(call gb_Package_add_file,jfreereport_libfonts,bin/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar)) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_libloader.mk b/jfreereport/ExternalPackage_jfreereport_libloader.mk new file mode 100644 index 000000000000..3a8c1fd170c2 --- /dev/null +++ b/jfreereport/ExternalPackage_jfreereport_libloader.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libloader,jfreereport_libloader)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libloader,jfreereport_libloader)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libloader,bin/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_librepository.mk b/jfreereport/ExternalPackage_jfreereport_librepository.mk new file mode 100644 index 000000000000..4a671d512a5e --- /dev/null +++ b/jfreereport/ExternalPackage_jfreereport_librepository.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_librepository,jfreereport_librepository)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_librepository,jfreereport_librepository)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_librepository,bin/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/ExternalPackage_jfreereport_libserializer.mk b/jfreereport/ExternalPackage_jfreereport_libserializer.mk new file mode 100644 index 000000000000..4202856041a3 --- /dev/null +++ b/jfreereport/ExternalPackage_jfreereport_libserializer.mk @@ -0,0 +1,19 @@ +# -*- 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/. +# + +# for VERSION +include $(SRCDIR)/jfreereport/version.mk + +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libserializer,jfreereport_libserializer)) + +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libserializer,jfreereport_libserializer)) + +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libserializer,bin/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar)) + +# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_libxml.mk b/jfreereport/ExternalPackage_jfreereport_libxml.mk index 6669f331a129..1db31f44959e 100644 --- a/jfreereport/Package_jfreereport_libxml.mk +++ b/jfreereport/ExternalPackage_jfreereport_libxml.mk @@ -10,10 +10,10 @@ # for VERSION include $(SRCDIR)/jfreereport/version.mk -$(eval $(call gb_Package_Package,jfreereport_libxml,$(call gb_UnpackedTarball_get_dir,jfreereport_libxml))) +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libxml,jfreereport_libxml)) -$(eval $(call gb_Package_use_external_project,jfreereport_libxml,jfreereport_libxml)) +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libxml,jfreereport_libxml)) -$(eval $(call gb_Package_add_file,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_sac.mk b/jfreereport/ExternalPackage_jfreereport_sac.mk index d4c0f86f9bb5..1f8df20e4db6 100644 --- a/jfreereport/Package_jfreereport_sac.mk +++ b/jfreereport/ExternalPackage_jfreereport_sac.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,jfreereport_sac,$(call gb_UnpackedTarball_get_dir,jfreereport_sac))) +$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_sac,jfreereport_sac)) -$(eval $(call gb_Package_use_external_project,jfreereport_sac,jfreereport_sac)) +$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_sac,jfreereport_sac)) -$(eval $(call gb_Package_add_file,jfreereport_sac,bin/sac.jar,build/lib/sac.jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_sac,bin/sac.jar,build/lib/sac.jar)) # vim: set noet sw=4 ts=4: diff --git a/jfreereport/Module_jfreereport.mk b/jfreereport/Module_jfreereport.mk index 55537a8a0a10..9df40cbd61bc 100644 --- a/jfreereport/Module_jfreereport.mk +++ b/jfreereport/Module_jfreereport.mk @@ -14,37 +14,37 @@ ifneq ($(filter JFREEREPORT,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,jfreereport,\ UnpackedTarball_jfreereport_sac \ ExternalProject_jfreereport_sac \ - Package_jfreereport_sac \ + ExternalPackage_jfreereport_sac \ UnpackedTarball_jfreereport_libbase \ ExternalProject_jfreereport_libbase \ - Package_jfreereport_libbase \ + ExternalPackage_jfreereport_libbase \ UnpackedTarball_jfreereport_flute \ ExternalProject_jfreereport_flute \ - Package_jfreereport_flute \ + ExternalPackage_jfreereport_flute \ UnpackedTarball_jfreereport_libloader \ ExternalProject_jfreereport_libloader \ - Package_jfreereport_libloader \ + ExternalPackage_jfreereport_libloader \ UnpackedTarball_jfreereport_libxml \ ExternalProject_jfreereport_libxml \ - Package_jfreereport_libxml \ + ExternalPackage_jfreereport_libxml \ UnpackedTarball_jfreereport_libformula \ ExternalProject_jfreereport_libformula \ - Package_jfreereport_libformula \ + ExternalPackage_jfreereport_libformula \ UnpackedTarball_jfreereport_libfonts \ ExternalProject_jfreereport_libfonts \ - Package_jfreereport_libfonts \ + ExternalPackage_jfreereport_libfonts \ ExternalProject_jfreereport_librepository \ UnpackedTarball_jfreereport_librepository \ - Package_jfreereport_librepository \ + ExternalPackage_jfreereport_librepository \ UnpackedTarball_jfreereport_libserializer \ ExternalProject_jfreereport_libserializer \ - Package_jfreereport_libserializer \ + ExternalPackage_jfreereport_libserializer \ UnpackedTarball_jfreereport_liblayout \ ExternalProject_jfreereport_liblayout \ - Package_jfreereport_liblayout \ + ExternalPackage_jfreereport_liblayout \ UnpackedTarball_jfreereport_flow_engine \ ExternalProject_jfreereport_flow_engine \ - Package_jfreereport_flow_engine \ + ExternalPackage_jfreereport_flow_engine \ )) endif endif diff --git a/jfreereport/Package_jfreereport_libformula.mk b/jfreereport/Package_jfreereport_libformula.mk deleted file mode 100644 index 87538b89cb0f..000000000000 --- a/jfreereport/Package_jfreereport_libformula.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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/. -# - -# for VERSION -include $(SRCDIR)/jfreereport/version.mk - -$(eval $(call gb_Package_Package,jfreereport_libformula,$(call gb_UnpackedTarball_get_dir,jfreereport_libformula))) - -$(eval $(call gb_Package_use_external_project,jfreereport_libformula,jfreereport_libformula)) - -$(eval $(call gb_Package_add_file,jfreereport_libformula,bin/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_libloader.mk b/jfreereport/Package_jfreereport_libloader.mk deleted file mode 100644 index e67c1e46bed7..000000000000 --- a/jfreereport/Package_jfreereport_libloader.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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/. -# - -# for VERSION -include $(SRCDIR)/jfreereport/version.mk - -$(eval $(call gb_Package_Package,jfreereport_libloader,$(call gb_UnpackedTarball_get_dir,jfreereport_libloader))) - -$(eval $(call gb_Package_use_external_project,jfreereport_libloader,jfreereport_libloader)) - -$(eval $(call gb_Package_add_file,jfreereport_libloader,bin/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_librepository.mk b/jfreereport/Package_jfreereport_librepository.mk deleted file mode 100644 index ec5f8376d874..000000000000 --- a/jfreereport/Package_jfreereport_librepository.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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/. -# - -# for VERSION -include $(SRCDIR)/jfreereport/version.mk - -$(eval $(call gb_Package_Package,jfreereport_librepository,$(call gb_UnpackedTarball_get_dir,jfreereport_librepository))) - -$(eval $(call gb_Package_use_external_project,jfreereport_librepository,jfreereport_librepository)) - -$(eval $(call gb_Package_add_file,jfreereport_librepository,bin/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/jfreereport/Package_jfreereport_libserializer.mk b/jfreereport/Package_jfreereport_libserializer.mk deleted file mode 100644 index 3ac26a9487a8..000000000000 --- a/jfreereport/Package_jfreereport_libserializer.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- 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/. -# - -# for VERSION -include $(SRCDIR)/jfreereport/version.mk - -$(eval $(call gb_Package_Package,jfreereport_libserializer,$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer))) - -$(eval $(call gb_Package_use_external_project,jfreereport_libserializer,jfreereport_libserializer)) - -$(eval $(call gb_Package_add_file,jfreereport_libserializer,bin/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar)) - -# vim: set noet sw=4 ts=4: diff --git a/rhino/Package_rhino.mk b/rhino/ExternalPackage_rhino.mk index 075c49c8a401..45ccf14c894a 100644 --- a/rhino/Package_rhino.mk +++ b/rhino/ExternalPackage_rhino.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,rhino,$(call gb_UnpackedTarball_get_dir,rhino))) +$(eval $(call gb_ExternalPackage_ExternalPackage,rhino,rhino)) -$(eval $(call gb_Package_use_external_project,rhino,rhino)) +$(eval $(call gb_ExternalPackage_use_external_project,rhino,rhino)) -$(eval $(call gb_Package_add_file,rhino,bin/js.jar,build/rhino1_5R5/js.jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,rhino,bin/js.jar,build/rhino1_5R5/js.jar)) # vim: set noet sw=4 ts=4: diff --git a/rhino/Module_rhino.mk b/rhino/Module_rhino.mk index 5fccae447cea..d63ee3f3e973 100644 --- a/rhino/Module_rhino.mk +++ b/rhino/Module_rhino.mk @@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,rhino)) ifneq ($(SOLAR_JAVA),) ifneq ($(filter RHINO,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,rhino,\ + ExternalPackage_rhino \ ExternalProject_rhino \ - Package_rhino \ UnpackedTarball_rhino \ )) endif |