changeset in /hg/icedtea6: Fix jtreg target and provide a stamp ...

[gnu_andrew at member.fsf.org]

changeset a473c58439cd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a473c58439cd
description:
	Fix jtreg target and provide a stamp for icedtea.

	2008-06-30  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		Make jtreg target work out of the source directory,
		and use a stamp to mark a finished icedtea build
		so we don't build it twice.
		* Makefile.in: Regenerated.

diffstat:

3 files changed, 30 insertions(+), 12 deletions(-)
ChangeLog   |    8 ++++++++
Makefile.am |   17 +++++++++++------
Makefile.in |   17 +++++++++++------

diffs (125 lines):

diff -r ce9440257cfe -r a473c58439cd ChangeLog
--- a/ChangeLog	Sun Jun 29 22:57:23 2008 +0100
+++ b/ChangeLog	Mon Jun 30 00:43:46 2008 +0100
@@ -1,3 +1,11 @@ 2008-06-29  Mark Wielaard  <mark at klomp.o
+2008-06-30  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Make jtreg target work out of the source directory,
+	and use a stamp to mark a finished icedtea build
+	so we don't build it twice.
+	* Makefile.in: Regenerated.
+
 2008-06-29  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (stamps/icedtea-ecj.stamp): Add dependency on
diff -r ce9440257cfe -r a473c58439cd Makefile.am
--- a/Makefile.am	Sun Jun 29 22:57:23 2008 +0100
+++ b/Makefile.am	Mon Jun 30 00:43:46 2008 +0100
@@ -734,6 +734,8 @@ icedtea: stamps/bootstrap-directory-syml
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+	mkdir -p stamps
+	touch stamps/icedtea.stamp
 
 icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
@@ -758,15 +760,18 @@ icedtea-debug: stamps/bootstrap-director
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
 	@echo "IcedTea (debug build) is served:" \
 	  $(BUILD_OUTPUT_DIR)-debug
+	mkdir -p stamps
+	touch stamps/icedtea.stamp
 
 clean-icedtea: stamps/extract.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make clobber
+	rm -f stamps/icedtea.stamp
 
 icedtea-against-icedtea: \
 	stamps/bootstrap-directory-symlink.stamp \
-	icedtea
+	stamps/icedtea.stamp
 
 # OpenJDK ecj Targets
 # ===================
@@ -1068,17 +1073,17 @@ clean-gcjwebplugin:
 
 # jtreg
 
-stamps/jtreg.stamp:
+stamps/jtreg.stamp: stamps/icedtea.stamp
 	rm -rf test/jtreg/classes
 	mkdir -p test/jtreg/classes
 	$(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
-		 -encoding iso-8859-1 `find test/jtreg/com -name '*.java'`
-	(cd test/jtreg; \
-	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm ../jtreg.jar \
+		 -encoding iso-8859-1 `find $(srcdir)/test/jtreg/com -name '*.java'`
+	(cd $(srcdir)/test/jtreg; \
+	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/jtreg.jar \
 		META-INF/MANIFEST.MF \
 		legal  README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
 		`find com -type f -a -not -name '*.java'` \
-		-C classes com)
+		-C $(abs_top_builddir)/test/jtreg/classes com)
 	mkdir -p stamps
 	touch $@
 
diff -r ce9440257cfe -r a473c58439cd Makefile.in
--- a/Makefile.in	Sun Jun 29 22:57:23 2008 +0100
+++ b/Makefile.in	Mon Jun 30 00:43:46 2008 +0100
@@ -1179,6 +1179,8 @@ icedtea: stamps/bootstrap-directory-syml
 	  extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+	mkdir -p stamps
+	touch stamps/icedtea.stamp
 
 icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
@@ -1203,15 +1205,18 @@ icedtea-debug: stamps/bootstrap-director
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
 	@echo "IcedTea (debug build) is served:" \
 	  $(BUILD_OUTPUT_DIR)-debug
+	mkdir -p stamps
+	touch stamps/icedtea.stamp
 
 clean-icedtea: stamps/extract.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make clobber
+	rm -f stamps/icedtea.stamp
 
 icedtea-against-icedtea: \
 	stamps/bootstrap-directory-symlink.stamp \
-	icedtea
+	stamps/icedtea.stamp
 
 # OpenJDK ecj Targets
 # ===================
@@ -1486,17 +1491,17 @@ clean-gcjwebplugin:
 
 # jtreg
 
-stamps/jtreg.stamp:
+stamps/jtreg.stamp: stamps/icedtea.stamp
 	rm -rf test/jtreg/classes
 	mkdir -p test/jtreg/classes
 	$(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
-		 -encoding iso-8859-1 `find test/jtreg/com -name '*.java'`
-	(cd test/jtreg; \
-	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm ../jtreg.jar \
+		 -encoding iso-8859-1 `find $(srcdir)/test/jtreg/com -name '*.java'`
+	(cd $(srcdir)/test/jtreg; \
+	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/jtreg.jar \
 		META-INF/MANIFEST.MF \
 		legal  README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
 		`find com -type f -a -not -name '*.java'` \
-		-C classes com)
+		-C $(abs_top_builddir)/test/jtreg/classes com)
 	mkdir -p stamps
 	touch $@