external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 2 +-
external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5570de06507559b68338a29d48bb429942373f8f
Author: Michael Stahl <mst...@redhat.com>
Date: Sat Oct 26 00:00:27 2013 +0200
jfreereport: d'oh forgot the comma; why did this build for me???
Change-Id: I0e1abf55250cdc8c792b6894ebc81fcafe20ed67
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index f8d79d7..5e03d95 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -24,7 +24,7 @@ $(call
gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
-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) \
+ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \
-Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.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
\
diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
index 8d81c0d..3a9c273 100644
--- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -36,7 +36,7 @@ $(call
gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
-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) \
+ -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
\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
