/hg/icedtea6: Backed out changeset 967b9b186931

[andrew at icedtea.classpath.org]

changeset f9a68529d109 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f9a68529d109
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Dec 19 21:39:40 2011 +0000

	Backed out changeset 967b9b186931

	Reverting as this breaks make distcheck and make dist where builddir
	!= srcdir. Reintroduces confusion between 'jtreg' (the alias to the
	stamp) and jtreg, the directory.


diffstat:

 ChangeLog   |   7 -------
 Makefile.am |  14 +++++++-------
 2 files changed, 7 insertions(+), 14 deletions(-)

diffs (66 lines):

diff -r 967b9b186931 -r f9a68529d109 ChangeLog
--- a/ChangeLog	Fri Dec 16 16:44:20 2011 +0100
+++ b/ChangeLog	Mon Dec 19 21:39:40 2011 +0000
@@ -1,10 +1,3 @@
-2011-12-16  Matthias Klose  <doko at ubuntu.com>
-
-	* Makefile.am (JTREG_SRCS, REWRITER_SRCS, EXTRA_DIST): Don't use any
-	prefixes.
-	(stamps/jtreg.stamp, check-jdk): Use JTREG_SRCS with srcdir prefix.
-	(stamps/rewriter.stamp): Use REWRITER_SRCS with srcdir prefix.
-
 2011-12-16  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	* arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
diff -r 967b9b186931 -r f9a68529d109 Makefile.am
--- a/Makefile.am	Fri Dec 16 16:44:20 2011 +0100
+++ b/Makefile.am	Mon Dec 19 21:39:40 2011 +0000
@@ -192,8 +192,8 @@
 
 # Sources list
 
-REWRITER_SRCS = rewriter/com/redhat/rewriter/ClassRewriter.java
-JTREG_SRCS = jtreg
+REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
+JTREG_SRCS = $(abs_top_srcdir)/jtreg
 
 # Patch list
 
@@ -613,7 +613,7 @@
 # FIXME (distclean): Add pulseaudio sources
 
 EXTRA_DIST = generated \
-	patches/* \
+	$(top_srcdir)/patches/* \
 	contrib arm_port \
 	overlays \
 	jconsole.desktop policytool.desktop \
@@ -1805,7 +1805,7 @@
 if WITH_RHINO
 	mkdir -p $(REWRITER_BUILD_DIR)
 	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-	 -d $(REWRITER_BUILD_DIR) $(top_srcdir)/$(REWRITER_SRCS)
+	 -d $(REWRITER_BUILD_DIR) $(REWRITER_SRCS)
 endif
 	mkdir -p stamps
 	touch stamps/rewriter.stamp
@@ -2121,8 +2121,8 @@
 	rm -rf test/jtreg/classes
 	mkdir -p test/jtreg/classes
 	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d test/jtreg/classes \
-	   -encoding iso-8859-1 `find $(top_srcdir)/$(JTREG_SRCS) -name '*.java'`
-	(cd $(top_srcdir)/$(JTREG_SRCS); \
+	   -encoding iso-8859-1 `find $(JTREG_SRCS) -name '*.java'`
+	(cd $(JTREG_SRCS); \
 	 $(BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/test/jtreg.jar \
 	   META-INF/MANIFEST.MF \
 	   legal  README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
@@ -2174,7 +2174,7 @@
 		-w:test/jdk/JTwork -r:test/jdk/JTreport \
 		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
 		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
-		-exclude:$(abs_top_srcdir)/$(JTREG_SRCS)/excludelist.jdk.jtx \
+		-exclude:$(JTREG_SRCS)/excludelist.jdk.jtx \
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/jdk/test \
 	    | tee test/$@.log