Mercurial > hg > release > icedtea6-1.2

changeset 869:e42c2b2a8b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-05-22 Lillian Angel <langel@redhat.com> * Makefile.am: Fixed conditions for using JAVAC. * Makefile.in: Regenerated.
author Lillian Angel <langel@redhat.com>
date Thu, 22 May 2008 10:50:51 -0400
parents 5d3d25e58930
children 707fd0557fda
files ChangeLog Makefile.am Makefile.in
diffstat 3 files changed, 123 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue May 20 11:39:37 2008 -0400
+++ b/ChangeLog	Thu May 22 10:50:51 2008 -0400
@@ -1,3 +1,8 @@
+2008-05-22  Lillian Angel  <langel@redhat.com>
+
+	* Makefile.am: Fixed conditions for using JAVAC.
+	* Makefile.in: Regenerated.
+
 2008-05-20  Lillian Angel  <langel@redhat.com>
 
 	* Makefile.am: Fixed typo.
--- a/Makefile.am	Tue May 20 11:39:37 2008 -0400
+++ b/Makefile.am	Thu May 22 10:50:51 2008 -0400
@@ -793,10 +793,18 @@
 	mkdir -p lib/hotspot-tools
 
 stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
-	$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-	  -source 1.6 \
-	  -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
-	  -bootclasspath '' @$<
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	then \
+	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
+            -source 1.6 \
+            -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 \
+	    -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -bootclasspath '' @$< ; \
+	fi
 	mkdir -p stamps
 	touch stamps/hotspot-tools-class-files.stamp
 
@@ -809,9 +817,16 @@
 # tools.jar
 bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/
-	$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
-          -C lib/hotspot-tools org -C lib/hotspot-tools java \
-          -C lib/hotspot-tools javax
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	then \
+	  $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
+            -C lib/hotspot-tools org -C lib/hotspot-tools java \
+            -C lib/hotspot-tools javax ; \
+	else \
+	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
+            -C lib/hotspot-tools org -C lib/hotspot-tools java \
+            -C lib/hotspot-tools javax ; \
+	fi
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
@@ -825,10 +840,18 @@
 
 stamps/rt-class-files.stamp: rt-source-files.txt
 	mkdir -p lib/rt
-	$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-	  -source 1.6 \
-	  -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
-	  -bootclasspath '' @$<
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	then \
+	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
+	    -source 1.6 \
+	    -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -bootclasspath '' @$< ; \
+	else \
+	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
+            -source 1.6 \
+            -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+            -bootclasspath '' @$< ; \
+	fi
 	cp -r rt/net/sourceforge/jnlp/resources \
 	  lib/rt/net/sourceforge/jnlp/
 	mkdir -p stamps
@@ -842,8 +865,14 @@
 # rt-closed.jar.
 bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib
-	$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
-          -C lib/rt javax -C lib/rt net -C lib/rt sun
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	then \
+	  $(JAR) cf $@ -C lib/rt com -C lib/rt java \
+            -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
+	else \
+	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
+            -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
+	fi
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \
 	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
@@ -856,10 +885,17 @@
 stamps/extra-class-files.stamp: extra-source-files.txt \
 	bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 	mkdir -p extra-lib
-	$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
-	  -source 1.6 \
- 	  -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
-	  -bootclasspath '' @extra-source-files.txt
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
+	    -source 1.6 \
+ 	    -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 \
+            -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+            -bootclasspath '' @extra-source-files.txt ; \
+	fi
 	cp -r extra/net/sourceforge/jnlp/about/resources \
 	  extra-lib/net/sourceforge/jnlp/about
 	mkdir -p stamps
@@ -871,7 +907,12 @@
 	rm -f extra-source-files.txt
 
 extra-lib/about.jar: stamps/extra-class-files.stamp
-	$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	then \
+	  $(JAR) cf $@ -C extra-lib net ; \
+	else \
+	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
+	fi
 # gcjwebplugin.so.
 gcjwebplugin.so: gcjwebplugin.cc
 	if test "$(ENABLE_PLUGIN)" == "yes" ; \
--- a/Makefile.in	Tue May 20 11:39:37 2008 -0400
+++ b/Makefile.in	Thu May 22 10:50:51 2008 -0400
@@ -1229,10 +1229,18 @@
 	mkdir -p lib/hotspot-tools
 
 stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
-	$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-	  -source 1.6 \
-	  -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
-	  -bootclasspath '' @$<
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	then \
+	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
+            -source 1.6 \
+            -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 \
+	    -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -bootclasspath '' @$< ; \
+	fi
 	mkdir -p stamps
 	touch stamps/hotspot-tools-class-files.stamp
 
@@ -1245,9 +1253,16 @@
 # tools.jar
 bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/
-	$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
-          -C lib/hotspot-tools org -C lib/hotspot-tools java \
-          -C lib/hotspot-tools javax
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	then \
+	  $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
+            -C lib/hotspot-tools org -C lib/hotspot-tools java \
+            -C lib/hotspot-tools javax ; \
+	else \
+	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
+            -C lib/hotspot-tools org -C lib/hotspot-tools java \
+            -C lib/hotspot-tools javax ; \
+	fi
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
@@ -1261,10 +1276,18 @@
 
 stamps/rt-class-files.stamp: rt-source-files.txt
 	mkdir -p lib/rt
-	$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-	  -source 1.6 \
-	  -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
-	  -bootclasspath '' @$<
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	then \
+	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
+	    -source 1.6 \
+	    -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+	    -bootclasspath '' @$< ; \
+	else \
+	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
+            -source 1.6 \
+            -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+            -bootclasspath '' @$< ; \
+	fi
 	cp -r rt/net/sourceforge/jnlp/resources \
 	  lib/rt/net/sourceforge/jnlp/
 	mkdir -p stamps
@@ -1278,8 +1301,14 @@
 # rt-closed.jar.
 bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib
-	$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
-          -C lib/rt javax -C lib/rt net -C lib/rt sun
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	then \
+	  $(JAR) cf $@ -C lib/rt com -C lib/rt java \
+            -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
+	else \
+	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
+            -C lib/rt javax -C lib/rt net -C lib/rt sun ; \
+	fi
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \
 	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
@@ -1292,10 +1321,17 @@
 stamps/extra-class-files.stamp: extra-source-files.txt \
 	bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 	mkdir -p extra-lib
-	$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
-	  -source 1.6 \
- 	  -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
-	  -bootclasspath '' @extra-source-files.txt
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
+	    -source 1.6 \
+ 	    -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 \
+            -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+            -bootclasspath '' @extra-source-files.txt ; \
+	fi
 	cp -r extra/net/sourceforge/jnlp/about/resources \
 	  extra-lib/net/sourceforge/jnlp/about
 	mkdir -p stamps
@@ -1307,7 +1343,12 @@
 	rm -f extra-source-files.txt
 
 extra-lib/about.jar: stamps/extra-class-files.stamp
-	$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net
+	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
+	then \
+	  $(JAR) cf $@ -C extra-lib net ; \
+	else \
+	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
+	fi
 # gcjwebplugin.so.
 gcjwebplugin.so: gcjwebplugin.cc
 	if test "$(ENABLE_PLUGIN)" == "yes" ; \