changeset in /hg/icedtea: 2008-05-22 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Thu May 22 08:05:53 PDT 2008
changeset c095c04e718e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c095c04e718e
description:
2008-05-22 Lillian Angel <langel at redhat.com>
* Makefile.am: Updated conditions to use JAVAC.
* Makefile.in: Regenerated.
diffstat:
3 files changed, 79 insertions(+), 20 deletions(-)
ChangeLog | 5 +++++
Makefile.am | 47 +++++++++++++++++++++++++++++++++++++----------
Makefile.in | 47 +++++++++++++++++++++++++++++++++++++----------
diffs (174 lines):
diff -r 18827b149f3b -r c095c04e718e ChangeLog
--- a/ChangeLog Wed May 21 11:13:29 2008 -0400
+++ b/ChangeLog Thu May 22 11:05:48 2008 -0400
@@ -1,3 +1,8 @@ 2008-05-21 Lillian Angel <langel at redha
+2008-05-22 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am: Updated conditions to use JAVAC.
+ * Makefile.in: Regenerated.
+
2008-05-21 Lillian Angel <langel at redhat.com>
* generated/sun/awt/X11/generator/sizer.32: Regenerated.
diff -r 18827b149f3b -r c095c04e718e Makefile.am
--- a/Makefile.am Wed May 21 11:13:29 2008 -0400
+++ b/Makefile.am Thu May 22 11:05:48 2008 -0400
@@ -747,10 +747,17 @@ hotspot-tools-source-files.txt: stamps/c
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 -f stamps/icedtea-ecj.stamp ; \
+ then \
+ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
+ -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
+ @$< ; \
+ else \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
+ -bootclasspath '' -source 1.6 \
+ -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
+ @$< ; \
+ fi
mkdir -p stamps
touch stamps/hotspot-tools-class-files.stamp
@@ -763,9 +770,16 @@ clean-hotspot-tools:
# 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 \
+ if ! test -f stamps/icedtea-ecj.stamp ; \
+ then \
+ $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
+ -C lib/hotspot-tools org -C lib/hotspot-tools gnu -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 gnu -C lib/hotspot-tools java \
- -C lib/hotspot-tools javax
+ -C lib/hotspot-tools javax ; \
+ fi
if test -d bootstrap/ecj ; \
then \
mkdir -p bootstrap/ecj/lib/; \
@@ -779,10 +793,17 @@ rt-source-files.txt: stamps/clone.stamp
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 \
+ if ! test -f stamps/icedtea-ecj.stamp ; \
+ then \
+ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
-sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
- -bootclasspath '' @$<
+ @$< ; \
+ else \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
+ -bootclasspath '' -source 1.6 \
+ -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+ @$< ; \
+ fi
cp -r rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
@@ -796,8 +817,14 @@ clean-rt:
# 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 gnu -C lib/rt java \
+ if ! test -f stamps/icedtea-ecj.stamp ; \
+ then \
+ $(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
-C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
+ else \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
+ -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
+ 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; \
diff -r 18827b149f3b -r c095c04e718e Makefile.in
--- a/Makefile.in Wed May 21 11:13:29 2008 -0400
+++ b/Makefile.in Thu May 22 11:05:48 2008 -0400
@@ -1154,10 +1154,17 @@ hotspot-tools-source-files.txt: stamps/c
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 -f stamps/icedtea-ecj.stamp ; \
+ then \
+ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
+ -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
+ @$< ; \
+ else \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
+ -bootclasspath '' -source 1.6 \
+ -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
+ @$< ; \
+ fi
mkdir -p stamps
touch stamps/hotspot-tools-class-files.stamp
@@ -1170,9 +1177,16 @@ clean-hotspot-tools:
# 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 \
+ if ! test -f stamps/icedtea-ecj.stamp ; \
+ then \
+ $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
+ -C lib/hotspot-tools org -C lib/hotspot-tools gnu -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 gnu -C lib/hotspot-tools java \
- -C lib/hotspot-tools javax
+ -C lib/hotspot-tools javax ; \
+ fi
if test -d bootstrap/ecj ; \
then \
mkdir -p bootstrap/ecj/lib/; \
@@ -1186,10 +1200,17 @@ rt-source-files.txt: stamps/clone.stamp
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 \
+ if ! test -f stamps/icedtea-ecj.stamp ; \
+ then \
+ $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
-sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
- -bootclasspath '' @$<
+ @$< ; \
+ else \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
+ -bootclasspath '' -source 1.6 \
+ -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+ @$< ; \
+ fi
cp -r rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
@@ -1203,8 +1224,14 @@ clean-rt:
# 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 gnu -C lib/rt java \
+ if ! test -f stamps/icedtea-ecj.stamp ; \
+ then \
+ $(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
-C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
+ else \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
+ -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
+ 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; \
More information about the distro-pkg-dev
mailing list