/hg/icedtea7: 2 new changesets

[andrew at icedtea.classpath.org]

changeset fb4e64ae06a3 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=fb4e64ae06a3
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue May 29 14:16:20 2012 +0100

	Don't add a suffix for building the default, IcedTea.

	2012-05-25  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		(versioning): Don't add a suffix if building
		the default project, 'icedtea'.


changeset 6fde83944407 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=6fde83944407
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 30 22:01:15 2012 +0100

	Fix make distcheck broken by addition of SystemTap tests.

	2012-05-30  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		(EXTRA_DIST): Add test/tapset.
		(clean-tests): Add clean-jtreg-reports.
		(clean-local): Remove clean-jtreg-reports.
		(clean-jtreg): Remove test/jtreg if empty.


diffstat:

 ChangeLog   |  14 ++++++++++++++
 Makefile.am |  13 +++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diffs (71 lines):

diff -r 2c3c929e038c -r 6fde83944407 ChangeLog
--- a/ChangeLog	Fri May 25 14:04:55 2012 +0100
+++ b/ChangeLog	Wed May 30 22:01:15 2012 +0100
@@ -1,3 +1,17 @@
+2012-05-30  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(EXTRA_DIST): Add test/tapset.
+	(clean-tests): Add clean-jtreg-reports.
+	(clean-local): Remove clean-jtreg-reports.
+	(clean-jtreg): Remove test/jtreg if empty.
+
+2012-05-25  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(versioning): Don't add a suffix if building
+	the default project, 'icedtea'.
+
 2012-05-25  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 2c3c929e038c -r 6fde83944407 Makefile.am
--- a/Makefile.am	Fri May 25 14:04:55 2012 +0100
+++ b/Makefile.am	Wed May 30 22:01:15 2012 +0100
@@ -724,7 +724,7 @@
 	scripts/jni_desc \
 	rewriter/agpl-3.0.txt \
 	$(REWRITER_SRCS) \
-	THANKYOU
+	THANKYOU test/tapset
 
 # Top-Level Targets
 # =================
@@ -733,14 +733,14 @@
 
 check-local: jtregcheck check-tapset
 
-clean-tests: clean-jtreg clean-tapset-report
+clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports
 	if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
 	  if [ -e test ] ; then \
 	    rmdir test ; \
 	  fi \
 	fi
 
-clean-local: clean-tests clean-jtreg-reports clean-pulse-java \
+clean-local: clean-tests clean-pulse-java \
  clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
  clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
  clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
@@ -1435,7 +1435,7 @@
 	  echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
 	    >>openjdk/jdk/make/common/shared/Defs.gmk ;
 endif
-	if test x"$(PROJECT_NAME)" != "xjdk7"; then \
+	if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
 	  proj_suffix="-$(PROJECT_NAME)"; \
 	fi ; \
 	if test x"$(VERSION_SUFFIX)" != "x"; then \
@@ -2228,6 +2228,11 @@
 
 clean-jtreg:
 	rm -rf test/jtreg/classes
+	if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
+	  if [ -e test/jtreg ] ; then \
+	    rmdir test/jtreg ; \
+	  fi ; \
+	fi
 	rm -f test/jtreg.jar
 	rm -f stamps/jtreg.stamp