[ooo-build-commit] patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Thu Jun 25 10:21:36 PDT 2009
patches/dev300/apply | 3
patches/dev300/build-java-target-extensions-m11.diff | 147 +++++++++++++++++++
patches/dev300/build-java-target-extensions.diff | 11 +
3 files changed, 160 insertions(+), 1 deletion(-)
New commits:
commit fea309c6cb8c73ee9ab58747728387df04781efb
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Jun 25 19:20:04 2009 +0200
Set java target version also for libbase-1.0.0.jar
* patches/dev300/build-java-target-extensions-m11.diff:
* patches/dev300/build-java-target-extensions.diff:
* patches/dev300/apply: set java target stuff also in
jfreereport/java/libbase/makefile.mk
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 006ea56..df4b9ee 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -378,15 +378,16 @@ presentation-minimizer-no-license.diff
# Fixing build breake in apache-common module when you use UTF-8 based locale in the build system
apache-commons-build-fix-invalid-chars.diff, kami
wiki-publisher-no-license.diff
-build-java-target-extensions.diff, i#93115, pmladek
[ ExtensionFixes > ooo310-m11 ]
pdfimport-no-license.diff
# fix build with system zlib
sdext-system-zlib.diff, i#102679, caolan
+build-java-target-extensions.diff, i#93115, pmladek
[ ExtensionFixes <= ooo310-m11 ]
pdfimport-no-license-m11.diff
+build-java-target-extensions-m11.diff, i#93115, pmladek
[ NovellOnlyExtensionFixes ]
# allow build with ant-1.6
diff --git a/patches/dev300/build-java-target-extensions-m11.diff b/patches/dev300/build-java-target-extensions-m11.diff
new file mode 100644
index 0000000..719b9a9
--- /dev/null
+++ b/patches/dev300/build-java-target-extensions-m11.diff
@@ -0,0 +1,147 @@
+--- apache-commons/java/codec/makefile.mk.old 2008-07-17 15:39:27.000000000 +0200
++++ apache-commons/java/codec/makefile.mk 2008-08-25 16:28:13.000000000 +0200
+@@ -61,7 +61,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ 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)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+ .ENDIF
+
+ .ENDIF # $(SOLAR_JAVA)!= ""
+--- apache-commons/java/httpclient/makefile.mk.old 2008-07-17 15:39:42.000000000 +0200
++++ apache-commons/java/httpclient/makefile.mk 2008-08-25 16:30:51.000000000 +0200
+@@ -64,7 +64,7 @@ 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
+ .ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -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)!= ""
+--- tomcat/makefile.mk.old 2008-06-24 12:13:43.000000000 +0200
++++ tomcat/makefile.mk 2008-08-25 16:21:06.000000000 +0200
+@@ -52,7 +52,12 @@ ADDITIONAL_FILES = jakarta-servletapi-5/
+ PATCH_FILE_NAME=tomcat.patch
+
+ BUILD_DIR=jakarta-servletapi-5
++
++.IF "$(JAVACISGCJ)"=="yes"
+ BUILD_ACTION=$(ANT)
++.ELSE
++BUILD_ACTION=$(ANT) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER)
++.ENDIF
+
+ # --- Targets ------------------------------------------------------
+
+--- jfreereport/java/sac/makefile.mk.old 2008-07-17 15:36:54.000000000 +0200
++++ jfreereport/java/sac/makefile.mk 2008-08-25 16:25:41.000000000 +0200
+@@ -61,7 +61,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
+ .ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
++BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) all
+ .ENDIF
+
+ .ENDIF # $(SOLAR_JAVA)!= ""
+--- jfreereport/java/libformula/makefile.mk.old 2009-04-02 12:58:08.000000000 +0200
++++ jfreereport/java/libformula/makefile.mk 2009-04-22 17:02:30.000000000 +0200
+@@ -55,7 +55,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ 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)" -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
+
+
+--- jfreereport/java/librepository/makefile.mk.old 2009-04-02 12:58:08.000000000 +0200
++++ jfreereport/java/librepository/makefile.mk 2009-04-22 17:09:33.000000000 +0200
+@@ -53,7 +53,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ 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)" -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)!= ""
+--- jfreereport/java/libserializer/makefile.mk.old 2009-04-02 12:58:08.000000000 +0200
++++ jfreereport/java/libserializer/makefile.mk 2009-04-22 17:15:40.000000000 +0200
+@@ -53,7 +53,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ 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)" -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)!= ""
+--- jfreereport/java/flute/makefile.mk.old 2009-04-02 12:58:08.000000000 +0200
++++ jfreereport/java/flute/makefile.mk 2009-04-22 17:22:09.000000000 +0200
+@@ -54,7 +54,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ 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)" -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)!= ""
+--- jfreereport/java/libfonts/makefile.mk.old 2009-04-02 12:58:08.000000000 +0200
++++ jfreereport/java/libfonts/makefile.mk 2009-04-22 17:24:37.000000000 +0200
+@@ -53,7 +53,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ 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)" -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)!= ""
+--- jfreereport/java/libxml/makefile.mk.old 2009-04-02 12:58:08.000000000 +0200
++++ jfreereport/java/libxml/makefile.mk 2009-04-22 17:25:42.000000000 +0200
+@@ -53,7 +53,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ 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)" -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)!= ""
+--- jfreereport/java/liblayout/makefile.mk.old 2009-04-02 12:58:08.000000000 +0200
++++ jfreereport/java/liblayout/makefile.mk 2009-04-22 17:29:57.000000000 +0200
+@@ -53,7 +53,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ 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)" -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)!= ""
+--- jfreereport/java/jfreereport/makefile.mk.old 2009-04-02 12:58:08.000000000 +0200
++++ jfreereport/java/jfreereport/makefile.mk 2009-04-22 17:35:02.000000000 +0200
+@@ -54,7 +54,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ 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)" -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)!= ""
+--- jfreereport/java/libloader/makefile.mk.old 2009-04-02 12:58:08.000000000 +0200
++++ jfreereport/java/libloader/makefile.mk 2009-04-22 17:16:48.000000000 +0200
+@@ -53,7 +53,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ 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)" -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/patches/dev300/build-java-target-extensions.diff b/patches/dev300/build-java-target-extensions.diff
index 719b9a9..553b937 100644
--- a/patches/dev300/build-java-target-extensions.diff
+++ b/patches/dev300/build-java-target-extensions.diff
@@ -145,3 +145,14 @@
.ENDIF
.ENDIF # $(SOLAR_JAVA)!= ""
+--- jfreereport/java/libbase/makefile.mk.old 2009-03-20 14:44:30.000000000 +0100
++++ jfreereport/java/libbase/makefile.mk 2009-06-25 19:04:50.000000000 +0200
+@@ -53,7 +53,7 @@ JAVA_HOME=
+ .EXPORT : JAVA_HOME
+ 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)" -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)!= ""
More information about the ooo-build-commit
mailing list