apache-commons/java/codec/makefile.mk | 4 ++--
apache-commons/java/httpclient/makefile.mk | 4 ++--
apache-commons/java/lang/makefile.mk | 4 ++--
apache-commons/java/logging/makefile.mk | 4 ++--
beanshell/makefile.mk | 2 +-
configure.in | 18 +++++++-----------
hsqldb/makefile.mk | 4 ++--
jfreereport/java/flute/makefile.mk | 4 ++--
jfreereport/java/jfreereport/makefile.mk | 4 ++--
jfreereport/java/libbase/makefile.mk | 4 ++--
jfreereport/java/libfonts/makefile.mk | 4 ++--
jfreereport/java/libformula/makefile.mk | 4 ++--
jfreereport/java/liblayout/makefile.mk | 4 ++--
jfreereport/java/libloader/makefile.mk | 4 ++--
jfreereport/java/librepository/makefile.mk | 4 ++--
jfreereport/java/libserializer/makefile.mk | 4 ++--
jfreereport/java/libxml/makefile.mk | 4 ++--
jfreereport/java/sac/makefile.mk | 4 ++--
languagetool/makefile.mk | 4 ++--
rhino/makefile.mk | 4 ++--
saxon/makefile.mk | 2 +-
solenv/gbuild/JunitTest.mk | 2 +-
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 +-
tomcat/makefile.mk | 4 ++--
24 files changed, 49 insertions(+), 53 deletions(-)
New commits:
commit 177babaa9c0e0f8cdef3c73b595692c87e6b3cbf
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Jul 10 16:22:29 2012 +0200
gbuild: sigh... that didn't help... let's try an eval here
Change-Id: Ief6367a5fb8e2e1000bb94c7a4e6cf2095b24543
(cherry picked from commit 9991c0f552bfc9c6ea3e6e6d65fe67cc32f243fd)
Signed-off-by: Bjoern Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit e0c8a659d18d33fec4f6aa648be82f2241dd75f6)
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 177cad6..4499cba 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -71,7 +71,7 @@ $(call gb_JunitTest_get_target,%) :
define gb_JunitTest_JunitTest
$(call gb_JunitTest_get_target,$(1)) : T_CP := $(value
XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call
gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib
$(call gb_JunitTest_get_target,$(1)) : CLASSES :=
-$(call gb_JunitTest_JunitTest_platform,$(1))
+$(eval $(call gb_JunitTest_JunitTest_platform,$(1)))
$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)))
$(call gb_JunitTest_get_target,$(1)) : $(call
gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1)))
commit 7ee7ead3b84bab0c03054a3cc1d9d6193f0f2b24
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Jul 10 15:29:02 2012 +0200
gbuild: remove trailing \ that is apparently...
... causing LO patched make 3.82 to fail with "Malformed target-specific
variable definition" on the next line.
(cherry picked from commit c854d36984789c1ffac8c83c929406c10ba99462)
Signed-off-by: Bjoern Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 3e67572cc8bd057a0b7916bcaffb60618d18069e)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 2cf856c..d05c3ac 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -643,7 +643,7 @@ $(call
gb_JunitTest_JunitTest_platform_longpathname_hack,$(1))
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:`cat
$(call gb_JunitTest_get_target,$(1)).instpath`/opt/OpenOffice.org
3/program/soffice.exe}" \
-Dorg.openoffice.test.arg.env=PATH \
- -Dorg.openoffice.test.arg.user=file:///$(call
gb_JunitTest_get_userdir,$(1)) \
+ -Dorg.openoffice.test.arg.user=file:///$(call
gb_JunitTest_get_userdir,$(1))
endef
commit 446453aae8b0c442721b1715ccaf2a8ed126090c
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Jul 10 13:06:47 2012 +0200
quote $ANT in makefiles so path with spaces works
(cherry picked from commit 4fb8a68b0b70243b9c272764cd4762ad5ebf4054)
Signed-off-by: Bjoern Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit 12d79f250011f49a9061d51cf79caacbd548d28a)
diff --git a/apache-commons/java/codec/makefile.mk
b/apache-commons/java/codec/makefile.mk
index 8464353..fc59a3a 100644
--- a/apache-commons/java/codec/makefile.mk
+++ b/apache-commons/java/codec/makefile.mk
@@ -57,9 +57,9 @@ ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj
-f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/apache-commons/java/httpclient/makefile.mk
b/apache-commons/java/httpclient/makefile.mk
index 55302e8..c578621 100644
--- a/apache-commons/java/httpclient/makefile.mk
+++ b/apache-commons/java/httpclient/makefile.mk
@@ -60,9 +60,9 @@ ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj
-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR)
-Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)"
-Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR)
-Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"
-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR)
-Dcommons-codec.jar=$(COMMONS_CODEC_JAR)
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)"
-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR)
-Dcommons-codec.jar=$(COMMONS_CODEC_JAR)
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/apache-commons/java/lang/makefile.mk
b/apache-commons/java/lang/makefile.mk
index 88a7e1f..099bcd4 100644
--- a/apache-commons/java/lang/makefile.mk
+++ b/apache-commons/java/lang/makefile.mk
@@ -57,9 +57,9 @@ ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj
-f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE)
jar
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE)
jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/apache-commons/java/logging/makefile.mk
b/apache-commons/java/logging/makefile.mk
index cc1f1a6..670ccbb 100644
--- a/apache-commons/java/logging/makefile.mk
+++ b/apache-commons/java/logging/makefile.mk
@@ -63,9 +63,9 @@ SERVLETAPI_JAR :=
$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj
-Dservletapi.jar=$(SERVLETAPI_JAR) -f $(ANT_BUILDFILE) compile build-jar
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)"
-Dbuild.compiler=gcj -Dservletapi.jar=$(SERVLETAPI_JAR) -f $(ANT_BUILDFILE)
compile build-jar
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE)
-Dservletapi.jar=$(SERVLETAPI_JAR) compile build-jar
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE)
-Dservletapi.jar=$(SERVLETAPI_JAR) compile build-jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk
index dc22223..09b8427 100644
--- a/beanshell/makefile.mk
+++ b/beanshell/makefile.mk
@@ -43,7 +43,7 @@ TARFILE_MD5=ea570af93c284aa9e5621cd563f54f4d
TARFILE_ROOTDIR=BeanShell
PATCH_FILES=bsh-2.0b1-src.patch
-BUILD_ACTION=$(ANT) $(ANT_FLAGS)
+BUILD_ACTION="$(ANT)" $(ANT_FLAGS)
# --- Targets ------------------------------------------------------
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index 3692403..fe1c9d9 100755
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -72,9 +72,9 @@ JAVA_HOME=
.ENDIF
.IF "$(JAVACISGCJ)"=="yes"
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj
-f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.IF "$(debug)"!=""
diff --git a/jfreereport/java/flute/makefile.mk
b/jfreereport/java/flute/makefile.mk
index 0e4d28b..63731fd 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -49,9 +49,9 @@ CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dbuild.compiler=gcj
-f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)" -Dbuild.compiler=gcj
-f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(FLUTE_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/jfreereport/makefile.mk
b/jfreereport/java/jfreereport/makefile.mk
index fb082f9..af92376 100644
--- a/jfreereport/java/jfreereport/makefile.mk
+++ b/jfreereport/java/jfreereport/makefile.mk
@@ -48,9 +48,9 @@ CONVERTFILES=build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE)
jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE)
jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libbase/makefile.mk
b/jfreereport/java/libbase/makefile.mk
index 3a580c4..54a247b 100644
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -49,9 +49,9 @@ CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dbuild.compiler=gcj
-f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)" -Dbuild.compiler=gcj
-f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBBASE_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libfonts/makefile.mk
b/jfreereport/java/libfonts/makefile.mk
index cffe2a9..69f181c 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -48,9 +48,9 @@ CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBFONTS_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libformula/makefile.mk
b/jfreereport/java/libformula/makefile.mk
index 33ff65f..d6f1087 100644
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@ -48,9 +48,9 @@ CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBFORMULA_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
diff --git a/jfreereport/java/liblayout/makefile.mk
b/jfreereport/java/liblayout/makefile.mk
index 7e4977d..92c8a32 100644
--- a/jfreereport/java/liblayout/makefile.mk
+++ b/jfreereport/java/liblayout/makefile.mk
@@ -48,9 +48,9 @@ CONVERTFILES=build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE)
jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE)
jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libloader/makefile.mk
b/jfreereport/java/libloader/makefile.mk
index c0741e3..811d382 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -49,9 +49,9 @@ CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBLOADER_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/librepository/makefile.mk
b/jfreereport/java/librepository/makefile.mk
index 617572c..02d9d96 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -49,9 +49,9 @@ CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBREPOSITORY_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libserializer/makefile.mk
b/jfreereport/java/libserializer/makefile.mk
index d5ee7cc..f92c529 100644
--- a/jfreereport/java/libserializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@ -48,9 +48,9 @@ CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBSERIALIZER_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/libxml/makefile.mk
b/jfreereport/java/libxml/makefile.mk
index 1ae17a1..f225a58 100644
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@ -48,9 +48,9 @@ CONVERTFILES=common_build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dbuild.compiler=gcj
-f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)" -Dbuild.compiler=gcj
-f $(ANT_BUILDFILE) jar
.ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+BUILD_ACTION="$(ANT)" -Dlib="../../../class"
-Dbuild.label="build-$(RSCREVISION)" -Dantcontrib.available="true"
-Dbuild.id="10682" -Dproject.revision="$(LIBXML_VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk
index 899fc25..337e752 100644
--- a/jfreereport/java/sac/makefile.mk
+++ b/jfreereport/java/sac/makefile.mk
@@ -58,9 +58,9 @@ ADDITIONAL_FILES=build.xml
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"
-Dantcontrib.available="true" -Dproject.revision="$(VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)"
-Dantcontrib.available="true" -Dproject.revision="$(VERSION)"
-Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
.ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"
-Dantcontrib.available="true" -Dproject.revision="$(VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
+BUILD_ACTION="$(ANT)" -Dbuild.label="build-$(RSCREVISION)"
-Dantcontrib.available="true" -Dproject.revision="$(VERSION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/languagetool/makefile.mk b/languagetool/makefile.mk
index c30fb28..ba04047 100644
--- a/languagetool/makefile.mk
+++ b/languagetool/makefile.mk
@@ -46,9 +46,9 @@ PATCH_FILES=JLanguageTool-1.4.0.patch
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin
-Dbuild.compiler=gcj dist
+BUILD_ACTION="$(ANT)" -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin
-Dbuild.compiler=gcj dist
.ELSE
-BUILD_ACTION=$(ANT) -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin
-Dant.build.javac.target=$(JAVA_TARGET_VER) dist
+BUILD_ACTION="$(ANT)" -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin
-Dant.build.javac.target=$(JAVA_TARGET_VER) dist
.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index 577d030..8a2a80c 100644
--- a/rhino/makefile.mk
+++ b/rhino/makefile.mk
@@ -58,9 +58,9 @@ FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION)
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)"
-Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
+BUILD_ACTION="$(ANT)" -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)"
-Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar
.ELSE
-BUILD_ACTION=$(ANT) -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)"
-Dbuild.label="build-$(RSCREVISION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) jar
+BUILD_ACTION="$(ANT)" -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)"
-Dbuild.label="build-$(RSCREVISION)"
-Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER) jar
.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/saxon/makefile.mk b/saxon/makefile.mk
index e73eced..40a7404 100644
--- a/saxon/makefile.mk
+++ b/saxon/makefile.mk
@@ -51,7 +51,7 @@ TARFILE_ROOTDIR=src
PATCH_FILES=saxon-9.0.0.7-bj.patch
-BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dsolarbindir=$(SOLARBINDIR) jar-bj
+BUILD_ACTION="$(ANT)" $(ANT_FLAGS) -Dsolarbindir=$(SOLARBINDIR) jar-bj
OUT2CLASS= saxon-build$/9.0.0.7$/bj$/saxon9.jar
diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk
index 9bdae76..27ac902 100755
--- a/tomcat/makefile.mk
+++ b/tomcat/makefile.mk
@@ -50,9 +50,9 @@ PATCH_FILES=tomcat.patch
BUILD_DIR=jakarta-servletapi-5
.IF "$(JAVACISGCJ)"=="yes"
-BUILD_ACTION=$(ANT)
+BUILD_ACTION="$(ANT)"
.ELSE
-BUILD_ACTION=$(ANT) -Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER)
+BUILD_ACTION="$(ANT)" -Dant.build.javac.source=$(JAVA_SOURCE_VER)
-Dant.build.javac.target=$(JAVA_TARGET_VER)
.ENDIF
# --- Targets ------------------------------------------------------
commit f0d246028e37f4d71e2a4fb580d277e5a485ceba
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jul 9 19:37:12 2012 +0200
configure: don't fail if ant home contains space
Change-Id: I70ee8a557cb0e9aee393939e886cf82d8a9fc79c
(cherry picked from commit 32aa5e6aa0e0e976a16204b23699031192b9bb34)
Signed-off-by: Bjoern Michaelsen <bjoern.michael...@canonical.com>
(cherry picked from commit ca7e5ff61db9d96e1a48e16cd1cb97555cecba6b)
Conflicts:
configure.in
diff --git a/configure.in b/configure.in
index 5830bdf..20e81aa 100644
--- a/configure.in
+++ b/configure.in
@@ -9008,17 +9008,15 @@ EOF
oldJAVA_HOME=$JAVA_HOME
if test "$JAVACISGCJ" = "yes"; then
JAVA_HOME=; export JAVA_HOME
- ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
- else
- ant_cmd="$ANT -buildfile conftest.xml 1>&2"
+ ant_gcj="-Dbuild.compiler=gcj"
fi
- AC_TRY_EVAL(ant_cmd)
+ AC_TRY_COMMAND("$ANT" $ant_gcj -buildfile conftest.xml 1>&2)
if test $? = 0 && test -f ./conftest.class ; then
AC_MSG_RESULT([Ant works])
if test -z "$WITH_ANT_HOME"; then
- ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e
"s#ant.home : ##g"`
+ ANT_HOME=`"$ANT" -diagnostics | $EGREP "ant.home :" | $SED -e
"s#ant.home : ##g"`
if test -z "$ANT_HOME"; then
- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
+ ANT_HOME=`echo "$ANT" | $SED -n "s/\/bin\/ant.*\$//p"`
fi
else
ANT_HOME="$WITH_ANT_HOME"
@@ -9075,7 +9073,7 @@ EOF
ant_minminor1=`echo $ant_minver | cut -d"." -f2`
AC_MSG_CHECKING([whether Ant is >= $ant_minver])
- ant_version=`$ANT -version | $AWK '{ print $4; }'`
+ ant_version=`"$ANT" -version | $AWK '{ print $4; }'`
ant_version_major=`echo $ant_version | cut -d. -f1`
ant_version_minor=`echo $ant_version | cut -d. -f2`
echo "configure: ant_version $ant_version " >&5
@@ -9119,11 +9117,9 @@ EOF
if test "$JAVACISGCJ" = "yes"; then
JAVA_HOME=; export JAVA_HOME
- ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
- else
- ant_cmd="$ANT -buildfile conftest.xml 1>&2"
+ ant_gcj="-Dbuild.compiler=gcj"
fi
- AC_TRY_EVAL(ant_cmd)
+ AC_TRY_COMMAND("$ANT" $ant_gcj -buildfile conftest.xml 1>&2)
if test $? = 0 && test -f ./conftest.class ; then
AC_MSG_RESULT([yes])
rm -rf confdir
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
