RepositoryExternal.mk | 30
++++++--
configure.ac | 37
----------
external/apache-commons/ExternalPackage_apache_commons_logging.mk | 8 +-
external/apache-commons/ExternalProject_apache_commons_logging.mk | 9 --
external/apache-commons/Module_apache-commons.mk | 3
external/apache-commons/Package_apache_commons_codec.mk | 16 ----
external/apache-commons/Package_apache_commons_httpclient.mk | 16 ----
external/apache-commons/Package_apache_commons_lang.mk | 16 ----
external/beanshell/ExternalPackage_beanshell.mk | 4 -
external/hsqldb/ExternalPackage_hsqldb.mk | 4 -
external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk | 4 -
external/jfreereport/ExternalPackage_jfreereport_flute.mk | 4 -
external/jfreereport/ExternalPackage_jfreereport_libbase.mk | 4 -
external/jfreereport/ExternalPackage_jfreereport_libfonts.mk | 4 -
external/jfreereport/ExternalPackage_jfreereport_libformula.mk | 4 -
external/jfreereport/ExternalPackage_jfreereport_liblayout.mk | 4 -
external/jfreereport/ExternalPackage_jfreereport_libloader.mk | 4 -
external/jfreereport/ExternalPackage_jfreereport_librepository.mk | 4 -
external/jfreereport/ExternalPackage_jfreereport_libserializer.mk | 4 -
external/jfreereport/ExternalPackage_jfreereport_libxml.mk | 4 -
external/jfreereport/ExternalPackage_jfreereport_sac.mk | 4 -
external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 13 ++-
external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 22 ++++-
external/jfreereport/patches/flow-engine.patch | 15 ++--
external/jfreereport/patches/liblayout.patch | 18 +++-
external/jfreereport/version.mk | 2
libxmlsec/xmlsec1-configure.patch | 2
reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf | 4 -
rhino/ExternalPackage_rhino.mk | 4 -
scp2/InstallModule_ooo.mk | 2
scp2/source/ooo/module_reportbuilder.scp | 4 -
solenv/gbuild/Extension.mk | 9 ++
solenv/gbuild/ExternalPackage.mk | 20 -----
solenv/gbuild/ExternalProject.mk | 5 +
solenv/gbuild/Jar.mk | 12 ++-
solenv/gbuild/JavaClassSet.mk | 6 +
swext/Extension_wiki-publisher.mk | 14 ++-
tomcat/Module_tomcat.mk | 1
tomcat/Package_tomcat.mk | 16 ----
39 files changed, 171 insertions(+), 185 deletions(-)
New commits:
commit efcd482813e3f411d26c3291eae8d7c90394d161
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Oct 25 22:58:36 2013 +0200
libxmlsec: find internal NSS libs
Change-Id: Ic82691ea04fc6e698fb132a157a2bd2dfcf48784
diff --git a/libxmlsec/xmlsec1-configure.patch
b/libxmlsec/xmlsec1-configure.patch
index 1f6b718..622c063 100644
--- a/libxmlsec/xmlsec1-configure.patch
+++ b/libxmlsec/xmlsec1-configure.patch
@@ -109,7 +109,7 @@
- ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib
/usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name"
- ac_nss_inc_dir="/usr/include /usr/include/mozilla /usr/local/include
/usr/local/include/mozilla /usr/include/$ac_mozilla_name
/usr/local/include/$ac_mozilla_name"
-+ ac_nss_lib_dir="${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}"
++ ac_nss_lib_dir="${WORKDIR}/UnpackedTarball/nss/mozilla/dist/out/lib"
+ ac_nss_inc_dir="${WORKDIR}/UnpackedTarball/nss/mozilla/dist/out/include
${WORKDIR}/UnpackedTarball/nss/mozilla/dist/public"
AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
commit 7b1da9a478b53c29e5480040687c30460ecaa462
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Oct 25 21:30:05 2013 +0200
gbuild: remove gb_ExternalPackage_add_jar_for_install
Deliver all external jar files to INSTDIR directly.
Change-Id: Ibfaabf713da01e752517dc400200a6918d82db6d
diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk
b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
index 992810f..6ee1933 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 1346b88..0cb34cd 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 770ca06..3b7397a 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 ca60a27..3c93fce 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 f0196a8..d97619c 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 0f6ee51..eebb809 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 c097e76..edc3b78 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 4e4266c..790d5d2 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 c5d330b..9588a89 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 01f1bcc..ee1c6f3 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 4103811..2fc36d1 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 f576ed7..0eb9259 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 6425911..79b39d5 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 1f8df20..ad27f11 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 45ccf14..7dc6fa6 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 c1ff3fb..ad5697d 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:
commit a40fb598ec8ebb4a8c8793dd7be6ef93ae8941c1
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Oct 25 21:04:00 2013 +0200
jfreereport: use jar files from WORKDIR
Change-Id: Ie3d706841faae40e6172ae36894f4ad700d70571
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index d88b1c9..f8d79d7 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine))
-$(eval $(call gb_ExternalProject_use_packages,jfreereport_flow_engine,\
+$(eval $(call
gb_ExternalProject_use_external_projects,jfreereport_flow_engine,\
jfreereport_liblayout \
))
@@ -26,7 +26,12 @@ $(call
gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
-Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar)
\
- -Dlib=$(OUTDIR)/bin \
+ -Dlibbase.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar
\
+ -Dlibformula.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar
\
+ -Dliblayout.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_liblayout)/build/lib/liblayout.jar \
+ -Dlibloader.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_libloader)/dist/libloader-$(LIBLOADER_VERSION).jar
\
+ -Dlibserializer.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_libserializer)/dist/libserializer-$(LIBBASE_VERSION).jar
\
+ -Dlibxml.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_libxml)/dist/libxml-$(LIBXML_VERSION).jar
\
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
index b7be4ed..8d81c0d 100644
--- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -13,7 +13,7 @@ $(eval $(call
gb_ExternalProject_use_externals,jfreereport_liblayout,\
commons-logging \
))
-$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\
+$(eval $(call gb_ExternalProject_use_external_projects,jfreereport_liblayout,\
jfreereport_sac \
jfreereport_libbase \
jfreereport_flute \
@@ -38,6 +38,15 @@ $(call
gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
-Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar)
\
+ -Dflute.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \
+ -Dlibbase.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar
\
+ -Dlibformula.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar
\
+ -Dlibfonts.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_libfonts)/dist/libfonts-$(LIBFONTS_VERSION).jar
\
+ -Dlibloader.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_libloader)/dist/libloader-$(LIBLOADER_VERSION).jar
\
+ -Dlibrepository.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_librepository)/dist/librepository-$(LIBREPOSITORY_VERSION).jar
\
+ -Dlibserializer.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_libserializer)/dist/libserializer-$(LIBBASE_VERSION).jar
\
+ -Dlibxml.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_libxml)/dist/libxml-$(LIBXML_VERSION).jar
\
+ -Dsac.jar=$(call
gb_UnpackedTarball_get_dir,jfreereport_sac)/build/lib/sac.jar \
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
@@ -45,7 +54,6 @@ $(call
gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
) \
-Dantcontrib.available="true" \
-Dbuild.id="10682" \
- -Dlib=$(OUTDIR)/bin \
$(if $(debug),-Dbuild.debug="on") jar \
)
diff --git a/external/jfreereport/patches/flow-engine.patch
b/external/jfreereport/patches/flow-engine.patch
index 86f50a3..63f0dbd 100644
--- a/external/jfreereport/patches/flow-engine.patch
+++ b/external/jfreereport/patches/flow-engine.patch
@@ -1,12 +1,19 @@
--- misc/flow-engine-0.9.4/build.xml (Revision 6728)
+++ misc/build/flow-engine-0.9.4/build.xml (Arbeitskopie)
-@@ -24,7 +24,8 @@
+@@ -24,9 +24,13 @@
<!-- Setup the compile classpath -->
<path id="classpath">
- <fileset dir="lib">
+- <include name="*.jar" />
+- </fileset>
+ <pathelement path="${commons-logging.jar}"/>
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
++ <pathelement path="${libbase.jar}"/>
++ <pathelement path="${libformula.jar}"/>
++ <pathelement path="${liblayout.jar}"/>
++ <pathelement path="${libloader.jar}"/>
++ <pathelement path="${libserializer.jar}"/>
++ <pathelement path="${libxml.jar}"/>
</path>
+
+ <!-- Kill all the created directories -->
diff --git a/external/jfreereport/patches/liblayout.patch
b/external/jfreereport/patches/liblayout.patch
index 035d99b..cf82b5c 100644
--- a/external/jfreereport/patches/liblayout.patch
+++ b/external/jfreereport/patches/liblayout.patch
@@ -1,12 +1,22 @@
--- misc/liblayout-0.2.10/build.xml (Revision 6728)
+++ misc/build/liblayout-0.2.10/build.xml (Arbeitskopie)
-@@ -24,7 +24,8 @@
+@@ -24,9 +24,16 @@
<!-- Setup the compile classpath -->
<path id="classpath">
- <fileset dir="lib">
+- <include name="*.jar" />
+- </fileset>
+ <pathelement path="${commons-logging.jar}"/>
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
++ <pathelement path="${flute.jar}"/>
++ <pathelement path="${libbase.jar}"/>
++ <pathelement path="${libformula.jar}"/>
++ <pathelement path="${libfonts.jar}"/>
++ <pathelement path="${libloader.jar}"/>
++ <pathelement path="${librepository.jar}"/>
++ <pathelement path="${libserializer.jar}"/>
++ <pathelement path="${libxml.jar}"/>
++ <pathelement path="${sac.jar}"/>
</path>
+
+ <!-- Kill all the created directories -->
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index d6f2e60..732197d 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -119,6 +119,11 @@ $(call gb_ExternalProject_get_preparation_target,$(1)) :
$(call gb_ExternalProje
endef
+# call gb_ExternalProject_use_external_projects,project,projects
+define gb_ExternalProject_use_external_projects
+$(foreach ext,$(2),$(call gb_ExternalProject_use_external_project,$(1),$(ext)))
+endef
+
# Make an ExternalProject depend on an external
#
# this forwards to functions that must be defined in RepositoryExternal.mk.
commit 070ca1e280e5efd4c94970e405d2ca0736438472
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Oct 25 21:01:58 2013 +0200
jfreereport: stop pointlessly renaming the jar files
Change-Id: Ia2c5ce1176496e98643e2cefc65d4c6d0cf9c781
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b1a650e..75d2b52 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2915,12 +2915,12 @@ endef
else # !SYSTEM_JFREEREPORT
$(eval $(call gb_Helper_register_jars,OOO,\
- flow-engine-0.9.4 \
+ flow-engine \
flute-1.1.6 \
libbase-1.1.6 \
libfonts-1.1.6 \
libformula-1.1.7 \
- liblayout-0.2.10 \
+ liblayout \
libloader-1.1.6 \
librepository-1.1.6 \
libserializer-1.1.6 \
@@ -2929,7 +2929,7 @@ $(eval $(call gb_Helper_register_jars,OOO,\
))
define gb_Jar__use_flow-engine
-$(call gb_Jar_use_jar,$(1),flow-engine-0.9.4)
+$(call gb_Jar_use_jar,$(1),flow-engine)
endef
define gb_Jar__use_flute
@@ -2949,7 +2949,7 @@ $(call gb_Jar_use_jar,$(1),libformula-1.1.7)
endef
define gb_Jar__use_liblayout
-$(call gb_Jar_use_jar,$(1),liblayout-0.2.10)
+$(call gb_Jar_use_jar,$(1),liblayout)
endef
define gb_Jar__use_libloader
diff --git a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
index 1482967..ca60a27 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
@@ -14,6 +14,6 @@ $(eval $(call
gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreere
$(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-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar))
+$(eval $(call
gb_ExternalPackage_add_jar_for_install,jfreereport_flow_engine,bin/flow-engine.jar,build/lib/flow-engine.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 fc19dd1..c5d330b 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk
@@ -14,6 +14,6 @@ $(eval $(call
gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreerepo
$(eval $(call
gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout))
-$(eval $(call
gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar))
+$(eval $(call
gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout.jar,build/lib/liblayout.jar))
# vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/version.mk b/external/jfreereport/version.mk
index 4156932..af5980f 100644
--- a/external/jfreereport/version.mk
+++ b/external/jfreereport/version.mk
@@ -3,10 +3,8 @@ LIBBASE_VERSION=1.1.6
LIBFONTS_VERSION=1.1.6
LIBFORMAT_VERSION=1.1.6
LIBFORMULA_VERSION=1.1.7
-LIBLAYOUT_VERSION=0.2.10
LIBLOADER_VERSION=1.1.6
LIBREPOSITORY_VERSION=1.1.6
LIBSERIALIZER_VERSION=1.1.6
LIBXML_VERSION=1.1.7
-FLOW_ENGINE_VERSION=0.9.4
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf
b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf
index f98127d..502de48 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf
@@ -1,7 +1,7 @@
RegistrationClassName: org.libreoffice.report.pentaho.SOReportJobFactory
Class-Path: reportbuilderwizard.jar
flute-1.1.6.jar libserializer-1.1.6.jar libbase-1.1.6.jar
- libfonts-1.1.6.jar libformula-1.1.7.jar liblayout-0.2.10.jar
+ libfonts-1.1.6.jar libformula-1.1.7.jar liblayout.jar
libloader-1.1.6.jar librepository-1.1.6.jar libxml-1.1.7.jar
- flow-engine-0.9.4.jar sac.jar commons-logging-1.1.1.jar
+ flow-engine.jar sac.jar commons-logging-1.1.1.jar
UNO-Type-Path:
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 830d0a4..4d4e33d 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -137,12 +137,10 @@ endif
ifneq ($(SYSTEM_JFREEREPORT),YES)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
- -DFLOW_ENGINE_VERSION=$(FLOW_ENGINE_VERSION) \
-DFLUTE_VERSION=$(FLUTE_VERSION) \
-DLIBBASE_VERSION=$(LIBBASE_VERSION) \
-DLIBFONTS_VERSION=$(LIBFONTS_VERSION) \
-DLIBFORMULA_VERSION=$(LIBFORMULA_VERSION) \
- -DLIBLAYOUT_VERSION=$(LIBLAYOUT_VERSION) \
-DLIBLOADER_VERSION=$(LIBLOADER_VERSION) \
-DLIBREPOSITORY_VERSION=$(LIBREPOSITORY_VERSION) \
-DLIBSERIALIZER_VERSION=$(LIBSERIALIZER_VERSION) \
diff --git a/scp2/source/ooo/module_reportbuilder.scp
b/scp2/source/ooo/module_reportbuilder.scp
index 1c5b0f3..9e0ba42 100644
--- a/scp2/source/ooo/module_reportbuilder.scp
+++ b/scp2/source/ooo/module_reportbuilder.scp
@@ -57,12 +57,12 @@ STD_JAR_FILE(gid_File_Jar_CommonsLogging,
commons-logging-1.1.1)
/* Not sure, if can we use CONCAT3 in that context here? */
#ifndef SYSTEM_JFREEREPORT
- STD_JAR_FILE( gid_File_Jar_FlowEngine,
CONCAT3(flow-engine,-,FLOW_ENGINE_VERSION) )
+ STD_JAR_FILE( gid_File_Jar_FlowEngine, flow-engine )
STD_JAR_FILE( gid_File_Jar_Flute, CONCAT3(flute,-,FLUTE_VERSION) )
STD_JAR_FILE( gid_File_Jar_Libbase, CONCAT3(libbase,-,LIBBASE_VERSION) )
STD_JAR_FILE( gid_File_Jar_Libfonts, CONCAT3(libfonts,-,LIBFONTS_VERSION) )
STD_JAR_FILE( gid_File_Jar_Libformula,
CONCAT3(libformula,-,LIBFORMULA_VERSION) )
- STD_JAR_FILE( gid_File_Jar_Liblayout,
CONCAT3(liblayout,-,LIBLAYOUT_VERSION) )
+ STD_JAR_FILE( gid_File_Jar_Liblayout, liblayout )
STD_JAR_FILE( gid_File_Jar_Libloader,
CONCAT3(libloader,-,LIBLOADER_VERSION) )
STD_JAR_FILE( gid_File_Jar_Librepository,
CONCAT3(librepository,-,LIBREPOSITORY_VERSION) )
STD_JAR_FILE( gid_File_Jar_Libserializer,
CONCAT3(libserializer,-,LIBSERIALIZER_VERSION) )
commit 30ad101b102e4d69c9d2c55884ab975145d8c1db
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Oct 25 19:20:06 2013 +0200
tomcat: use servlet-api.jar from WORKDIR too
Change-Id: I985ee75aa6e313a5933c2b3f5c7c5b10a8b8b9f5
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 57e8d6b..b1a650e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2786,6 +2786,18 @@ endef
endif # SYSTEM_RHINO
+ifeq ($(SYSTEM_TOMCAT),YES)
+
+gb_ExternalProject__use_servlet_api :=
+
+else # !SYSTEM_TOMCAT
+
+define gb_ExternalProject__use_servlet_api
+$(eval $(call gb_ExternalProject_use_external_project,$(1),tomcat))
+endef
+
+endif # SYSTEM_TOMCAT
+
ifeq ($(SYSTEM_APACHE_COMMONS),YES)
define gb_Jar__use_commons-codec
diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk
b/external/apache-commons/ExternalProject_apache_commons_logging.mk
index 98a77eb..785224b 100644
--- a/external/apache-commons/ExternalProject_apache_commons_logging.mk
+++ b/external/apache-commons/ExternalProject_apache_commons_logging.mk
@@ -9,12 +9,9 @@
$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging))
-# TODO: this should go into RepositoryExternal.mk
-ifneq ($(SYSTEM_TOMCAT),YES)
-$(eval $(call gb_ExternalProject_use_packages,apache_commons_logging,\
- tomcat_inc \
+$(eval $(call gb_ExternalProject_use_externals,apache_commons_logging,\
+ servlet_api \
))
-endif
$(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\
build \
@@ -29,7 +26,7 @@ $(call
gb_ExternalProject_get_state_target,apache_commons_logging,build) :
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)"
\
$(if $(filter YES,$(SYSTEM_TOMCAT))\
,-Dservletapi.jar=$(SERVLETAPI_JAR) \
-
,-Dservletapi.jar=$(SOLARVER)/$(INPATH)/bin/servlet-api.jar \
+ ,-Dservletapi.jar=$(call
gb_UnpackedTarball_get_dir,tomcat)/servletapi/jsr154/dist/lib/servlet-api.jar \
)\
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
diff --git a/tomcat/Module_tomcat.mk b/tomcat/Module_tomcat.mk
index 0586573..621b807 100644
--- a/tomcat/Module_tomcat.mk
+++ b/tomcat/Module_tomcat.mk
@@ -13,7 +13,6 @@ ifneq ($(ENABLE_JAVA),)
ifneq ($(filter TOMCAT,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,tomcat,\
ExternalProject_tomcat \
- Package_tomcat \
UnpackedTarball_tomcat \
))
endif
diff --git a/tomcat/Package_tomcat.mk b/tomcat/Package_tomcat.mk
deleted file mode 100644
index 1ab9c5c..0000000
--- a/tomcat/Package_tomcat.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,tomcat_inc,$(call
gb_UnpackedTarball_get_dir,tomcat)))
-
-$(eval $(call gb_Package_use_external_project,tomcat_inc,tomcat))
-
-$(eval $(call
gb_Package_add_file,tomcat_inc,bin/servlet-api.jar,servletapi/jsr154/dist/lib/servlet-api.jar))
-
-# vim: set noet sw=4 ts=4:
commit 461d830ed8f664e171245b0cf9d53dc33a0f04d2
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Oct 25 18:40:48 2013 +0200
stop using apache-commons jars from OUTDIR too
Change-Id: I0d9282cd3a267ad2d25b43adbf995365aaa56fa1
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2232710..57e8d6b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2820,27 +2820,31 @@ $(eval $(call gb_Helper_register_jars,OXT,\
))
define gb_Jar__use_commons-codec
-$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-codec-1.6.jar)
+$(call gb_Jar_use_external_project,$(1),apache_commons_codec)
+$(call gb_Jar_use_external_jar,$(1),$(call
gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar,commons-codec-1.6.jar)
endef
define gb_ExternalProject__use_commons-codec
$(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec)
endef
define gb_Jar__use_commons-httpclient
-$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-httpclient-3.1.jar)
+$(call gb_Jar_use_external_project,$(1),apache_commons_httpclient)
+$(call gb_Jar_use_external_jar,$(1),$(call
gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar,commons-httpclient-3.1.jar)
endef
define gb_ExternalProject__use_commons-httpclient
$(call gb_ExternalProject_use_external_project,$(1),apache_commons_httpclient)
endef
define gb_Jar__use_commons-lang
-$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-lang-2.4.jar)
+$(call gb_Jar_use_external_project,$(1),apache_commons_lang)
+$(call gb_Jar_use_external_jar,$(1),$(call
gb_UnpackedTarball_get_dir,apache_commons_lang)/dist/commons-lang-2.4.jar,commons-lang-2.4.jar)
endef
define gb_ExternalProject__use_commons-lang
$(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang)
endef
define gb_Jar__use_commons-logging
+$(call gb_Jar_use_external_project,$(1),apache_commons_logging)
$(call gb_Jar_use_jar,$(1),commons-logging-1.1.1)
endef
define gb_ExternalProject__use_commons-logging
diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk
b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
index 41cd2c6..992810f 100644
--- a/external/apache-commons/ExternalPackage_apache_commons_logging.mk
+++ b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
@@ -7,10 +7,10 @@
# 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_ExternalPackage,apache_commons_logging,apache_commons_logging))
-$(eval $(call
gb_ExternalPackage_use_external_project,apache_commons_logging_inc,apache_commons_logging))
+$(eval $(call
gb_ExternalPackage_use_external_project,apache_commons_logging,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))
+$(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))
# vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/Module_apache-commons.mk
b/external/apache-commons/Module_apache-commons.mk
index 59d25eb..1dcac4d 100644
--- a/external/apache-commons/Module_apache-commons.mk
+++ b/external/apache-commons/Module_apache-commons.mk
@@ -15,9 +15,6 @@ $(eval $(call gb_Module_add_targets,apache-commons,\
ExternalProject_apache_commons_httpclient \
ExternalProject_apache_commons_lang \
ExternalProject_apache_commons_logging \
- Package_apache_commons_codec \
- Package_apache_commons_httpclient \
- Package_apache_commons_lang \
UnpackedTarball_apache_commons_codec \
UnpackedTarball_apache_commons_httpclient \
UnpackedTarball_apache_commons_lang \
diff --git a/external/apache-commons/Package_apache_commons_codec.mk
b/external/apache-commons/Package_apache_commons_codec.mk
deleted file mode 100644
index 65d302b..0000000
--- a/external/apache-commons/Package_apache_commons_codec.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_codec_inc,$(call
gb_UnpackedTarball_get_dir,apache_commons_codec)))
-
-$(eval $(call
gb_Package_use_external_project,apache_commons_codec_inc,apache_commons_codec))
-
-$(eval $(call
gb_Package_add_file,apache_commons_codec_inc,bin/commons-codec-1.6.jar,dist/commons-codec-1.6-SNAPSHOT.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/Package_apache_commons_httpclient.mk
b/external/apache-commons/Package_apache_commons_httpclient.mk
deleted file mode 100644
index dd21d77..0000000
--- a/external/apache-commons/Package_apache_commons_httpclient.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_httpclient_inc,$(call
gb_UnpackedTarball_get_dir,apache_commons_httpclient)))
-
-$(eval $(call
gb_Package_use_external_project,apache_commons_httpclient_inc,apache_commons_httpclient))
-
-$(eval $(call
gb_Package_add_file,apache_commons_httpclient_inc,bin/commons-httpclient-3.1.jar,dist/commons-httpclient.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/apache-commons/Package_apache_commons_lang.mk
b/external/apache-commons/Package_apache_commons_lang.mk
deleted file mode 100644
index a9c1eb3..0000000
--- a/external/apache-commons/Package_apache_commons_lang.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_lang_inc,$(call
gb_UnpackedTarball_get_dir,apache_commons_lang)))
-
-$(eval $(call
gb_Package_use_external_project,apache_commons_lang_inc,apache_commons_lang))
-
-$(eval $(call
gb_Package_add_file,apache_commons_lang_inc,bin/commons-lang-2.4.jar,dist/commons-lang-2.4.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index 08b8613..d88b1c9 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -23,7 +23,9 @@ $(call
gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
-q \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)"
\
- $(if $(filter
YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\
+ $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
+ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
+
-Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar)
\
-Dlib=$(OUTDIR)/bin \
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
index cddbef1..b7be4ed 100644
--- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -9,11 +9,9 @@
$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout))
-ifneq ($(SYSTEM_APACHE_COMMONS),YES)
-$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\
- apache_commons_logging_inc \
+$(eval $(call gb_ExternalProject_use_externals,jfreereport_liblayout,\
+ commons-logging \
))
-endif
$(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\
jfreereport_sac \
@@ -37,7 +35,9 @@ $(call
gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
-q \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)"
\
- $(if $(filter
YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\
+ $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
+ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \
+
-Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar)
\
$(if $(filter yes,$(JAVACISGCJ))\
,-Dbuild.compiler=gcj \
,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index da5be96..d98259e 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -278,6 +278,15 @@ $(call gb_Extension__get_preparation_target,$(1)) \
endef
+# Add a dependency on an ExternalProject.
+#
+# call gb_Extension_use_external_project,extension,externalproject
+define gb_Extension_use_external_project
+$(call gb_Extension__get_preparation_target,$(1)) \
+ :| $(call gb_ExternalProject_get_target,$(2))
+
+endef
+
define gb_Extension_use_package
$(call gb_Extension__get_preparation_target,$(1)) \
:| $(call gb_Package_get_target,$(2))
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 2c6ba14..62e33d5 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -221,10 +221,11 @@ $(call gb_Jar_add_manifest_classpath,$(1),$(call
gb_Helper_make_url,$(2)))
endef
+# call gb_Jar_use_external_jar,jar,externaljarfullpath,manifestentry
define gb_Jar_use_external_jar
+$(if $(3),,$(call gb_Output_error,gb_Jar_use_external_jar: manifest entry
missing))
$(call gb_JavaClassSet_use_system_jar,$(call
gb_Jar_get_classsetname,$(1)),$(2))
-$(call gb_Jar_add_manifest_classpath,$(1),$(notdir $(2)))
-$(call gb_Jar_get_target,$(1)) : $(2)
+$(call gb_Jar_add_manifest_classpath,$(1),$(3))
endef
@@ -283,6 +284,13 @@ $(foreach customtarget,$(2),$(call
gb_Jar_use_customtarget,$(1),$(customtarget))
endef
+# Add a dependency on an ExternalProject.
+#
+# call gb_Jar_use_external_project,jar,externalproject
+define gb_Jar_use_external_project
+$(call gb_JavaClassSet_use_external_project,$(call
gb_Jar_get_classsetname,$(1)),$(2))
+endef
+
# possible directories for jar files containing UNO services
gb_Jar_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 8063008..5d96749 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -197,4 +197,10 @@ $(call gb_JavaClassSet_add_classpath,$(1),$(call
gb_CustomTarget_get_workdir,$(2
endef
+define gb_JavaClassSet_use_external_project
+$(call gb_JavaClassSet_get_preparation_target,$(1)) : \
+ $(call gb_ExternalProject_get_target,$(2))
+
+endef
+
# vim: set noet sw=4:
diff --git a/swext/Extension_wiki-publisher.mk
b/swext/Extension_wiki-publisher.mk
index 7dc713c..5e04323 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -13,14 +13,20 @@ $(eval $(call
gb_Extension_Extension,wiki-publisher,swext/mediawiki/src))
$(eval $(call gb_Extension_use_unpacked,wiki-publisher,xsltml))
+$(eval $(call gb_Extension_use_package,wiki-publisher,apache_commons_logging))
+
+$(eval $(call
gb_Extension_use_external_project,wiki-publisher,apache_commons_codec))
+$(eval $(call
gb_Extension_use_external_project,wiki-publisher,apache_commons_httpclient))
+$(eval $(call
gb_Extension_use_external_project,wiki-publisher,apache_commons_lang))
+
$(eval $(call gb_Extension_use_default_description,wiki-publisher))
$(eval $(call gb_Extension_use_default_license,wiki-publisher))
ifneq ($(SYSTEM_APACHE_COMMONS),YES)
-$(eval $(call
gb_Extension_add_file,wiki-publisher,commons-codec-1.6.jar,$(OUTDIR)/bin/commons-codec-1.6.jar))
-$(eval $(call
gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar))
-$(eval $(call
gb_Extension_add_file,wiki-publisher,commons-lang-2.4.jar,$(OUTDIR)/bin/commons-lang-2.4.jar))
-$(eval $(call
gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar))
+$(eval $(call
gb_Extension_add_file,wiki-publisher,commons-codec-1.6.jar,$(call
gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar))
+$(eval $(call
gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(call
gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.4.jar,$(call
gb_UnpackedTarball_get_dir,apache_commons_lang)/dist/commons-lang-2.4.jar))
+$(eval $(call
gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(call
gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar))
endif
$(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(call
gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu)))
$(eval $(call
gb_Extension_add_file,wiki-publisher,Filter.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
commit 15a9ef2147e2cdcc1ec5bb2f63e0154bcd5fa651
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Oct 25 17:44:19 2013 +0200
configure: remove --with-solver-and-workdir-root
This was just a crude hack, obsoleted by working out-of-tree builds.
Change-Id: I2551df8dae9a7e05edc29de911ba9f9d70466148
diff --git a/configure.ac b/configure.ac
index 49cfae7..c2c8b41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1327,11 +1327,6 @@ AC_ARG_WITH(external-tar,
TARFILE_LOCATION=$withval ,
)
-AC_ARG_WITH(solver-and-workdir-root,
- AS_HELP_STRING([--with-solver-and-workdir-root=<PATH>],
- [Specify path that contains SOLARVER and WORKDIR directories
manually.])
-)
-
AC_ARG_WITH(referenced-git,
AS_HELP_STRING([--with-referenced-git=<OTHER_CHECKOUT_DIR>],
[Specify another checkout directory to reference. This makes use of
@@ -2339,20 +2334,7 @@ else
fi
AC_SUBST(DISABLE_DYNLOADING)
-if test -n "${with_solver_and_workdir_root}"; then
- if ! test -d ${with_solver_and_workdir_root}; then
- AC_MSG_ERROR([directory does not exist: ${with_solver_and_workdir_root}])
- fi
- PathFormat "${with_solver_and_workdir_root}"
- # IsValidFilePath in /sal/osl/w32/file_url.cxx rejects "X:\\" breaking idlc
- if echo ${formatted_path} | $GREP -q '/$'; then
- SOLARVER=${formatted_path}solver
- else
- SOLARVER=${formatted_path}/solver
- fi
-else
- SOLARVER=${BUILDDIR}/solver
-fi
+SOLARVER="${BUILDDIR}/solver"
# remenber SYSBASE value
AC_SUBST(SYSBASE)
@@ -4387,20 +4369,8 @@ if test "$enable_headless" = "yes"; then
fi
INPATH="${OUTPATH}${PROEXT}"
-if test -n "${with_solver_and_workdir_root}"; then
- PathFormat "${with_solver_and_workdir_root}"
- # IsValidFilePath in /sal/osl/w32/file_url.cxx rejects "X:\\" breaking idlc
- if echo ${formatted_path} | $GREP -q '/$'; then
- WORKDIR=${formatted_path}workdir/${INPATH}
- INSTDIR=${formatted_path}instdir/${INPATH}
- else
- WORKDIR=${formatted_path}/workdir/${INPATH}
- INSTDIR=${formatted_path}/instdir/${INPATH}
- fi
-else
- WORKDIR=${BUILDDIR}/workdir/${INPATH}
- INSTDIR=${BUILDDIR}/instdir/${INPATH}
-fi
+WORKDIR="${BUILDDIR}/workdir/${INPATH}"
+INSTDIR="${BUILDDIR}/instdir/${INPATH}"
INSTROOT="${INSTDIR}${INSTROOTSUFFIX}"
OUTDIR="${SOLARVER}/${INPATH}"
SOLARINC="-I. -I$SRC_ROOT/include $SOLARINC"
@@ -4507,7 +4477,6 @@ if test "$cross_compiling" = "yes"; then
test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts
--with-ant-home=$with_ant_home"
test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts
--with-external-tar=$TARFILE_LOCATION"
- test -n "${with_solver_and_workdir_root}" && sub_conf_opts="$sub_conf_opts
--with-solver-and-workdir-root=${with_solver_and_workdir_root}"
test -n "$with_system_boost_for_build" && sub_conf_opts="$sub_conf_opts
--with-system-boost"
test -n "$with_system_cppunit_for_build" && sub_conf_opts="$sub_conf_opts
--with-system-cppunit"
test -n "$with_system_expat_for_build" && sub_conf_opts="$sub_conf_opts
--with-system-expat"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
