diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-09-17 13:53:24 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-17 13:53:24 +0200 |
| commit | bab5d4804e95cbacc8a806261f43ac8cca83ba0b (patch) | |
| tree | aa4003ac23a72002bcc57d11e8b2f62e0115bac3 | |
| parent | 5fcef854f7b73754b2b25bb71703dabbfc583ff4 (diff) | |
build-java-target.diff: allow to define java targetOOO_BUILD_3_2_99_0_PRE
i#93115
allow to define java target, so the build is usable with the JVM 1.5
even when it is built with JDK 1.6
| -rwxr-xr-x | hsqldb/makefile.mk | 2 | ||||
| -rwxr-xr-x | rhino/makefile.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index 6b3166a..8b3d5b1 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -66,7 +66,7 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f .IF "$(debug)"!="" BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.debug="on" -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 diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 008fb0c..9f42ca2 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -53,7 +53,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" jar +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar .ENDIF # --- Targets ------------------------------------------------------ |