/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 15fb1bdc42b3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=15fb1bdc42b3
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jul 01 23:31:12 2010 +0100

	Check directories exist before using rmdir.

	2010-07-01 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (clean-IcedTeaPlugin): Check
	directory exists before using rmdir. (clean-pulse-
	java): Likewise.


changeset aafcd75154a1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=aafcd75154a1
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jul 01 23:41:42 2010 +0100

	Handle cleaning of downloads via make distclean.

	2010-07-01 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (distclean-local): Added. Removes
	downloads in addition to other cleaning targets.
	(.PHONY): Updated. (download-openjdk): Separate OpenJDK
	download into separate target. (clean-download-
	openjdk): Inversion of download-openjdk. (download):
	Metatarget for all downloads. (clean-download): Metatarget
	for all download cleaning. (clean-cacao): Remove extraction
	stamp.


diffstat:

2 files changed, 40 insertions(+), 13 deletions(-)
ChangeLog   |   20 ++++++++++++++++++++
Makefile.am |   33 ++++++++++++++++++++-------------

diffs (120 lines):

diff -r e6ef1847ac70 -r aafcd75154a1 ChangeLog
--- a/ChangeLog	Thu Jul 01 23:13:01 2010 +0100
+++ b/ChangeLog	Thu Jul 01 23:41:42 2010 +0100
@@ -1,3 +1,23 @@ 2010-07-01  Andrew John Hughes  <ahughes
+2010-07-01  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(distclean-local): Added.  Removes downloads
+	in addition to other cleaning targets.
+	(.PHONY): Updated.
+	(download-openjdk): Separate OpenJDK download
+	into separate target.
+	(clean-download-openjdk): Inversion of download-openjdk.
+	(download): Metatarget for all downloads.
+	(clean-download): Metatarget for all download cleaning.
+	(clean-cacao): Remove extraction stamp.
+
+2010-07-01  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(clean-IcedTeaPlugin): Check directory exists before
+	using rmdir.
+	(clean-pulse-java): Likewise.
+
 2010-07-01  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r e6ef1847ac70 -r aafcd75154a1 Makefile.am
--- a/Makefile.am	Thu Jul 01 23:13:01 2010 +0100
+++ b/Makefile.am	Thu Jul 01 23:41:42 2010 +0100
@@ -528,7 +528,7 @@ clean-local: clean-jtreg clean-jtreg-rep
 	rm -rf extra-lib
 	rm -f jni-common.o
 
-#FIXME (clean): Missing distclean-local for downloads only
+distclean-local: clean-download clean-hgforest
 
 install:
 
@@ -543,7 +543,7 @@ install:
 	clean-add-zero clean-add-zero-debug clean-icedtea clean-icedtea-debug
 	clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \
 	clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \
-	clean-replace-hotspot clean-generated
+	clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -583,9 +583,6 @@ endif
 
 clean-hgforest:
 	rm -f stamps/hgforest.stamp
-
-#FIXME (meta): Split into multiple targets
-#FIXME (missing): Download drops targets
 
 stamps/download-jaxp-drop.stamp:
 	mkdir -p drops
@@ -704,8 +701,7 @@ clean-drops: clean-download-jaxp-drop cl
 	fi
 	rm -f stamps/download-drops.stamp
 
-stamps/download.stamp: stamps/hgforest.stamp stamps/download-drops.stamp \
- stamps/download-cacao.stamp
+stamps/download-openjdk.stamp: stamps/hgforest.stamp
 if USE_HG
 if WITH_HGREV
 	$(HG) fclone -r $(HGREV) $(OPENJDK_HG_URL) openjdk;
@@ -750,10 +746,16 @@ endif
 	mkdir -p stamps
 	touch stamps/download.stamp
 
-#FIXME (meta): split into multiple targets
-clean-download: clean-drops clean-download-cacao
+clean-download-openjdk:
+	rm -f $(OPENJDK_SRC_ZIP)
+	rm -f stamps/download-openjdk.stamp
+
+stamps/download.stamp: stamps/download-drops.stamp stamps/download-cacao.stamp \
+ stamps/download-openjdk.stamp
+	touch stamps/download.stamp
+
+clean-download: clean-drops clean-download-cacao clean-download-openjdk
 	rm -f stamps/download.stamp
-	rm -f $(OPENJDK_SRC_ZIP)
 
 stamps/extract.stamp: stamps/extract-openjdk.stamp \
  stamps/extract-cacao.stamp
@@ -1440,8 +1442,10 @@ clean-IcedTeaPlugin:
 	rm -f $(PLUGIN_DIR)/*.o
 	rm -f $(PLUGIN_DIR)/IcedTeaPlugin.so
 	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
-	  rmdir $(abs_top_builddir)/plugin/icedteanp ; \
-	  rmdir $(abs_top_builddir)/plugin ; \
+	  if [ -e $(abs_top_builddir)/plugin/icedteanp ] ; then \
+	    rmdir $(abs_top_builddir)/plugin/icedteanp ; \
+	    rmdir $(abs_top_builddir)/plugin ; \
+	  fi ; \
 	fi
 endif
 
@@ -1606,7 +1610,9 @@ clean-pulse-java:
 	rm -f stamps/pulse-java*.stamp
 	rm -f pulse-java.jar
 	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
-	  rmdir $(abs_top_builddir)/pulseaudio ; \
+	  if [ -e $(abs_top_builddir)/pulseaudio ] ; then \
+	    rmdir $(abs_top_builddir)/pulseaudio ; \
+	  fi ; \
 	fi
 endif
 
@@ -1673,6 +1679,7 @@ clean-cacao:
 clean-cacao:
 	rm -rf cacao
 	rm -f stamps/cacao.stamp
+	rm -f stamps/extract-cacao.stamp
 
 # targets for additional VMs