/hg/release/icedtea6-1.6: Reference rather than copy the netscap...

[andrew at icedtea.classpath.org]

changeset ef5ed16daa87 in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=ef5ed16daa87
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Sep 11 17:09:38 2009 +0100

	Reference rather than copy the netscape.* plugin sources.

	2009-09-11 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Reference netscape.* plugin sources
	by path rather than copying them to rt. This avoids them
	getting packaged in tarballs.


diffstat:

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

diffs (72 lines):

diff -r 76a4bf70b153 -r ef5ed16daa87 ChangeLog
--- a/ChangeLog	Thu Sep 10 15:46:50 2009 +0100
+++ b/ChangeLog	Fri Sep 11 17:09:38 2009 +0100
@@ -1,3 +1,10 @@ 2009-09-10  Andrew John Hughes  <ahughes
+2009-09-11  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Reference netscape.* plugin sources by path rather than
+	copying them to rt.  This avoids them getting packaged
+	in tarballs.
+	
 2009-09-10  Andrew John Hughes  <ahughes at redhat.com>
 
 	* INSTALL: Update documentation to reflect recent changes and add
diff -r 76a4bf70b153 -r ef5ed16daa87 Makefile.am
--- a/Makefile.am	Thu Sep 10 15:46:50 2009 +0100
+++ b/Makefile.am	Fri Sep 11 17:09:38 2009 +0100
@@ -14,6 +14,7 @@ PLUGIN_PATCH = patches/icedtea-liveconne
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
 LIVECONNECT_DIR = -C lib/rt netscape
 NPPLUGIN_DIR=$(abs_top_srcdir)/plugin/icedteanp
+LIVECONNECT_SRCS = $(NPPLUGIN_DIR)/java
 else
 if ENABLE_PLUGIN
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
@@ -21,12 +22,14 @@ PLUGIN_PATCH = patches/icedtea-liveconne
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
 LIVECONNECT_DIR = -C lib/rt netscape
 NPPLUGIN_DIR = 
+LIVECONNECT_SRCS = $(abs_top_srcdir)/plugin/icedtea
 else
 ICEDTEAPLUGIN_CLEAN =
 ICEDTEAPLUGIN_TARGET =
 PLUGIN_PATCH = 
 LIVECONNECT_DIR =
 NPPLUGIN_DIR =
+LIVECONNECT_SRCS =
 endif
 endif
 
@@ -823,13 +826,9 @@ stamps/patch.stamp: stamps/patch-fsg.sta
 
 if ENABLE_NPPLUGIN
 	cp -a $(abs_top_srcdir)/plugin/icedteanp/java/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
-	mkdir -p rt
-	cp -a $(abs_top_srcdir)/plugin/icedteanp/java/netscape rt/
 else
 if ENABLE_PLUGIN
 	cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
-	mkdir -p rt
-	cp -a $(abs_top_srcdir)/plugin/icedtea/netscape rt/
 endif
 endif
 
@@ -1486,7 +1485,7 @@ hotspot-tools-source-files.txt: stamps/r
 	find hotspot-tools -name '*.java' | sort > $@
 	mkdir -p lib/hotspot-tools
 
-ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_builddir)/rt:$(abs_top_srcdir)/rt
+ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_builddir)/rt:$(abs_top_srcdir)/rt:$(LIVECONNECT_SRCS)
 stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
@@ -1535,7 +1534,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/replace-hotspot.stamp stamps/copy-source-files.stamp
-	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' \
+	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt $(LIVECONNECT_SRCS) -name '*.java' \
 	  | sort -u > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt