/hg/icedtea: Cleanup following bump to b106. Fix path to jvm.cf...

[andrew at icedtea.classpath.org]

changeset edaaf37351c4 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=edaaf37351c4
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Sep 14 15:59:59 2010 +0100

	Cleanup following bump to b106. Fix path to jvm.cfg in add targets
	and avoid issue with duplication in rt-source-files.txt.

	2010-09-14 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am, (EXTRA_DIST): Remove xrender patches
	and ports. (clean-add-cacao): Fix path to jvm.cfg
	and only change if it exists. (clean-add-cacao-
	debug): Likewise. (clean-add-zero): Likewise.
	(clean-add-zero-debug): Likewise. (rt-source-files.txt):
	Remove any existing version prior to generation to avoid
	duplication of source files.


diffstat:

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

diffs (90 lines):

diff -r ad2ccd203c51 -r edaaf37351c4 ChangeLog
--- a/ChangeLog	Thu Sep 09 19:31:54 2010 +0200
+++ b/ChangeLog	Tue Sep 14 15:59:59 2010 +0100
@@ -1,3 +1,17 @@ 2010-09-09  Matthias Klose  <doko at ubuntu
+2010-09-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am,
+	(EXTRA_DIST): Remove xrender patches and
+	ports.
+	(clean-add-cacao): Fix path to jvm.cfg and
+	only change if it exists.
+	(clean-add-cacao-debug): Likewise.
+	(clean-add-zero): Likewise.
+	(clean-add-zero-debug): Likewise.
+	(rt-source-files.txt): Remove any existing
+	version prior to generation to avoid duplication
+	of source files.
+
 2010-09-09  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/hotspot/default/icedtea-no-precompiled.patch: Remove.
diff -r ad2ccd203c51 -r edaaf37351c4 Makefile.am
--- a/Makefile.am	Thu Sep 09 19:31:54 2010 +0200
+++ b/Makefile.am	Tue Sep 14 15:59:59 2010 +0100
@@ -741,8 +741,7 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_sr
 	$(top_srcdir)/patches/debian/*.patch \
 	$(top_srcdir)/patches/extensions/*.patch \
 	$(top_srcdir)/patches/security/*.patch \
-	$(top_srcdir)/patches/xrender/*.patch \
-	tools-copy contrib ports extra overlays \
+	tools-copy contrib extra overlays \
 	javaws.png javaws.desktop \
 	jconsole.desktop policytool.desktop \
 	$(JTREG_SRCS) \
@@ -2251,7 +2250,9 @@ endif
 
 clean-add-cacao:
 	rm -rf $(BUILD_JRE_ARCH_DIR)/cacao
-	sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg
+	if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
+	  sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
+	fi
 	rm -f stamps/add-cacao.stamp
 
 stamps/add-cacao-debug.stamp: stamps/icedtea-debug.stamp stamps/cacao.stamp
@@ -2271,7 +2272,9 @@ endif
 
 clean-add-cacao-debug:
 	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
-	sed -i 's#-cacao KNOWN#-cacao ERROR#' jvm.cfg
+	if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
+	  sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
+	fi
 	rm -f stamps/add-cacao-debug.stamp
 
 # configure script arguments, quoted in single quotes
@@ -2336,8 +2339,10 @@ clean-add-zero:
 	rm -rf $(BUILD_JRE_ARCH_DIR)/zero
 	rm -rf $(BUILD_JRE_ARCH_DIR)/shark
 	rm -rf zerovm
-	sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg
-	sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg
+	if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \
+	  sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
+	  sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
+	fi
 	rm -f stamps/add-zero.stamp
 
 stamps/add-zero-debug.stamp: stamps/icedtea-debug.stamp
@@ -2373,8 +2378,10 @@ clean-add-zero-debug:
 	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/zero
 	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/shark
 	rm -rf zerovm
-	sed -i 's#-zero KNOWN#-zero ERROR#' jvm.cfg
-	sed -i 's#-shark KNOWN#-shark ERROR#' jvm.cfg
+	if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
+	  sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
+	  sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
+	fi
 	rm -f stamps/add-zero-debug.stamp
 
 # end additional VMs
@@ -2494,6 +2501,7 @@ jtregcheck: $(TESTS_TO_RUN)
 # Support classes for non-OpenJDK bootstraps
 
 rt-source-files.txt: $(OPENJDK_BOOT_TREE)
+	rm -f $@
 	for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \
 	do \
 	$(FIND) $(abs_top_builddir)/$$dir -name '*.java' >> $@; \