Mercurial > hg > release > icedtea6-1.2

changeset 872:d72271b9d9ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use -1.5 whenever possible. 2008-05-25 Mark Wielaard <mark@klomp.org> * Makefile.am: Use -source 1.5 whenever possible. * Makefile.in: Regenerated. * javac.in: Use -1.5.
author Mark Wielaard <mark@klomp.org>
date Sun, 25 May 2008 19:42:00 +0200
parents 39145184c656
children a1832ea486e9
files Makefile.am Makefile.in javac.in
diffstat 3 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Fri May 23 16:42:24 2008 -0400
+++ b/Makefile.am	Sun May 25 19:42:00 2008 +0200
@@ -796,12 +796,12 @@
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-            -source 1.6 \
+            -source 1.5 \
             -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
             -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-	    -source 1.6 \
+	    -source 1.5 \
 	    -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
 	    -bootclasspath '' @$< ; \
 	fi
@@ -843,12 +843,12 @@
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
-	    -source 1.6 \
+	    -source 1.5 \
 	    -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
 	    -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-            -source 1.6 \
+            -source 1.5 \
             -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
             -bootclasspath '' @$< ; \
 	fi
@@ -888,12 +888,12 @@
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
-	    -source 1.6 \
+	    -source 1.5 \
  	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
 	    -bootclasspath '' @extra-source-files.txt ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
-            -source 1.6 \
+            -source 1.5 \
             -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
             -bootclasspath '' @extra-source-files.txt ; \
 	fi
--- a/Makefile.in	Fri May 23 16:42:24 2008 -0400
+++ b/Makefile.in	Sun May 25 19:42:00 2008 +0200
@@ -1232,12 +1232,12 @@
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-            -source 1.6 \
+            -source 1.5 \
             -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
             -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-	    -source 1.6 \
+	    -source 1.5 \
 	    -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
 	    -bootclasspath '' @$< ; \
 	fi
@@ -1279,12 +1279,12 @@
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
-	    -source 1.6 \
+	    -source 1.5 \
 	    -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
 	    -bootclasspath '' @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-            -source 1.6 \
+            -source 1.5 \
             -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
             -bootclasspath '' @$< ; \
 	fi
@@ -1324,12 +1324,12 @@
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
-	    -source 1.6 \
+	    -source 1.5 \
  	    -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
 	    -bootclasspath '' @extra-source-files.txt ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
-            -source 1.6 \
+            -source 1.5 \
             -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
             -bootclasspath '' @extra-source-files.txt ; \
 	fi
--- a/javac.in	Fri May 23 16:42:24 2008 -0400
+++ b/javac.in	Sun May 25 19:42:00 2008 +0200
@@ -31,4 +31,4 @@
 fi
 
 CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
-  @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.6 -nowarn $bcoption $NEW_ARGS
+  @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS