/hg/icedtea: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jul 14 13:49:28 PDT 2010
changeset df20b69a67d3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=df20b69a67d3
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jul 14 20:50:06 2010 +0100
Fix new issues with make distcheck.
2010-07-14 Andrew John Hughes <ahughes at redhat.com>
Fix new issues with make distcheck.
* patches/cacao/version-parsing.patch: Removed; included
upstream.
* Makefile.am: (REWRITER_BUILD_DIR): New variable to
store rewriter build directory. (NETX_SRCDIR): Remove
absolute prefix which breaks the use in EXTRA_DIST.
(REWRITER_SRCS): Likewise. (GENERATED_SRCS): Updated.
(PULSEAUDIO_SRCS): Likewise. (ICEDTEA_PATCHES): Likewise.
(EXTRA_DIST): Remove absolute prefix from plugin. Add
$(top_srcdir) prefix to newly abbreviated NETX_SRCDIR.
(clean-clone-boot): Remove patch-jaxws.stamp. (icedtea): Add
prefix to NETX_RESOURCE_DIR due to change in NETX_SRCDIR.
(icedtea-debug): Likewise. (clean-IcedTeaPlugin): Delete the
build directories. (clean-plugin): Don't delete the build
directory here any more. (netx-source-files.txt): Add prefix
to NETX_SRCDIR. (netx): Likewise. Fix permissions on copied
resources. (netx-dist): Add prefix to NETX_SRCDIR.
changeset 5c660ac28d6b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5c660ac28d6b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jul 14 21:49:22 2010 +0100
PR icedtea/521: Don't hardlink the copy of generated.
2010-07-15 Andrew John Hughes <ahughes at redhat.com>
PR icedtea/521
* Makefile.am: (generated): Don't use hardlinking as
generated is altered by the build. Use chmod -R rather than
find.
diffstat:
3 files changed, 108 insertions(+), 37 deletions(-)
ChangeLog | 59 +++++++++++++++++++++++++++
Makefile.am | 75 ++++++++++++++++++++++-------------
patches/cacao/version-parsing.patch | 11 -----
diffs (310 lines):
diff -r 8723b60d4996 -r 5c660ac28d6b ChangeLog
--- a/ChangeLog Wed Jul 14 00:15:18 2010 +0200
+++ b/ChangeLog Wed Jul 14 21:49:22 2010 +0100
@@ -1,3 +1,62 @@ 2010-07-13 Matthias Klose <doko at ubuntu
+2010-07-15 Andrew John Hughes <ahughes at redhat.com>
+
+ PR icedtea/521
+ * Makefile.am:
+ (generated): Don't use hardlinking as
+ generated is altered by the build.
+ Use chmod -R rather than find.
+
+2010-07-14 Andrew John Hughes <ahughes at redhat.com>
+
+ Fix new issues with make distcheck.
+ * patches/cacao/version-parsing.patch:
+ Removed; included upstream.
+ * Makefile.am:
+ (REWRITER_BUILD_DIR): New variable to
+ store rewriter build directory.
+ (NETX_SRCDIR): Remove absolute prefix which
+ breaks the use in EXTRA_DIST.
+ (REWRITER_SRCS): Likewise.
+ (GENERATED_SRCS): Updated.
+ (PULSEAUDIO_SRCS): Likewise.
+ (ICEDTEA_PATCHES): Likewise.
+ (EXTRA_DIST): Remove absolute prefix from
+ plugin. Add $(top_srcdir) prefix to newly
+ abbreviated NETX_SRCDIR.
+ (clean-clone-boot): Remove patch-jaxws.stamp.
+ (icedtea): Add prefix to NETX_RESOURCE_DIR due
+ to change in NETX_SRCDIR.
+ (icedtea-debug): Likewise.
+ (clean-IcedTeaPlugin): Delete the build directories.
+ (clean-plugin): Don't delete the build directory here any more.
+ (netx-source-files.txt): Add prefix to NETX_SRCDIR.
+ (netx): Likewise. Fix permissions on copied resources.
+ (netx-dist): Add prefix to NETX_SRCDIR.
+
+2010-07-08 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-clone-boot): Don't depend on clean-patch-boot,
+ just delete the stamp.
+ (clean-extract-openjdk): Likewise for clean-patch and
+ clean-patch-fsg.
+
+2010-07-04 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-local): Add missing dependencies.
+ (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.
+
+2010-07-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (distclean-local): Delete empty tapset
+ directory if srcdir != builddir.
+
2010-07-13 Matthias Klose <doko at ubuntu.com>
* acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Don't require libxul
diff -r 8723b60d4996 -r 5c660ac28d6b Makefile.am
--- a/Makefile.am Wed Jul 14 00:15:18 2010 +0200
+++ b/Makefile.am Wed Jul 14 21:49:22 2010 +0100
@@ -65,6 +65,7 @@ SERVER_DIR = hotspot/import/jre/lib/$(IN
SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+REWRITER_BUILD_DIR = $(abs_top_builddir)/rewriter.build
# Source directories
@@ -74,7 +75,7 @@ CORBA = openjdk-boot/corba/src/share/cla
CORBA = openjdk-boot/corba/src/share/classes
JAXWS = $(BUILD_OUTPUT_DIR)/jaxws/drop/jaxws_src/src
-NETX_SRCDIR = $(abs_top_srcdir)/netx
+NETX_SRCDIR = netx
NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources
@@ -257,7 +258,7 @@ OPENJDK_BOOT_TREE = stamps/patch-jaxws.s
PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
-REWRITER_SRCS = $(abs_top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
+REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
# Patch list
@@ -609,6 +610,8 @@ GENERATED_FILES = $(top_srcdir)/generate
$(top_srcdir)/generated/sun/awt/resources/awt*.java \
$(top_srcdir)/generated/sun/nio/ch/*.java \
$(top_srcdir)/generated/sun/nio/cs/*.java \
+ $(top_srcdir)/generated/sun/nio/cs/ext/*.java \
+ $(top_srcdir)/generated/sun/nio/fs/*.java \
$(top_srcdir)/generated/sun/misc/*.java \
$(top_srcdir)/generated/sun/util/*.java \
$(top_srcdir)/generated/sun/util/logging/resources/logging*.java \
@@ -713,13 +716,14 @@ PULSEAUDIO_SRCS = $(top_srcdir)/pulseaud
$(top_srcdir)/pulseaudio/testsounds/logout.wav \
$(top_srcdir)/pulseaudio/testsounds/error.wav \
$(top_srcdir)/pulseaudio/unittests/org/classpath/icedtea/pulseaudio/*.java \
- $(top_srcdir)/pulseaudio/AUTHORS \
$(top_srcdir)/pulseaudio/COPYING
EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
$(top_srcdir)/patches/hotspot/default/*.patch \
$(top_srcdir)/patches/boot/*.patch \
$(top_srcdir)/patches/cacao/*.patch \
+ $(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 \
@@ -727,7 +731,7 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_sr
jconsole.desktop policytool.desktop \
$(JTREG_SRCS) \
HACKING $(PULSEAUDIO_SRCS) fsg.sh \
- $(abs_top_srcdir)/plugin $(NETX_SRCDIR) \
+ $(top_srcdir)/plugin $(top_srcdir)/$(NETX_SRCDIR) \
hotspot.map autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
@@ -750,7 +754,8 @@ clean-local: clean-jtreg clean-jtreg-rep
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
clean-extract clean-generated clean-plugin clean-liveconnect clean-native-ecj \
clean-hgforest clean-icedtea-stage2 clean-icedtea-debug-stage2 clean-icedtea-stage1 \
- clean-add-zero clean-add-zero-debug clean-add-cacao clean-add-cacao-debug clean-rt
+ clean-add-zero clean-add-zero-debug clean-add-cacao clean-add-cacao-debug clean-rt \
+ clean-rewrite-rhino clean-rewriter
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -760,6 +765,11 @@ clean-local: clean-jtreg clean-jtreg-rep
rm -f jni-common.o
distclean-local: clean-local clean-download
+ if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
+ if [ -e tapset ] ; then \
+ rmdir tapset ; \
+ fi ; \
+ fi
if [ -e stamps ] ; then \
rmdir stamps ; \
fi
@@ -1315,9 +1325,8 @@ stamps/generated.stamp: stamps/ports.sta
stamps/generated.stamp: stamps/ports.stamp
set -e ; \
if [ ! -e $(abs_top_builddir)/generated.build ]; then \
- cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/generated $(abs_top_builddir)/generated.build; \
- find $(abs_top_builddir)/generated.build -type f -exec chmod 640 '{}' ';' \
- -o -type d -exec chmod 750 '{}' ';'; \
+ cp -pPR $(abs_top_srcdir)/generated $(abs_top_builddir)/generated.build; \
+ chmod -R u+w $(abs_top_builddir)/generated.build ; \
fi
mkdir -p stamps
touch $@
@@ -1517,8 +1526,10 @@ stamps/clone-boot.stamp: $(OPENJDK_TREE)
mkdir -p stamps
touch $@
-clean-clone-boot: clean-patch-boot
+clean-clone-boot:
rm -rf openjdk-boot
+ rm -f stamps/patch-boot.stamp
+ rm -f stamps/patch-jaxws.stamp
rm -f stamps/clone-boot.stamp
stamps/patch-boot.stamp: stamps/clone-boot.stamp
@@ -1764,9 +1775,9 @@ if ENABLE_PULSE_JAVA
$(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
endif
if JNLP_ABOUT_NEEDED
- cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
+ cp $(top_srcdir)/$(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2re-image/lib
- cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
+ cp $(top_srcdir)/$(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
endif
if ZERO_BUILD
@@ -1838,9 +1849,9 @@ if ENABLE_PULSE_JAVA
$(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
endif
if JNLP_ABOUT_NEEDED
- cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
+ cp $(top_srcdir)/$(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
$(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib
- cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
+ cp $(top_srcdir)/$(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
endif
if ZERO_BUILD
@@ -1989,6 +2000,9 @@ clean-IcedTeaPlugin:
clean-IcedTeaPlugin:
rm -f $(addprefix $(PLUGIN_BUILD_DIR)/,$(PLUGIN_OBJECTS))
rm -f $(PLUGIN_BUILD_DIR)/IcedTeaNPPlugin.so
+ rmdir $(PLUGIN_BUILD_DIR)
+ rmdir plugin.build
+ rm -f stamps/icedtea-npplugin.stamp
endif
stamps/plugin.stamp: $(ICEDTEAPLUGIN_TARGET) stamps/liveconnect-dist.stamp
@@ -1996,9 +2010,6 @@ stamps/plugin.stamp: $(ICEDTEAPLUGIN_TAR
touch $@
clean-plugin: $(ICEDTEAPLUGIN_CLEAN)
- if [ -e $(PLUGIN_BUILD_DIR) ] ; then \
- rmdir $(PLUGIN_BUILD_DIR) ; \
- fi
rm -f stamps/plugin.stamp
liveconnect-source-files.txt:
@@ -2044,17 +2055,18 @@ clean-liveconnect:
# a patch applied to sun.plugin.AppletViewerPanel and generated sources
netx-source-files.txt:
- find $(NETX_SRCDIR) -name '*.java' | sort > $@
+ find $(top_srcdir)/$(NETX_SRCDIR) -name '*.java' | sort > $@
stamps/netx.stamp: netx-source-files.txt stamps/rt.stamp
mkdir -p $(NETX_CLASSES)
$(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(NETX_CLASSES) \
-classpath $(ICEDTEA_RT) \
- -sourcepath $(NETX_SRCDIR):$(SOURCEPATH_DIRS) \
+ -sourcepath $(top_srcdir)/$(NETX_SRCDIR):$(SOURCEPATH_DIRS) \
-bootclasspath \'\' \
@netx-source-files.txt ;
- cp -r $(NETX_RESOURCE_DIR) $(NETX_CLASSES)/net/sourceforge/jnlp
+ cp -r $(top_srcdir)/$(NETX_RESOURCE_DIR) $(NETX_CLASSES)/net/sourceforge/jnlp
+ chmod -R u+w $(NETX_CLASSES)/net/sourceforge/jnlp
mkdir -p stamps
touch $@
@@ -2062,7 +2074,7 @@ stamps/netx-dist.stamp: stamps/netx.stam
(cd $(NETX_CLASSES) ; \
mkdir -p lib ; \
$(ICEDTEA_BOOT_DIR)/bin/jar cf $(NETX_JAR) javax/jnlp net ; \
- cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \
+ cp -pPR $(SRC_DIR_LINK) $(abs_top_srcdir)/$(NETX_SRCDIR) src; \
find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
cd src ; \
$(ICEDTEA_BOOT_DIR)/bin/jar uf $(NETX_JAR) \
@@ -2165,20 +2177,22 @@ endif
stamps/rewriter.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
if WITH_RHINO
- mkdir -p $(abs_top_builddir)/rewriter && \
- (cd $(abs_top_srcdir)/rewriter ; \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
- -d $(abs_top_builddir)/rewriter $(REWRITER_SRCS) \
- )
+ mkdir -p $(REWRITER_BUILD_DIR)
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ -d $(REWRITER_BUILD_DIR) $(REWRITER_SRCS)
endif
mkdir -p stamps
touch stamps/rewriter.stamp
+
+clean-rewriter:
+ rm -rf $(REWRITER_BUILD_DIR)
+ 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 $(REWRITER_BUILD_DIR) \
com.redhat.rewriter.ClassRewriter \
$(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
org.mozilla sun.org.mozilla && \
@@ -2195,6 +2209,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
diff -r 8723b60d4996 -r 5c660ac28d6b patches/cacao/version-parsing.patch
--- a/patches/cacao/version-parsing.patch Wed Jul 14 00:15:18 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- cacao/cacao/m4/version.m4~ 2010-06-23 16:18:58.000000000 +0100
-+++ cacao/cacao/m4/version.m4 2010-06-24 19:11:36.000000000 +0100
-@@ -29,7 +29,7 @@
- then
- major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'`
- minor=`echo "$version" | $SED -e 's/^[[0-9]]*\.//' -e 's/\.[[0-9a-z.+]]*$//'`
-- micro=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.//' -e 's/[[a-z.+]]*$//'`
-+ micro=`echo "$version" | $SED -r -e 's/^[[0-9]]*\.[[0-9]]*\.([[0-9]]*).*/\1/'`
- extra=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.[[0-9]]*//'`
- else
- major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'`
More information about the distro-pkg-dev
mailing list