changeset in /hg/icedtea: 2008-02-15 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Thu May 29 14:10:42 PDT 2008
changeset d33bf4f953a0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d33bf4f953a0
description:
2008-02-15 Lillian Angel <langel at redhat.com>
* INSTALL: Updated.
* Makefile.am: Updated patches. Added download target, added extract
and extract-ecj targets. Removed clone and clone-ecj targets. Updated
all paths and targets appropriately.
* Makefile.in: Regenerate.
* configure: Regenerate.
* configure.ac: Added new tools: tar, md5sum.
* gcjwebplugin.cc: Updated for 1.6.0.
* generated/sun/awt/X11/generator/sizer.32: Regenerated.
* generated/sun/awt/X11/generator/sizer.32.c: Regenerated.
* patches/icedtea-ant.patch: Updated.
* patches/icedtea-bytebuffer-compact.patch: Updated.
* patches/icedtea-certbundle.patch: Updated.
* patches/icedtea-copy-plugs.patch: Updated.
* patches/icedtea-core-build.patch: Updated.
* patches/icedtea-ecj.patch: Updated.
* patches/icedtea-gcc-4.3.patch: Updated.
* patches/icedtea-headers.patch: Updated.
* patches/icedtea-lib64.patch: Updated.
* patches/icedtea-libraries.patch: Updated.
* patches/icedtea-linker-options.patch: Updated.
* patches/icedtea-memory-limits.patch: Updated.
* patches/icedtea-plugin.patch: Updated.
* patches/icedtea-ports.patch: Updated.
* patches/icedtea-signature-iterator.patch: Updated.
* patches/icedtea-signed-types.patch: Updated.
* patches/icedtea-ssl.patch: Updated.
* patches/icedtea-test-atomic-operations.patch: Updated.
* patches/icedtea-use-system-tzdata.patch: Updated.
* patches/icedtea-version.patch: Updated.
* patches/icedtea-zero.patch: Updated.
* patches/icedtea-bytecodeInterpreter.patch: Removed.
* patches/icedtea-bytecodeInterpreterWithChecks.patch: Removed.
* rt/java/io/PushbackReader.java: Removed.
diffstat:
32 files changed, 940 insertions(+), 1106 deletions(-)
ChangeLog | 37 +
INSTALL | 6
Makefile.am | 157 ++---
Makefile.in | 161 ++---
configure | 519 +++++++++----------
configure.ac | 9
gcjwebplugin.cc | 6
generated/sun/awt/X11/generator/sizer.32.c | 18
patches/icedtea-ant.patch | 4
patches/icedtea-bytebuffer-compact.patch | 10
patches/icedtea-bytecodeInterpreter.patch | 36 -
patches/icedtea-bytecodeInterpreterWithChecks.patch | 18
patches/icedtea-certbundle.patch | 2
patches/icedtea-copy-plugs.patch | 106 +--
patches/icedtea-core-build.patch | 218 +++----
patches/icedtea-ecj.patch | 164 +++---
patches/icedtea-gcc-4.3.patch | 6
patches/icedtea-headers.patch | 2
patches/icedtea-lib64.patch | 2
patches/icedtea-libraries.patch | 196 +++----
patches/icedtea-linker-options.patch | 12
patches/icedtea-memory-limits.patch | 18
patches/icedtea-plugin.patch | 2
patches/icedtea-ports.patch | 204 ++-----
patches/icedtea-signature-iterator.patch | 6
patches/icedtea-signed-types.patch | 14
patches/icedtea-ssl.patch | 2
patches/icedtea-test-atomic-operations.patch | 2
patches/icedtea-use-system-tzdata.patch | 2
patches/icedtea-version.patch | 19
patches/icedtea-zero.patch | 26
rt/java/io/PushbackReader.java | 62 --
diffs (truncated from 3286 to 500 lines):
diff -r cca042209a33 -r d33bf4f953a0 ChangeLog
--- a/ChangeLog Fri Feb 15 11:13:14 2008 -0500
+++ b/ChangeLog Fri Feb 15 11:58:44 2008 -0500
@@ -1,3 +1,40 @@ 2008-02-15 Gary Benson <gbenson at redhat
+2008-02-15 Lillian Angel <langel at redhat.com>
+
+ * INSTALL: Updated.
+ * Makefile.am: Updated patches. Added download target, added extract
+ and extract-ecj targets. Removed clone and clone-ecj targets. Updated
+ all paths and targets appropriately.
+ * Makefile.in: Regenerate.
+ * configure: Regenerate.
+ * configure.ac: Added new tools: tar, md5sum.
+ * gcjwebplugin.cc: Updated for 1.6.0.
+ * generated/sun/awt/X11/generator/sizer.32: Regenerated.
+ * generated/sun/awt/X11/generator/sizer.32.c: Regenerated.
+ * patches/icedtea-ant.patch: Updated.
+ * patches/icedtea-bytebuffer-compact.patch: Updated.
+ * patches/icedtea-certbundle.patch: Updated.
+ * patches/icedtea-copy-plugs.patch: Updated.
+ * patches/icedtea-core-build.patch: Updated.
+ * patches/icedtea-ecj.patch: Updated.
+ * patches/icedtea-gcc-4.3.patch: Updated.
+ * patches/icedtea-headers.patch: Updated.
+ * patches/icedtea-lib64.patch: Updated.
+ * patches/icedtea-libraries.patch: Updated.
+ * patches/icedtea-linker-options.patch: Updated.
+ * patches/icedtea-memory-limits.patch: Updated.
+ * patches/icedtea-plugin.patch: Updated.
+ * patches/icedtea-ports.patch: Updated.
+ * patches/icedtea-signature-iterator.patch: Updated.
+ * patches/icedtea-signed-types.patch: Updated.
+ * patches/icedtea-ssl.patch: Updated.
+ * patches/icedtea-test-atomic-operations.patch: Updated.
+ * patches/icedtea-use-system-tzdata.patch: Updated.
+ * patches/icedtea-version.patch: Updated.
+ * patches/icedtea-zero.patch: Updated.
+ * patches/icedtea-bytecodeInterpreter.patch: Removed.
+ * patches/icedtea-bytecodeInterpreterWithChecks.patch: Removed.
+ * rt/java/io/PushbackReader.java: Removed.
+
2008-02-15 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp: Build on x86.
diff -r cca042209a33 -r d33bf4f953a0 INSTALL
--- a/INSTALL Fri Feb 15 11:13:14 2008 -0500
+++ b/INSTALL Fri Feb 15 11:58:44 2008 -0500
@@ -1,5 +1,5 @@ Building IcedTea
-Building IcedTea
-================
+Building IcedTea 1.6.0
+======================
For convenience we've provided make targets that automatically
download, extract and patch the source code from openjdk.java.net, in
@@ -15,7 +15,7 @@ Freetype2
Freetype2
patch
sed
-unzip
+tar
md5sum
wget
alsa
diff -r cca042209a33 -r d33bf4f953a0 Makefile.am
--- a/Makefile.am Fri Feb 15 11:13:14 2008 -0500
+++ b/Makefile.am Fri Feb 15 11:58:44 2008 -0500
@@ -1,4 +1,6 @@ OPENJDK_VERSION = b24
-OPENJDK_VERSION = b24
+OPENJDK_DATE = 12_feb_2008
+OPENJDK_MD5SUM = 660e6230dfc4cdc8a7c93bc3e7e60120
+OPENJDK_VERSION = b05
# Top-Level Targets
# =================
@@ -32,9 +34,12 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
tools patches/icedtea-gcc-4.3.patch
+# The Binary plugs directory is called jdk1.7.0 for historical reasons. The
+# name is completely irrelevant; only contains the plugs to build IcedTea.
+
# OpenJDK build environment.
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
+BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
ICEDTEA_BUILD_DIR = \
$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
ICEDTEA_RT = \
@@ -54,8 +59,8 @@ ICEDTEA_ENV = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
"BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+ "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -77,15 +82,15 @@ env:
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/
+ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
ICEDTEA_CLS_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/classes
+ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
ICEDTEA_ENV_ECJ = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
"BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+ "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -115,62 +120,37 @@ snapshot: dist
snapshot: dist
mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
-# Creates archive of openjdk.
-dist-openjdk:
- if ! hg; \
- then \
- echo "Mercurial cannot be found. Please install it and try again."; \
- exit 1; \
- 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; \
- fi
- hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk-dist/openjdk
- find -name \\.hg* | xargs rm -rf
- cd openjdk-dist && $(ZIP) -r openjdk-$(OPENJDK_VERSION) openjdk/
- mv openjdk-dist/openjdk-$(OPENJDK_VERSION).zip .
- rm -rf openjdk-dist
-
# OpenJDK Source Preparation Targets
# ==================================
# Download OpenJDK sources.
-OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
+OPENJDK_URL = http://download.java.net/openjdk/jdk6/
if USE_ALT_OPENJDK_SRC_ZIP
OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
else
- OPENJDK_SRC_ZIP =
+ OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
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
+stamps/download.stamp:
+ if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then \
+ if [ $(OPENJDK_SRC_ZIP) ] ; \
+ then \
+ mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
+ fi ; \
+ $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \
+ fi
+ mkdir -p stamps
+ touch stamps/download.stamp
+
+clean-download:
+ rm -f stamps/download.stamp
+ rm -f $(OPENJDK_SRC_ZIP)
# Link ports sources into tree
-stamps/ports.stamp: stamps/clone.stamp
+stamps/ports.stamp: stamps/extract.stamp
for target in ports/hotspot/build/*/platform_* \
ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/* \
@@ -227,9 +207,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
- patches/icedtea-bytecodeInterpreterWithChecks.patch \
patches/icedtea-corba.patch \
- patches/icedtea-bytecodeInterpreter.patch \
patches/icedtea-signature-iterator.patch \
patches/icedtea-signed-types.patch \
patches/icedtea-test-atomic-operations.patch \
@@ -247,7 +225,20 @@ ICEDTEA_PATCHES = \
$(ZERO_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
-stamps/patch.stamp: stamps/clone.stamp
+stamps/extract.stamp: stamps/download.stamp
+ if ! test -d openjdk ; \
+ then \
+ mkdir openjdk ; \
+ $(TAR) xf $(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
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
@@ -276,19 +267,19 @@ clean-patch:
# ======================================
# Copy over OpenJDK sources for ecj.
-stamps/clone-ecj.stamp: stamps/patch.stamp
+stamps/extract-ecj.stamp: stamps/patch.stamp
if ! test -d openjdk-ecj ; then \
cp -pPRl openjdk openjdk-ecj ; \
fi
mkdir -p stamps
- touch stamps/clone-ecj.stamp
-
-clean-clone-ecj:
- rm -f stamps/clone-ecj.stamp
+ touch stamps/extract-ecj.stamp
+
+clean-extract-ecj:
+ rm -f stamps/extract-ecj.stamp
rm -rf openjdk-ecj
# Link ports sources into tree
-stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
+stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
for target in ports/hotspot/build/*/platform_* \
ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/* \
@@ -302,7 +293,7 @@ stamps/ports-ecj.stamp: stamps/clone-ecj
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
-stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
+stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
echo Checking $(ICEDTEA_ECJ_PATCH) ; \
if $(PATCH) -p0 -l --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
then \
@@ -327,7 +318,7 @@ clean-patch-ecj:
# bootstrap/icedtea.
stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
rm -rf bootstrap/icedtea
- ln -s $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
+ ln -s $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
if ! test -d bootstrap/icedtea/include; then \
ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
fi
@@ -446,7 +437,7 @@ icedtea: stamps/bootstrap-directory-syml
stamps/tools.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/
+ -C openjdk/control/make/
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
cp -pPRf gcjwebplugin.so \
@@ -464,7 +455,7 @@ icedtea-debug: stamps/bootstrap-director
stamps/tools.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/ \
+ -C openjdk/control/make \
debug_build
if test "$(ENABLE_PLUGIN)" == "yes" ; \
then \
@@ -478,10 +469,10 @@ icedtea-debug: stamps/bootstrap-director
@echo "IcedTea (debug build) is served:" \
$(BUILD_OUTPUT_DIR)-debug
-clean-icedtea: stamps/clone.stamp
+clean-icedtea: stamps/extract.stamp
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/ clobber
+ -C openjdk/control/make clobber
icedtea-against-icedtea: \
stamps/bootstrap-directory-symlink.stamp \
@@ -494,9 +485,9 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/
+ -C openjdk-ecj/control/make
@echo "ecj-poured IcedTea is served:" \
- openjdk-ecj/build/$(LINUX_DIR)
+ openjdk-ecj/control/build/$(LINUX_DIR)
mkdir -p stamps
touch stamps/icedtea-ecj.stamp
@@ -505,22 +496,22 @@ hotspot:
rm -f stamps/icedtea-ecj.stamp
rm -f stamps/icedtea-against-ecj.stamp
$(MAKE) hotspot-helper
- cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
- openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
- @echo "Hotspot is served:" openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image
+ cp openjdk-ecj/control/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/core/libjvm.so \
+ openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/core
+ @echo "Hotspot is served:" openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image
hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj hotspot
-
-clean-icedtea-ecj: stamps/clone-ecj.stamp
+ -C openjdk-ecj/control/make hotspot
+
+clean-icedtea-ecj: stamps/extract-ecj.stamp
rm -f stamps/icedtea-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/ clobber
+ -C openjdk-ecj/control/make clobber
stamps/icedtea-against-ecj.stamp: \
stamps/bootstrap-directory-symlink-ecj.stamp \
@@ -640,7 +631,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/clone.stamp \
+hotspot-tools-source-files.txt: stamps/extract.stamp \
stamps/hotspot-tools-copy-source-files.stamp
find hotspot-tools -name '*.java' | sort > $@
mkdir -p lib/hotspot-tools
@@ -687,7 +678,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
fi
# rt-closed.jar class files.
-rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
+rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
find rt -name '*.java' | sort > $@
stamps/rt-class-files.stamp: rt-source-files.txt
@@ -745,7 +736,7 @@ stamps/tools.stamp: stamps/tools-class-f
stamps/tools.stamp: stamps/tools-class-files.stamp
touch stamps/tools.stamp
-tools-source-files.txt: stamps/clone.stamp
+tools-source-files.txt: stamps/extract.stamp
find tools -name '*.java' | sort > $@
stamps/tools-class-files.stamp: tools-source-files.txt \
@@ -786,9 +777,11 @@ bootstrap-directory-symlink: stamps/boot
copy-source-files: stamps/copy-source-files.stamp
-clone: stamps/clone.stamp
-
-clone-ecj: stamps/clone-ecj.stamp
+download: stamps/download.stamp
+
+extract: stamps/extract.stamp
+
+extract-ecj: stamps/extract-ecj.stamp
icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
diff -r cca042209a33 -r d33bf4f953a0 Makefile.in
--- a/Makefile.in Fri Feb 15 11:13:14 2008 -0500
+++ b/Makefile.in Fri Feb 15 11:58:44 2008 -0500
@@ -116,7 +116,7 @@ LIBS = @LIBS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MERCURIAL = @MERCURIAL@
+MD5SUM = @MD5SUM@
MKDIR_P = @MKDIR_P@
MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
MOZILLA_LIBS = @MOZILLA_LIBS@
@@ -138,8 +138,9 @@ SYSTEM_ANT_DIR = @SYSTEM_ANT_DIR@
SYSTEM_ANT_DIR = @SYSTEM_ANT_DIR@
SYSTEM_GCJ_DIR = @SYSTEM_GCJ_DIR@
SYSTEM_ICEDTEA_DIR = @SYSTEM_ICEDTEA_DIR@
-UNZIP = @UNZIP@
+TAR = @TAR@
VERSION = @VERSION@
+WGET = @WGET@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XALAN2_JAR = @XALAN2_JAR@
@@ -155,7 +156,6 @@ XTST_LIBS = @XTST_LIBS@
XTST_LIBS = @XTST_LIBS@
XT_CFLAGS = @XT_CFLAGS@
XT_LIBS = @XT_LIBS@
-ZIP = @ZIP@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -207,15 +207,20 @@ target_alias = @target_alias@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-OPENJDK_VERSION = b24
+OPENJDK_DATE = 12_feb_2008
+OPENJDK_MD5SUM = 660e6230dfc4cdc8a7c93bc3e7e60120
+OPENJDK_VERSION = b05
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
tools patches/icedtea-gcc-4.3.patch
+# The Binary plugs directory is called jdk1.7.0 for historical reasons. The
+# name is completely irrelevant; only contains the plugs to build IcedTea.
+
# OpenJDK build environment.
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
+BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
ICEDTEA_BUILD_DIR = \
$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
@@ -237,8 +242,8 @@ ICEDTEA_ENV = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
"BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+ "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -257,17 +262,17 @@ ICEDTEA_ENV = \
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/
+ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
ICEDTEA_CLS_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/classes
+ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
ICEDTEA_ENV_ECJ = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
"BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
+ "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -294,8 +299,8 @@ ICEDTEA_ENV_ECJ = \
# ==================================
# Download OpenJDK sources.
-OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP =
+OPENJDK_URL = http://download.java.net/openjdk/jdk6/
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
@USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
@FAST_BUILD_FALSE at FAST_BUILD_PATCH =
@@ -334,9 +339,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-javafiles.patch \
- patches/icedtea-bytecodeInterpreterWithChecks.patch \
patches/icedtea-corba.patch \
- patches/icedtea-bytecodeInterpreter.patch \
patches/icedtea-signature-iterator.patch \
patches/icedtea-signed-types.patch \
More information about the distro-pkg-dev
mailing list