/hg/icedtea6: Fix make dist, not using any prefixes in EXTRA_DIST

[Dr Andrew John Hughes]

On 15:53 Fri 16 Dec     , doko at icedtea.classpath.org wrote:
> changeset 967b9b186931 in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=967b9b186931
> author: doko at ubuntu.com
> date: Fri Dec 16 16:44:20 2011 +0100
> 
> 	Fix make dist, not using any prefixes in EXTRA_DIST
> 
> 	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.
> 
> 
> diffstat:
> 
>  ChangeLog   |   7 +++++++
>  Makefile.am |  14 +++++++-------
>  2 files changed, 14 insertions(+), 7 deletions(-)
> 
> diffs (66 lines):
> 
> diff -r f10d5790993d -r 967b9b186931 ChangeLog
> --- a/ChangeLog	Fri Dec 16 16:25:26 2011 +0100
> +++ b/ChangeLog	Fri Dec 16 16:44:20 2011 +0100
> @@ -1,3 +1,10 @@
> +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 f10d5790993d -r 967b9b186931 Makefile.am
> --- a/Makefile.am	Fri Dec 16 16:25:26 2011 +0100
> +++ b/Makefile.am	Fri Dec 16 16:44:20 2011 +0100
> @@ -192,8 +192,8 @@
>  
>  # Sources list
>  
> -REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
> -JTREG_SRCS = $(abs_top_srcdir)/jtreg
> +REWRITER_SRCS = rewriter/com/redhat/rewriter/ClassRewriter.java
> +JTREG_SRCS = jtreg
>  
>  # Patch list
>  
> @@ -613,7 +613,7 @@
>  # FIXME (distclean): Add pulseaudio sources
>  
>  EXTRA_DIST = generated \
> -	$(top_srcdir)/patches/* \
> +	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) $(REWRITER_SRCS)
> +	 -d $(REWRITER_BUILD_DIR) $(top_srcdir)/$(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 $(JTREG_SRCS) -name '*.java'`
> -	(cd $(JTREG_SRCS); \
> +	   -encoding iso-8859-1 `find $(top_srcdir)/$(JTREG_SRCS) -name '*.java'`
> +	(cd $(top_srcdir)/$(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:$(JTREG_SRCS)/excludelist.jdk.jtx \
> +		-exclude:$(abs_top_srcdir)/$(JTREG_SRCS)/excludelist.jdk.jtx \
>  		$(ICEDTEA_JTREG_OPTIONS) \
>  		`pwd`/openjdk/jdk/test \
>  	    | tee test/$@.log

I've backed this out.  It's clearly not been well-tested.  It reverts a number
of earlier changes which made make distcheck work, and also breaks make dist
where srcdir != builddir, reintroducing the confusion between 'jtreg' (the stamp
alias) and the directory.

What exactly is the failure you observe and under what configuration?
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111219/b534c106/attachment.bin