/hg/icedtea6: PR719: make distcheck work in IcedTea6
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Nov 16 06:01:38 PST 2011
changeset 1075c87ee025 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1075c87ee025
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 16 14:01:13 2011 +0000
PR719: make distcheck work in IcedTea6
2011-11-11 Andrew John Hughes <ahughes at redhat.com>
PR719: make distcheck work in IcedTea6
* Makefile.am: (distclean-local): Depend on clean-local.
(ports): Remove inapplicable conditionals from reversion and
ensure copied files have correct permissions.
(clean-generated): Replace hardcoded name with
$(GENERATED_BUILD_DIR). (clean-jtreg): Remove all empty
directories.
* NEWS: List this fix.
diffstat:
ChangeLog | 21 +++++++++++++++++----
Makefile.am | 13 +++++++++----
NEWS | 1 +
3 files changed, 27 insertions(+), 8 deletions(-)
diffs (96 lines):
diff -r b26203d46fdd -r 1075c87ee025 ChangeLog
--- a/ChangeLog Tue Nov 15 15:49:02 2011 -0500
+++ b/ChangeLog Wed Nov 16 14:01:13 2011 +0000
@@ -1,3 +1,16 @@
+2011-11-11 Andrew John Hughes <ahughes at redhat.com>
+
+ PR719: make distcheck work in IcedTea6
+ * Makefile.am:
+ (distclean-local): Depend on clean-local.
+ (ports): Remove inapplicable conditionals from
+ reversion and ensure copied files have correct
+ permissions.
+ (clean-generated): Replace hardcoded name with
+ $(GENERATED_BUILD_DIR).
+ (clean-jtreg): Remove all empty directories.
+ * NEWS: List this fix.
+
2011-11-15 Andrew Haley <aph at redhat.com>
* patches/arm-debug.patch: Surround all code in #ifdef PRODUCT
@@ -5,10 +18,10 @@
2011-11-14 Danesh Dadachanji <ddadacha at redhat.com>
- * Makefile.am:
- (ICEDTEA_PATCHES): Add patches/openjdk/683768-System-tray-icon.patch
- * NEWS: Updated.
- * patches/openjdk/683768-System-tray-icon.patch: New file. Sets XAtoms
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patches/openjdk/683768-System-tray-icon.patch
+ * NEWS: Updated.
+ * patches/openjdk/683768-System-tray-icon.patch: New file. Sets XAtoms
_NET_WM_PID and WM_CLIENT_MACHINE for X windows.
2011-11-07 Andrew Haley <aph at redhat.com>
diff -r b26203d46fdd -r 1075c87ee025 Makefile.am
--- a/Makefile.am Tue Nov 15 15:49:02 2011 -0500
+++ b/Makefile.am Wed Nov 16 14:01:13 2011 +0000
@@ -662,7 +662,7 @@
rmdir lib ; \
fi
-distclean-local: clean-download clean-hgforest
+distclean-local: clean-local clean-download clean-hgforest
if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
if [ -e tapset ] ; then \
rmdir tapset ; \
@@ -1044,13 +1044,12 @@
# Copy ports sources into tree
stamps/ports.stamp: stamps/replace-hotspot.stamp
-if !WITH_ALT_HSBUILD
for target in $(abs_top_srcdir)/arm_port/hotspot/tools \
$(abs_top_srcdir)/arm_port/hotspot/src/*cpu/* ; do \
link=$$(dirname $$target | sed 's/^.*arm_port/openjdk/'); \
cp -rlv $$target $$link; \
+ chmod -R ug+rwX $$link; \
done
-endif
mkdir -p stamps
touch stamps/ports.stamp
@@ -1072,7 +1071,7 @@
clean-generated:
if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
- rm -rf $(abs_top_builddir)/generated ; \
+ rm -rf $(GENERATED_BUILD_DIR); \
fi
rm -f stamps/generated.stamp
@@ -2147,7 +2146,13 @@
clean-jtreg:
rm -rf test/jtreg/classes
+ if [ -e test/jtreg ] ; then \
+ rmdir test/jtreg ; \
+ fi
rm -f test/jtreg.jar
+ if [ -e test ] ; then \
+ rmdir test ; \
+ fi
rm -f stamps/jtreg.stamp
check-hotspot: stamps/jtreg.stamp
diff -r b26203d46fdd -r 1075c87ee025 NEWS
--- a/NEWS Tue Nov 15 15:49:02 2011 -0500
+++ b/NEWS Wed Nov 16 14:01:13 2011 +0000
@@ -23,6 +23,7 @@
- RH727195: Japanese font mappings are broken
- LP862286: Fix exception on trying to start PulseAudio playback
- RH683768: Add a workaround for Java applications using tray icon for Gnome Shell
+ - PR719: make distcheck should work in IcedTea6
* Import of OpenJDK6 b23 including upgrade to HotSpot 20
- S7023111: Add webrev script to make/scripts
- S6909331: Add vsvars.sh to the jdk repository (handy cygwin way to get vcvars32.bat run)
More information about the distro-pkg-dev
mailing list