/hg/icedtea6: Add remaining missing clean-local dependencies so ...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sun Jul 4 16:01:05 PDT 2010
changeset c46acd86bc92 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c46acd86bc92
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jul 05 00:00:58 2010 +0100
Add remaining missing clean-local dependencies so that build tree is
completely empty after make distclean.
2010-07-04 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (clean-local): Add missing
dependencies. Use rmdir to remove bootstrap and lib to make
sure they are empty. Use rmdir to remove the empty stamps
directory. (clean-extract-openjdk): Depend on clean-patch-
fsg. (clean-patch-fsg): Depend on clean-patch.
(clean-extract-ecj): Depend on clean-patch-ecj. (rewriter):
Give the build directory a different name to the source
directory (rewriter.build). (clean-rewriter): New target to
remove rewriter. (rewrite-rhino): Fix build directory path.
(clean-rewrite-rhino): Inverse of rewrite-rhino. (rt): Only
replace rt.jar if the bootstrap tree still exists.
diffstat:
2 files changed, 55 insertions(+), 13 deletions(-)
ChangeLog | 18 ++++++++++++++++++
Makefile.am | 50 +++++++++++++++++++++++++++++++++++++-------------
diffs (145 lines):
diff -r 4b85abd38b4c -r c46acd86bc92 ChangeLog
--- a/ChangeLog Fri Jul 02 17:26:42 2010 +0100
+++ b/ChangeLog Mon Jul 05 00:00:58 2010 +0100
@@ -1,3 +1,21 @@ 2010-07-01 Andrew John Hughes <ahughes
+2010-07-04 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-local): Add missing dependencies.
+ Use rmdir to remove bootstrap and lib to make
+ sure they are empty. Use rmdir to remove the
+ empty stamps directory.
+ (clean-extract-openjdk): Depend on clean-patch-fsg.
+ (clean-patch-fsg): Depend on clean-patch.
+ (clean-extract-ecj): Depend on clean-patch-ecj.
+ (rewriter): Give the build directory a different
+ name to the source directory (rewriter.build).
+ (clean-rewriter): New target to remove rewriter.
+ (rewrite-rhino): Fix build directory path.
+ (clean-rewrite-rhino): Inverse of rewrite-rhino.
+ (rt): Only replace rt.jar if the bootstrap tree
+ still exists.
+
2010-07-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 4b85abd38b4c -r c46acd86bc92 Makefile.am
--- a/Makefile.am Fri Jul 02 17:26:42 2010 +0100
+++ b/Makefile.am Mon Jul 05 00:00:58 2010 +0100
@@ -513,11 +513,19 @@ clean-local: clean-jtreg clean-jtreg-rep
clean-netx clean-plugin clean-liveconnect clean-icedtea clean-icedtea-debug \
clean-icedtea-ecj clean-extract clean-ports clean-overlay clean-native-ecj \
clean-icedtea-against-icedtea clean-icedtea-debug-against-icedtea \
- clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot
- rm -f rt-source-files.txt extra-source-files.txt
- rm -rf bootstrap
- rm -rf lib
- rm -rf extra-lib
+ clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
+ clean-rewriter clean-rewrite-rhino clean-extra clean-rt clean-bootstrap-directory \
+ clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \
+ clean-bootstrap-directory-symlink-ecj
+ if [ -e bootstrap ]; then \
+ rmdir bootstrap ; \
+ fi
+ if [ -e lib ]; then \
+ rmdir lib ; \
+ fi
+ if [ -e stamps ]; then \
+ rmdir stamps ; \
+ fi
rm -f jni-common.o
distclean-local: clean-download clean-hgforest
@@ -540,7 +548,8 @@ 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-download clean-hgforest clean-download-openjdk
+ clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \
+ clean-rewriter clean-rewrite-rhino
env:
@echo 'unset JAVA_HOME'
@@ -781,7 +790,7 @@ endif
mkdir -p stamps
touch stamps/extract-openjdk.stamp
-clean-extract-openjdk:
+clean-extract-openjdk: clean-patch-fsg
rm -rf openjdk
rm -f stamps/extract-openjdk.stamp
@@ -909,7 +918,7 @@ stamps/patch-fsg.stamp: stamps/generated
exit 2; \
fi ;
-clean-patch-fsg:
+clean-patch-fsg: clean-patch
rm -f stamps/patch-fsg.stamp
all_patches_ok=yes; \
for p in $(ICEDTEA_FSG_PATCHES) ; \
@@ -1023,7 +1032,7 @@ stamps/extract-ecj.stamp: $(OPENJDK_TREE
touch stamps/extract-ecj.stamp
# FIXME (missing): Rename to clean-clone-ecj.
-clean-extract-ecj:
+clean-extract-ecj: clean-patch-ecj
rm -f stamps/extract-ecj.stamp
rm -rf openjdk-ecj
@@ -1624,20 +1633,24 @@ endif
stamps/rewriter.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
if WITH_RHINO
- mkdir -p $(abs_top_builddir)/rewriter && \
+ mkdir -p $(abs_top_builddir)/rewriter.build && \
(cd $(abs_top_srcdir)/rewriter ; \
$(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
- -d $(abs_top_builddir)/rewriter $(REWRITER_SRCS) \
+ -d $(abs_top_builddir)/rewriter.build $(REWRITER_SRCS) \
)
endif
mkdir -p stamps
touch stamps/rewriter.stamp
+clean-rewriter:
+ rm -rf rewriter.build
+ rm -f stamps/rewriter.stamp
+
stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
if WITH_RHINO
mkdir -p rhino/rhino.{old,new} && \
(cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \
- $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \
+ $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter.build \
com.redhat.rewriter.ClassRewriter \
$(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
org.mozilla sun.org.mozilla && \
@@ -1654,6 +1667,15 @@ endif
endif
mkdir -p stamps
touch stamps/rewrite-rhino.stamp
+
+clean-rewrite-rhino:
+ rm -rf rhino/rhino.old
+ rm -rf rhino/rhino.new
+ rm -f rhino/rhino.jar
+ if [ -e rhino ] ; then \
+ rmdir rhino ; \
+ fi
+ rm -f stamps/rewrite-rhino.stamp
# CACAO
@@ -1968,7 +1990,9 @@ clean-rt:
rm -f stamps/rt-class-files.stamp
rm -f stamps/rt.stamp
rm -f rt-source-files.txt
- cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ICEDTEA_RT)
+ if [ -e $(ICEDTEA_BOOT_DIR) ] ; then \
+ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ICEDTEA_RT) ; \
+ fi
stamps/rt.stamp: stamps/rt-class-files.stamp
mkdir -p stamps
More information about the distro-pkg-dev
mailing list