diff options
16 files changed, 45 insertions, 35 deletions
diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk index 992810f17417..6ee1933aee48 100644 --- a/external/apache-commons/ExternalPackage_apache_commons_logging.mk +++ b/external/apache-commons/ExternalPackage_apache_commons_logging.mk @@ -9,8 +9,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging,apache_commons_logging)) +$(eval $(call gb_ExternalPackage_set_outdir,apache_commons_logging,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging,apache_commons_logging)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,apache_commons_logging,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar)) +$(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar)) # vim: set noet sw=4 ts=4: diff --git a/external/beanshell/ExternalPackage_beanshell.mk b/external/beanshell/ExternalPackage_beanshell.mk index 1346b889cbd0..0cb34cd30010 100644 --- a/external/beanshell/ExternalPackage_beanshell.mk +++ b/external/beanshell/ExternalPackage_beanshell.mk @@ -9,8 +9,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell)) +$(eval $(call gb_ExternalPackage_set_outdir,beanshell,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar)) +$(eval $(call gb_ExternalPackage_add_file,beanshell,$(LIBO_SHARE_JAVA_FOLDER)/bsh.jar,dist/bsh-2.0b1.jar)) # vim: set noet sw=4 ts=4: diff --git a/external/hsqldb/ExternalPackage_hsqldb.mk b/external/hsqldb/ExternalPackage_hsqldb.mk index 770ca063d714..3b7397a7c304 100644 --- a/external/hsqldb/ExternalPackage_hsqldb.mk +++ b/external/hsqldb/ExternalPackage_hsqldb.mk @@ -9,8 +9,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,hsqldb_project,hsqldb)) +$(eval $(call gb_ExternalPackage_set_outdir,hsqldb_project,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,hsqldb_project,hsqldb)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,hsqldb_project,bin/hsqldb.jar,lib/hsqldb.jar)) +$(eval $(call gb_ExternalPackage_add_file,hsqldb_project,$(LIBO_SHARE_JAVA_FOLDER)/hsqldb.jar,lib/hsqldb.jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk index ca60a2716e5d..3c93fcebde1e 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk @@ -12,8 +12,10 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreereport_flow_engine)) +$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_flow_engine,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flow_engine,bin/flow-engine.jar,build/lib/flow-engine.jar)) +$(eval $(call gb_ExternalPackage_add_file,jfreereport_flow_engine,$(LIBO_SHARE_JAVA_FOLDER)/flow-engine.jar,build/lib/flow-engine.jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_flute.mk b/external/jfreereport/ExternalPackage_jfreereport_flute.mk index f0196a8c9052..d97619c1ca0e 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_flute.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_flute.mk @@ -12,8 +12,10 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flute,jfreereport_flute)) +$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_flute,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flute,jfreereport_flute)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar)) +$(eval $(call gb_ExternalPackage_add_file,jfreereport_flute,$(LIBO_SHARE_JAVA_FOLDER)/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libbase.mk b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk index 0f6ee51d93fa..eebb8092df0f 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libbase.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk @@ -12,8 +12,10 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase)) +$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libbase,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libbase,jfreereport_libbase)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar)) +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libbase,$(LIBO_SHARE_JAVA_FOLDER)/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk index c097e76bf50c..edc3b78ae009 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk @@ -12,8 +12,10 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libfonts,jfreereport_libfonts)) +$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libfonts,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libfonts,jfreereport_libfonts)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libfonts,bin/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar)) +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libfonts,$(LIBO_SHARE_JAVA_FOLDER)/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libformula.mk b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk index 4e4266ca4033..790d5d24d42e 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libformula.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk @@ -12,8 +12,10 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libformula,jfreereport_libformula)) +$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libformula,$(INSTROOT))) + $(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)) +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libformula,$(LIBO_SHARE_JAVA_FOLDER)/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk index c5d330b73fe8..9588a89e07b2 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk @@ -12,8 +12,10 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreereport_liblayout)) +$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_liblayout,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout.jar,build/lib/liblayout.jar)) +$(eval $(call gb_ExternalPackage_add_file,jfreereport_liblayout,$(LIBO_SHARE_JAVA_FOLDER)/liblayout.jar,build/lib/liblayout.jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libloader.mk b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk index 01f1bcc62b09..ee1c6f3dc706 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libloader.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk @@ -12,8 +12,10 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libloader,jfreereport_libloader)) +$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libloader,$(INSTROOT))) + $(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)) +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libloader,$(LIBO_SHARE_JAVA_FOLDER)/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_librepository.mk b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk index 4103811ba3ee..2fc36d16d96f 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_librepository.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk @@ -12,8 +12,10 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_librepository,jfreereport_librepository)) +$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_librepository,$(INSTROOT))) + $(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)) +$(eval $(call gb_ExternalPackage_add_file,jfreereport_librepository,$(LIBO_SHARE_JAVA_FOLDER)/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk index f576ed7b3d14..0eb92599d2e7 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk @@ -12,8 +12,10 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libserializer,jfreereport_libserializer)) +$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libserializer,$(INSTROOT))) + $(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)) +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libserializer,$(LIBO_SHARE_JAVA_FOLDER)/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_libxml.mk b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk index 6425911a42cb..79b39d5ebf66 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_libxml.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk @@ -12,8 +12,10 @@ include $(SRCDIR)/external/jfreereport/version.mk $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libxml,jfreereport_libxml)) +$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libxml,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libxml,jfreereport_libxml)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar)) +$(eval $(call gb_ExternalPackage_add_file,jfreereport_libxml,$(LIBO_SHARE_JAVA_FOLDER)/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar)) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalPackage_jfreereport_sac.mk b/external/jfreereport/ExternalPackage_jfreereport_sac.mk index 1f8df20e4db6..ad27f11a0ac9 100644 --- a/external/jfreereport/ExternalPackage_jfreereport_sac.mk +++ b/external/jfreereport/ExternalPackage_jfreereport_sac.mk @@ -9,8 +9,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_sac,jfreereport_sac)) +$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_sac,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,jfreereport_sac,jfreereport_sac)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_sac,bin/sac.jar,build/lib/sac.jar)) +$(eval $(call gb_ExternalPackage_add_file,jfreereport_sac,$(LIBO_SHARE_JAVA_FOLDER)/sac.jar,build/lib/sac.jar)) # vim: set noet sw=4 ts=4: diff --git a/rhino/ExternalPackage_rhino.mk b/rhino/ExternalPackage_rhino.mk index 45ccf14c894a..7dc6fa6d157e 100644 --- a/rhino/ExternalPackage_rhino.mk +++ b/rhino/ExternalPackage_rhino.mk @@ -9,8 +9,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,rhino,rhino)) +$(eval $(call gb_ExternalPackage_set_outdir,rhino,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,rhino,rhino)) -$(eval $(call gb_ExternalPackage_add_jar_for_install,rhino,bin/js.jar,build/rhino1_5R5/js.jar)) +$(eval $(call gb_ExternalPackage_add_file,rhino,$(LIBO_SHARE_JAVA_FOLDER)/js.jar,build/rhino1_5R5/js.jar)) # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index c1ff3fbd9053..ad5697d4a5c8 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/solenv/gbuild/ExternalPackage.mk @@ -230,24 +230,4 @@ $(foreach file,$(3),$(call gb_ExternalPackage_add_library_for_install,$(1),$(2)/ endef -# Add a jar that is a part of the installation. -# -# This function works just like to gb_ExternalPackage_add_file, except -# that it also allows to deliver the jar to its proper place in -# $(INSTROOT). -# -# gb_ExternalPackage_add_jar_for_install package dest src -define gb_ExternalPackage_add_jar_for_install -$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/$(notdir $(2)),$(3)) - -endef - -# Add several jars for install at once. -# -# gb_ExternalPackage_add_jars_for_install package destdir file(s) -define gb_ExternalPackage_add_jars_for_install -$(foreach file,$(3),$(call gb_ExternalPackage_add_jar_for_install,$(1),$(2)/$(notdir $(file)),$(file))) - -endef - # vim: set noet sw=4 ts=4: |