diff options
| -rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 9 | ||||
| -rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 12 | ||||
| -rw-r--r-- | external/jfreereport/patches/flow-engine.patch | 15 | ||||
| -rw-r--r-- | external/jfreereport/patches/liblayout.patch | 18 | ||||
| -rw-r--r-- | solenv/gbuild/ExternalProject.mk | 5 |
5 files changed, 47 insertions, 12 deletions
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index d88b1c9f58e5..f8d79d7b2211 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 b7be4eda163f..8d81c0d90366 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 86f50a3999df..63f0dbda0e9f 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 035d99bd3b96..cf82b5c05a80 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 d6f2e60b30fc..732197d20fdb 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. |