changeset in /hg/icedtea: Switch back to pulling OpenJDK b26 fro...
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Thu May 29 14:13:45 PDT 2008
changeset 9757152b5938 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9757152b5938
description:
Switch back to pulling OpenJDK b26 from the Mercurial repository.
diffstat:
2 files changed, 106 insertions(+), 100 deletions(-)
Makefile.am | 106 ++++++++++++++++++++++++++++++-----------------------------
Makefile.in | 100 ++++++++++++++++++++++++++++---------------------------
diffs (479 lines):
diff -r 12b57c3c9f3d -r 9757152b5938 Makefile.am
--- a/Makefile.am Fri May 16 21:27:02 2008 +0100
+++ b/Makefile.am Mon May 19 23:00:07 2008 +0100
@@ -1,6 +1,4 @@ OPENJDK_DATE = 11_apr_2008
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
+OPENJDK_VERSION = b26
if NETX_PLUGIN
NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -213,20 +211,38 @@ dist-openjdk:
# Download OpenJDK sources.
+OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
+
if USE_ALT_OPENJDK_SRC_ZIP
OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
-endif
-
-stamps/download.stamp:
- mkdir -p stamps
- touch stamps/download.stamp
-
-clean-download:
- rm -f stamps/download.stamp
- rm -f $(OPENJDK_SRC_ZIP)
+else
+ OPENJDK_SRC_ZIP =
+endif
+
+stamps/clone.stamp:
+ if ! test -d openjdk ; then \
+ if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
+ $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
+ else \
+ if ! hg fclone -h; \
+ then \
+ echo "No forest extension found. Please refer to" \
+ "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
+ exit 1; \
+ fi; \
+ hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk; \
+ fi ; \
+ fi
+ chmod -R ug+w openjdk
+ mkdir -p stamps
+ touch stamps/clone.stamp
+
+clean-clone:
+ rm -f stamps/clone.stamp
+ rm -rf openjdk
# Link ports sources into tree
-stamps/ports.stamp: stamps/extract.stamp
+stamps/ports.stamp: stamps/clone.stamp
for target in ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
@@ -326,21 +342,6 @@ endif
endif
stamps/patch.stamp: stamps/clone.stamp
-
-stamps/extract.stamp: stamps/download.stamp
- if ! test -d openjdk ; \
- then \
- mkdir openjdk ; \
- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
- chmod -R ug+w openjdk ; \
- fi
- mkdir -p stamps
- touch stamps/extract.stamp
-
-clean-extract:
- rm -f stamps/extract.stamp
-
-stamps/patch.stamp: stamps/extract.stamp
all_patches_ok=yes; \
for p in $(ICEDTEA_PATCHES) ; \
do \
@@ -380,23 +381,26 @@ clean-patch:
echo "WARNING Not all patches reverted cleanly" ; \
fi
+stamps/overlay.stamp: stamps/patch.stamp
+ cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
+
# OpenJDK ecj Source Preparation Targets
# ======================================
# Copy over OpenJDK sources for ecj.
-stamps/extract-ecj.stamp: stamps/patch.stamp
+stamps/clone-ecj.stamp: stamps/patch.stamp
if ! test -d openjdk-ecj ; then \
cp -pPRl openjdk openjdk-ecj ; \
fi
mkdir -p stamps
- touch stamps/extract-ecj.stamp
-
-clean-extract-ecj:
- rm -f stamps/extract-ecj.stamp
+ touch stamps/clone-ecj.stamp
+
+clean-clone-ecj:
+ rm -f stamps/clone-ecj.stamp
rm -rf openjdk-ecj
# Link ports sources into tree
-stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
+stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
for target in ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
@@ -416,7 +420,7 @@ stamps/ports-ecj.stamp: stamps/extract-e
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
-stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
+stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
echo Checking $(ICEDTEA_ECJ_PATCH) ; \
if $(PATCH) -p0 -l --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
then \
@@ -622,7 +626,7 @@ icedtea-debug: stamps/bootstrap-director
@echo "IcedTea (debug build) is served:" \
$(BUILD_OUTPUT_DIR)-debug
-clean-icedtea: stamps/extract.stamp
+clean-icedtea: stamps/clone.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make clobber
@@ -661,7 +665,7 @@ hotspot-helper: stamps/bootstrap-directo
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/control/make hotspot
-clean-icedtea-ecj: stamps/extract-ecj.stamp
+clean-icedtea-ecj: stamps/clone-ecj.stamp
rm -f stamps/icedtea-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
@@ -755,25 +759,25 @@ OPENJDK_SOURCEPATH_DIRS = \
# tools.jar class files.
stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp
- for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
+ for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/* \
hotspot-tools/$$copy_dir ; \
done
- for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \
+ for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/langtools/src/share/classes/$$copy_dir/* \
hotspot-tools/$$copy_dir ; \
done
- for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \
+ for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/corba/src/share/classes/$$copy_dir/* \
hotspot-tools/$$copy_dir ; \
done
- for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \
+ for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \
@@ -782,7 +786,7 @@ stamps/hotspot-tools-copy-source-files.s
mkdir -p stamps
touch stamps/hotspot-tools-copy-source-files.stamp
-hotspot-tools-source-files.txt: stamps/extract.stamp \
+hotspot-tools-source-files.txt: stamps/clone.stamp \
stamps/hotspot-tools-copy-source-files.stamp
find hotspot-tools -name '*.java' | sort > $@
mkdir -p lib/hotspot-tools
@@ -791,12 +795,12 @@ stamps/hotspot-tools-class-files.stamp:
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
+ -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
@$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
+ -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
@$< ; \
fi
mkdir -p stamps
@@ -829,7 +833,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
fi
# rt-closed.jar class files.
-rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
+rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
find rt -name '*.java' | sort > $@
stamps/rt-class-files.stamp: rt-source-files.txt
@@ -837,12 +841,12 @@ stamps/rt-class-files.stamp: rt-source-f
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+ -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated \
@$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-bootclasspath '' -source 1.6 \
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+ -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated \
@$< ; \
fi
cp -r rt/net/sourceforge/jnlp/resources \
@@ -961,14 +965,14 @@ bootstrap-directory-symlink-ecj: stamps/
bootstrap-directory-symlink: stamps/bootstrap-directory-symlink.stamp
+clone: stamps/clone.stamp
+
+clone-ecj: stamps/clone-ecj.stamp
+
copy-source-files: stamps/copy-source-files.stamp
download: stamps/download.stamp
-extract: stamps/extract.stamp
-
-extract-ecj: stamps/extract-ecj.stamp
-
icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
icedtea-ecj: stamps/icedtea-ecj.stamp
diff -r 12b57c3c9f3d -r 9757152b5938 Makefile.in
--- a/Makefile.in Fri May 16 21:27:02 2008 +0100
+++ b/Makefile.in Mon May 19 23:00:07 2008 +0100
@@ -248,9 +248,7 @@ target_alias = @target_alias@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
+OPENJDK_VERSION = b26
@NETX_PLUGIN_FALSE at NETX_PATCH =
@NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -355,6 +353,8 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
# ==================================
# Download OpenJDK sources.
+OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP =
@USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
@GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch
@@ -806,16 +806,30 @@ dist-openjdk:
mv openjdk-dist/openjdk-$(OPENJDK_VERSION).zip .
rm -rf openjdk-dist
-stamps/download.stamp:
- mkdir -p stamps
- touch stamps/download.stamp
-
-clean-download:
- rm -f stamps/download.stamp
- rm -f $(OPENJDK_SRC_ZIP)
+stamps/clone.stamp:
+ if ! test -d openjdk ; then \
+ if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
+ $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
+ else \
+ if ! hg fclone -h; \
+ then \
+ echo "No forest extension found. Please refer to" \
+ "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
+ exit 1; \
+ fi; \
+ hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk; \
+ fi ; \
+ fi
+ chmod -R ug+w openjdk
+ mkdir -p stamps
+ touch stamps/clone.stamp
+
+clean-clone:
+ rm -f stamps/clone.stamp
+ rm -rf openjdk
# Link ports sources into tree
-stamps/ports.stamp: stamps/extract.stamp
+stamps/ports.stamp: stamps/clone.stamp
for target in ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
@@ -833,21 +847,6 @@ stamps/ports.stamp: stamps/extract.stamp
touch stamps/ports.stamp
stamps/patch.stamp: stamps/clone.stamp
-
-stamps/extract.stamp: stamps/download.stamp
- if ! test -d openjdk ; \
- then \
- mkdir openjdk ; \
- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
- chmod -R ug+w openjdk ; \
- fi
- mkdir -p stamps
- touch stamps/extract.stamp
-
-clean-extract:
- rm -f stamps/extract.stamp
-
-stamps/patch.stamp: stamps/extract.stamp
all_patches_ok=yes; \
for p in $(ICEDTEA_PATCHES) ; \
do \
@@ -887,23 +886,26 @@ clean-patch:
echo "WARNING Not all patches reverted cleanly" ; \
fi
+stamps/overlay.stamp: stamps/patch.stamp
+ cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
+
# OpenJDK ecj Source Preparation Targets
# ======================================
# Copy over OpenJDK sources for ecj.
-stamps/extract-ecj.stamp: stamps/patch.stamp
+stamps/clone-ecj.stamp: stamps/patch.stamp
if ! test -d openjdk-ecj ; then \
cp -pPRl openjdk openjdk-ecj ; \
fi
mkdir -p stamps
- touch stamps/extract-ecj.stamp
-
-clean-extract-ecj:
- rm -f stamps/extract-ecj.stamp
+ touch stamps/clone-ecj.stamp
+
+clean-clone-ecj:
+ rm -f stamps/clone-ecj.stamp
rm -rf openjdk-ecj
# Link ports sources into tree
-stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
+stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
for target in ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
@@ -920,7 +922,7 @@ stamps/ports-ecj.stamp: stamps/extract-e
mkdir -p stamps
touch stamps/ports-ecj.stamp
-stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
+stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
echo Checking $(ICEDTEA_ECJ_PATCH) ; \
if $(PATCH) -p0 -l --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
then \
@@ -1091,7 +1093,7 @@ icedtea-debug: stamps/bootstrap-director
@echo "IcedTea (debug build) is served:" \
$(BUILD_OUTPUT_DIR)-debug
-clean-icedtea: stamps/extract.stamp
+clean-icedtea: stamps/clone.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/control/make clobber
@@ -1130,7 +1132,7 @@ hotspot-helper: stamps/bootstrap-directo
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/control/make hotspot
-clean-icedtea-ecj: stamps/extract-ecj.stamp
+clean-icedtea-ecj: stamps/clone-ecj.stamp
rm -f stamps/icedtea-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
@@ -1194,25 +1196,25 @@ clean-copy:
# tools.jar class files.
stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp
- for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
+ for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/* \
hotspot-tools/$$copy_dir ; \
done
- for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \
+ for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/langtools/src/share/classes/$$copy_dir/* \
hotspot-tools/$$copy_dir ; \
done
- for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \
+ for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/corba/src/share/classes/$$copy_dir/* \
hotspot-tools/$$copy_dir ; \
done
- for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \
+ for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \
@@ -1221,7 +1223,7 @@ stamps/hotspot-tools-copy-source-files.s
mkdir -p stamps
touch stamps/hotspot-tools-copy-source-files.stamp
-hotspot-tools-source-files.txt: stamps/extract.stamp \
+hotspot-tools-source-files.txt: stamps/clone.stamp \
stamps/hotspot-tools-copy-source-files.stamp
find hotspot-tools -name '*.java' | sort > $@
mkdir -p lib/hotspot-tools
@@ -1230,12 +1232,12 @@ stamps/hotspot-tools-class-files.stamp:
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
+ -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
@$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
+ -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
@$< ; \
fi
mkdir -p stamps
@@ -1268,7 +1270,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
fi
# rt-closed.jar class files.
-rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
+rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
find rt -name '*.java' | sort > $@
stamps/rt-class-files.stamp: rt-source-files.txt
@@ -1276,12 +1278,12 @@ stamps/rt-class-files.stamp: rt-source-f
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+ -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated \
@$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-bootclasspath '' -source 1.6 \
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+ -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated \
@$< ; \
fi
cp -r rt/net/sourceforge/jnlp/resources \
@@ -1400,13 +1402,13 @@ bootstrap-directory-symlink-ecj: stamps/
bootstrap-directory-symlink: stamps/bootstrap-directory-symlink.stamp
+clone: stamps/clone.stamp
+
+clone-ecj: stamps/clone-ecj.stamp
+
copy-source-files: stamps/copy-source-files.stamp
download: stamps/download.stamp
-
-extract: stamps/extract.stamp
-
-extract-ecj: stamps/extract-ecj.stamp
icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
More information about the distro-pkg-dev
mailing list