changeset in /hg/icedtea: 2007-12-10 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Mon Dec 10 08:25:00 PST 2007
changeset 3697dfe80c91 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3697dfe80c91
description:
2007-12-10 Lillian Angel <langel at redhat.com>
* INSTALL: Updated requirements.
* Makefile.am: Update to b24- use hg to clone/update openjdk.
* Makefile.in: Regenerate.
* acinclude.m4: Removed unneeded option (--with-openjdk-src-zip).
* configure.ac: Likewise.
* configure: Regenerate.
* generated/*: Regenerated all files for b24.
* patches/icedtea-core-build.patch: Updated for b24.
* patches/icedtea-ecj.patch: Likewise.
diffstat:
148 files changed, 3572 insertions(+), 3297 deletions(-)
ChangeLog | 12
INSTALL | 1
Makefile.am | 140 +--
Makefile.in | 130 +--
acinclude.m4 | 17
configure | 171 ++--
configure.ac | 2
generated/com/sun/corba/se/impl/logging/ActivationSystemException.java | 2
generated/com/sun/corba/se/impl/logging/IORSystemException.java | 2
generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java | 2
generated/com/sun/corba/se/impl/logging/LogStrings.properties | 30
generated/com/sun/corba/se/impl/logging/NamingSystemException.java | 2
generated/com/sun/corba/se/impl/logging/OMGSystemException.java | 2
generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java | 2
generated/com/sun/corba/se/impl/logging/POASystemException.java | 2
generated/com/sun/corba/se/impl/logging/UtilSystemException.java | 2
generated/com/sun/java/swing/plaf/gtk/resources/gtk.java | 2
generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java | 2
generated/com/sun/java/swing/plaf/gtk/resources/gtk_es.java | 2
generated/com/sun/java/swing/plaf/gtk/resources/gtk_fr.java | 2
generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java | 2
generated/com/sun/java/swing/plaf/gtk/resources/gtk_ja.java | 2
generated/com/sun/java/swing/plaf/gtk/resources/gtk_ko.java | 2
generated/com/sun/java/swing/plaf/gtk/resources/gtk_sv.java | 2
generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.java | 2
generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_HK.java | 2
generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.java | 2
generated/com/sun/java/swing/plaf/motif/resources/motif.java | 1
generated/com/sun/java/swing/plaf/motif/resources/motif_de.java | 1
generated/com/sun/java/swing/plaf/motif/resources/motif_es.java | 1
generated/com/sun/java/swing/plaf/motif/resources/motif_fr.java | 1
generated/com/sun/java/swing/plaf/motif/resources/motif_it.java | 1
generated/com/sun/java/swing/plaf/motif/resources/motif_ja.java | 1
generated/com/sun/java/swing/plaf/motif/resources/motif_ko.java | 1
generated/com/sun/java/swing/plaf/motif/resources/motif_sv.java | 1
generated/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.java | 1
generated/com/sun/java/swing/plaf/motif/resources/motif_zh_HK.java | 1
generated/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.java | 1
generated/com/sun/java/swing/plaf/windows/resources/windows.java | 3
generated/com/sun/java/swing/plaf/windows/resources/windows_de.java | 3
generated/com/sun/java/swing/plaf/windows/resources/windows_es.java | 3
generated/com/sun/java/swing/plaf/windows/resources/windows_fr.java | 3
generated/com/sun/java/swing/plaf/windows/resources/windows_it.java | 3
generated/com/sun/java/swing/plaf/windows/resources/windows_ja.java | 3
generated/com/sun/java/swing/plaf/windows/resources/windows_ko.java | 3
generated/com/sun/java/swing/plaf/windows/resources/windows_sv.java | 3
generated/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.java | 3
generated/com/sun/java/swing/plaf/windows/resources/windows_zh_HK.java | 3
generated/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.java | 3
generated/com/sun/swing/internal/plaf/basic/resources/basic.java | 5
generated/com/sun/swing/internal/plaf/basic/resources/basic_de.java | 5
generated/com/sun/swing/internal/plaf/basic/resources/basic_es.java | 5
generated/com/sun/swing/internal/plaf/basic/resources/basic_fr.java | 5
generated/com/sun/swing/internal/plaf/basic/resources/basic_it.java | 5
generated/com/sun/swing/internal/plaf/basic/resources/basic_ja.java | 5
generated/com/sun/swing/internal/plaf/basic/resources/basic_ko.java | 5
generated/com/sun/swing/internal/plaf/basic/resources/basic_sv.java | 5
generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java | 5
generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java | 5
generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java | 5
generated/com/sun/swing/internal/plaf/metal/resources/metal.java | 1
generated/com/sun/swing/internal/plaf/metal/resources/metal_de.java | 1
generated/com/sun/swing/internal/plaf/metal/resources/metal_es.java | 1
generated/com/sun/swing/internal/plaf/metal/resources/metal_fr.java | 1
generated/com/sun/swing/internal/plaf/metal/resources/metal_it.java | 1
generated/com/sun/swing/internal/plaf/metal/resources/metal_ja.java | 1
generated/com/sun/swing/internal/plaf/metal/resources/metal_ko.java | 1
generated/com/sun/swing/internal/plaf/metal/resources/metal_sv.java | 1
generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.java | 1
generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_HK.java | 1
generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.java | 1
generated/com/sun/swing/internal/plaf/synth/resources/synth.java | 1
generated/com/sun/swing/internal/plaf/synth/resources/synth_de.java | 1
generated/com/sun/swing/internal/plaf/synth/resources/synth_es.java | 1
generated/com/sun/swing/internal/plaf/synth/resources/synth_fr.java | 1
generated/com/sun/swing/internal/plaf/synth/resources/synth_it.java | 1
generated/com/sun/swing/internal/plaf/synth/resources/synth_ja.java | 1
generated/com/sun/swing/internal/plaf/synth/resources/synth_ko.java | 1
generated/com/sun/swing/internal/plaf/synth/resources/synth_sv.java | 1
generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.java | 1
generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_HK.java | 1
generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.java | 1
generated/java/nio/BufferOverflowException.java | 6
generated/java/nio/BufferUnderflowException.java | 6
generated/java/nio/ByteBuffer.java | 255 +++---
generated/java/nio/ByteBufferAsCharBufferB.java | 170 ++--
generated/java/nio/ByteBufferAsCharBufferL.java | 170 ++--
generated/java/nio/ByteBufferAsCharBufferRB.java | 124 +--
generated/java/nio/ByteBufferAsCharBufferRL.java | 124 +--
generated/java/nio/ByteBufferAsDoubleBufferB.java | 120 +-
generated/java/nio/ByteBufferAsDoubleBufferL.java | 120 +-
generated/java/nio/ByteBufferAsDoubleBufferRB.java | 74 -
generated/java/nio/ByteBufferAsDoubleBufferRL.java | 74 -
generated/java/nio/ByteBufferAsFloatBufferB.java | 120 +-
generated/java/nio/ByteBufferAsFloatBufferL.java | 120 +-
generated/java/nio/ByteBufferAsFloatBufferRB.java | 74 -
generated/java/nio/ByteBufferAsFloatBufferRL.java | 74 -
generated/java/nio/ByteBufferAsIntBufferB.java | 120 +-
generated/java/nio/ByteBufferAsIntBufferL.java | 120 +-
generated/java/nio/ByteBufferAsIntBufferRB.java | 74 -
generated/java/nio/ByteBufferAsIntBufferRL.java | 74 -
generated/java/nio/ByteBufferAsLongBufferB.java | 120 +-
generated/java/nio/ByteBufferAsLongBufferL.java | 120 +-
generated/java/nio/ByteBufferAsLongBufferRB.java | 74 -
generated/java/nio/ByteBufferAsLongBufferRL.java | 74 -
generated/java/nio/ByteBufferAsShortBufferB.java | 120 +-
generated/java/nio/ByteBufferAsShortBufferL.java | 120 +-
generated/java/nio/ByteBufferAsShortBufferRB.java | 74 -
generated/java/nio/ByteBufferAsShortBufferRL.java | 74 -
generated/java/nio/CharBuffer.java | 293 +++----
generated/java/nio/DoubleBuffer.java | 411 +++++-----
generated/java/nio/FloatBuffer.java | 411 +++++-----
generated/java/nio/IntBuffer.java | 411 +++++-----
generated/java/nio/InvalidMarkException.java | 6
generated/java/nio/LongBuffer.java | 411 +++++-----
generated/java/nio/ReadOnlyBufferException.java | 6
generated/java/nio/ShortBuffer.java | 411 +++++-----
generated/java/nio/channels/AlreadyConnectedException.java | 6
generated/java/nio/channels/AsynchronousCloseException.java | 6
generated/java/nio/channels/CancelledKeyException.java | 6
generated/java/nio/channels/ClosedByInterruptException.java | 6
generated/java/nio/channels/ClosedChannelException.java | 6
generated/java/nio/channels/ClosedSelectorException.java | 6
generated/java/nio/channels/ConnectionPendingException.java | 6
generated/java/nio/channels/FileLockInterruptionException.java | 6
generated/java/nio/channels/IllegalBlockingModeException.java | 6
generated/java/nio/channels/IllegalSelectorException.java | 6
generated/java/nio/channels/NoConnectionPendingException.java | 6
generated/java/nio/channels/NonReadableChannelException.java | 6
generated/java/nio/channels/NonWritableChannelException.java | 6
generated/java/nio/channels/NotYetBoundException.java | 6
generated/java/nio/channels/NotYetConnectedException.java | 6
generated/java/nio/channels/OverlappingFileLockException.java | 6
generated/java/nio/channels/UnresolvedAddressException.java | 6
generated/java/nio/channels/UnsupportedAddressTypeException.java | 6
generated/java/nio/charset/CharacterCodingException.java | 6
generated/java/nio/charset/CharsetDecoder.java | 329 +++-----
generated/java/nio/charset/CharsetEncoder.java | 409 ++++-----
generated/java/nio/charset/IllegalCharsetNameException.java | 6
generated/java/nio/charset/UnsupportedCharsetException.java | 6
generated/sun/management/resources/agent.java | 6
generated/sun/misc/Version.java | 84 +-
generated/sun/nio/ch/AlreadyBoundException.java | 6
generated/sun/tools/jconsole/Version.java | 6
generated/sun/util/CoreResourceBundleControl.java | 32
generated/sun/util/LocaleDataMetaInfo.java | 48 -
patches/icedtea-core-build.patch | 2
patches/icedtea-ecj.patch | 4
diffs (truncated from 12825 to 500 lines):
diff -r 312fb1b75e61 -r 3697dfe80c91 ChangeLog
--- a/ChangeLog Fri Dec 07 15:44:09 2007 -0500
+++ b/ChangeLog Mon Dec 10 11:23:44 2007 -0500
@@ -1,3 +1,15 @@ 2007-12-07 Lillian Angel <langel at redha
+2007-12-10 Lillian Angel <langel at redhat.com>
+
+ * INSTALL: Updated requirements.
+ * Makefile.am: Update to b24- use hg to clone/update openjdk.
+ * Makefile.in: Regenerate.
+ * acinclude.m4: Removed unneeded option (--with-openjdk-src-zip).
+ * configure.ac: Likewise.
+ * configure: Regenerate.
+ * generated/*: Regenerated all files for b24.
+ * patches/icedtea-core-build.patch: Updated for b24.
+ * patches/icedtea-ecj.patch: Likewise.
+
2007-12-07 Lillian Angel <langel at redhat.com>
* Makefile.am: Removed libjsoundalso.so, libjsound.so,libt2k.so.
diff -r 312fb1b75e61 -r 3697dfe80c91 INSTALL
--- a/INSTALL Fri Dec 07 15:44:09 2007 -0500
+++ b/INSTALL Mon Dec 10 11:23:44 2007 -0500
@@ -30,6 +30,7 @@ libpng-devel
libpng-devel
libjpeg-devel
zlib-devel
+mercurial 0.9.5 + forest extension
See ./configure --help if you need to override defaults.
diff -r 312fb1b75e61 -r 3697dfe80c91 Makefile.am
--- a/Makefile.am Fri Dec 07 15:44:09 2007 -0500
+++ b/Makefile.am Mon Dec 10 11:23:44 2007 -0500
@@ -1,6 +1,4 @@ OPENJDK_VERSION = b23
-OPENJDK_VERSION = b23
-OPENJDK_DATE = 30_oct_2007
-OPENJDK_MD5SUM = 7eed137c0321e0b5b75ff2d646ce0d0d
+OPENJDK_VERSION = b24
# Top-Level Targets
# =================
@@ -20,8 +18,8 @@ install:
install:
.PHONY: \
- env env-ecj snapshot clean-download clean-extract clean-patch \
- clean-extract-ecj clean-patch-ecj clean-bootstrap-directory \
+ env env-ecj snapshot clean-clone clean-clone clean-patch \
+ clean-clone-ecj clean-patch-ecj clean-bootstrap-directory \
clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \
clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
@@ -33,7 +31,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
# OpenJDK build environment.
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
+BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
ICEDTEA_BUILD_DIR = \
$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
ICEDTEA_RT = \
@@ -68,9 +66,9 @@ env:
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+ $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/
ICEDTEA_CLS_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+ $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/classes
ICEDTEA_ENV_ECJ = \
"ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
@@ -109,48 +107,30 @@ snapshot: dist
# ==================================
# Download OpenJDK sources.
-OPENJDK_URL = http://download.java.net/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/
-OPENJDK_SRC_ZIP_BASE = openjdk-7-ea-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).zip
-
-if USE_ALT_OPENJDK_SRC_ZIP
- OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
-else
- OPENJDK_SRC_ZIP = $(OPENJDK_SRC_ZIP_BASE)
-endif
-
-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)
-
-# Extract OpenJDK sources.
-stamps/extract.stamp: stamps/download.stamp
+OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
+
+stamps/clone.stamp:
if ! test -d openjdk ; \
then \
- $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
- chmod -R ug+w openjdk ; \
- fi
- mkdir -p stamps
- touch stamps/extract.stamp
-
-clean-extract:
- rm -f stamps/extract.stamp
+ hg fclone $(OPENJDK_URL) openjdk; \
+ fi
+ touch stamps/clone.stamp
+
+clean-clone:
+ rm -f stamps/clone.stamp
rm -rf openjdk
+update:
+ if test -d openjdk ; \
+ then \
+ cd openjdk; \
+ hg fpull; \
+ hg fupdate; \
+ cd ..; \
+ fi
+
# Link ports sources into tree
-stamps/ports.stamp: stamps/extract.stamp
+stamps/ports.stamp: stamps/clone.stamp
for target in ports/hotspot/build/*/platform_* \
ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/* \
@@ -208,7 +188,7 @@ ICEDTEA_PATCHES = \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
-stamps/patch.stamp: stamps/extract.stamp
+stamps/patch.stamp: stamps/clone.stamp update
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
@@ -237,24 +217,20 @@ clean-patch:
# ======================================
# Extract OpenJDK sources for ecj.
-stamps/extract-ecj.stamp: stamps/download.stamp
+stamps/clone-ecj.stamp: stamps/clone.stamp
if ! test -d openjdk-ecj ; \
then \
- mkdir tmp-ecj ; \
- $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \
- mv tmp-ecj/openjdk openjdk-ecj ; \
- rmdir tmp-ecj ; \
- chmod -R ug+w openjdk-ecj ; \
- fi
- mkdir -p stamps
- touch stamps/extract-ecj.stamp
-
-clean-extract-ecj:
- rm -f stamps/extract-ecj.stamp
+ hg fclone $(OPENJDK_URL) openjdk-ecj ; \
+ fi
+ mkdir -p stamps
+ 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.stamp
+stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
for target in ports/hotspot/build/*/platform_* \
ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/* \
@@ -268,7 +244,7 @@ stamps/ports-ecj.stamp: stamps/extract.s
# 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
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
@@ -311,7 +287,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/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
+ ln -s $(abs_top_srcdir)/openjdk-ecj/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
@@ -416,23 +392,23 @@ endif
# If you change anything here in the icedtea target, please make sure
# you change it in the icedtea-debug target as well.
-icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
+icedtea: update stamps/tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make
+ -C openjdk/
cp -af gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
cp -af gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
-icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
- stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
+icedtea-debug: update stamps/bootstrap-directory-symlink.stamp \
+ stamps/tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
$(MAKE) \
$(ICEDTEA_ENV) \
- -C openjdk/control/make \
+ -C openjdk/ \
debug_build
cp -af gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -441,10 +417,10 @@ icedtea-debug: stamps/bootstrap-directo
@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
+ -C openjdk/ clobber
icedtea-against-icedtea: \
stamps/bootstrap-directory-symlink.stamp \
@@ -454,20 +430,20 @@ icedtea-against-icedtea: \
# ===================
stamps/icedtea-ecj.stamp: stamps/tools.stamp stamps/plugs.stamp \
- stamps/extract-ecj.stamp stamps/ports-ecj.stamp stamps/patch-ecj.stamp
+ stamps/ports-ecj.stamp stamps/patch-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make
+ -C openjdk-ecj/
@echo "ecj-poured IcedTea is served:" \
- openjdk-ecj/control/build/$(LINUX_DIR)
+ openjdk-ecj/build/$(LINUX_DIR)
mkdir -p stamps
touch stamps/icedtea-ecj.stamp
-clean-icedtea-ecj: stamps/extract-ecj.stamp
+clean-icedtea-ecj: stamps/clone-ecj.stamp
rm -f stamps/icedtea-ecj.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
- -C openjdk-ecj/control/make clobber
+ -C openjdk-ecj/ clobber
stamps/icedtea-against-ecj.stamp: \
stamps/bootstrap-directory-symlink-ecj.stamp \
@@ -527,7 +503,7 @@ ICEDTEA_COPY_DIRS = \
java/rmi \
javax/net/ssl
-stamps/copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
+stamps/copy-source-files.stamp: stamps/patch.stamp
for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
do \
mkdir -p rt/$$copy_dir ; \
@@ -555,7 +531,7 @@ OPENJDK_SOURCEPATH_DIRS = \
$(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
# tools.jar class files.
-stamps/tools-copy-source-files.stamp: stamps/extract.stamp stamps/patch.stamp
+stamps/tools-copy-source-files.stamp: stamps/patch.stamp
for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
do \
mkdir -p tools/$$copy_dir ; \
@@ -587,7 +563,7 @@ stamps/tools-copy-source-files.stamp: st
mkdir -p stamps
touch stamps/tools-copy-source-files.stamp
-tools-source-files.txt: stamps/extract.stamp \
+tools-source-files.txt: stamps/clone.stamp \
stamps/tools-copy-source-files.stamp
find tools -name '*.java' | sort > $@
mkdir -p lib/tools
@@ -619,7 +595,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
@@ -669,11 +645,11 @@ bootstrap-directory-symlink: stamps/boot
copy-source-files: stamps/copy-source-files.stamp
-download: stamps/download.stamp
-
-extract-ecj: stamps/extract-ecj.stamp
-
-extract: stamps/extract.stamp
+clone: stamps/clone.stamp
+
+clone-ecj: stamps/clone-ecj.stamp
+
+clone: stamps/clone.stamp
icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
diff -r 312fb1b75e61 -r 3697dfe80c91 Makefile.in
--- a/Makefile.in Fri Dec 07 15:44:09 2007 -0500
+++ b/Makefile.in Mon Dec 10 11:23:44 2007 -0500
@@ -59,7 +59,6 @@ distuninstallcheck_listfiles = find . -t
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -110,6 +109,7 @@ LTLIBOBJS = @LTLIBOBJS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MD5SUM = @MD5SUM@
+MERCURIAL = @MERCURIAL@
MKDIR_P = @MKDIR_P@
MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
MOZILLA_LIBS = @MOZILLA_LIBS@
@@ -187,16 +187,14 @@ target_alias = @target_alias@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-OPENJDK_VERSION = b23
-OPENJDK_DATE = 30_oct_2007
-OPENJDK_MD5SUM = 7eed137c0321e0b5b75ff2d646ce0d0d
+OPENJDK_VERSION = b24
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports
# OpenJDK build environment.
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/control/build/$(LINUX_DIR)
+BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
ICEDTEA_BUILD_DIR = \
$(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
@@ -232,10 +230,10 @@ ICEDTEA_ENV = \
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
+ $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/
ICEDTEA_CLS_DIR_ECJ = \
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
+ $(abs_top_srcdir)/openjdk-ecj/build/$(LINUX_DIR)/classes
ICEDTEA_ENV_ECJ = \
"ALT_JDK_IMPORT_PATH=$(abs_top_srcdir)/bootstrap/jdk1.6.0/" \
@@ -268,10 +266,7 @@ ICEDTEA_ENV_ECJ = \
# ==================================
# Download OpenJDK sources.
-OPENJDK_URL = http://download.java.net/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/
-OPENJDK_SRC_ZIP_BASE = openjdk-7-ea-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).zip
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = $(OPENJDK_SRC_ZIP_BASE)
- at USE_ALT_OPENJDK_SRC_ZIP_TRUE@OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
+OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
@FAST_BUILD_FALSE at FAST_BUILD_PATCH =
# Patch OpenJDK sources for plug replacements.
@@ -647,8 +642,8 @@ install:
install:
.PHONY: \
- env env-ecj snapshot clean-download clean-extract clean-patch \
- clean-extract-ecj clean-patch-ecj clean-bootstrap-directory \
+ env env-ecj snapshot clean-clone clean-clone clean-patch \
+ clean-clone-ecj clean-patch-ecj clean-bootstrap-directory \
clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \
clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
@@ -667,39 +662,28 @@ snapshot: dist
snapshot: dist
mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
-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)
-
-# Extract OpenJDK sources.
-stamps/extract.stamp: stamps/download.stamp
+stamps/clone.stamp:
if ! test -d openjdk ; \
then \
- $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
- chmod -R ug+w openjdk ; \
+ hg fclone $(OPENJDK_URL) openjdk; \
fi
- mkdir -p stamps
- touch stamps/extract.stamp
-
-clean-extract:
- rm -f stamps/extract.stamp
+ touch stamps/clone.stamp
+
+clean-clone:
+ rm -f stamps/clone.stamp
rm -rf openjdk
+update:
+ if test -d openjdk ; \
+ then \
+ cd openjdk; \
+ hg fpull; \
+ hg fupdate; \
+ cd ..; \
+ fi
+
# Link ports sources into tree
-stamps/ports.stamp: stamps/extract.stamp
+stamps/ports.stamp: stamps/clone.stamp
for target in ports/hotspot/build/*/platform_* \
ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/* \
@@ -710,7 +694,7 @@ stamps/ports.stamp: stamps/extract.stamp
mkdir -p stamps
touch stamps/ports.stamp
-stamps/patch.stamp: stamps/extract.stamp
+stamps/patch.stamp: stamps/clone.stamp update
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
@@ -739,24 +723,20 @@ clean-patch:
# ======================================
# Extract OpenJDK sources for ecj.
-stamps/extract-ecj.stamp: stamps/download.stamp
+stamps/clone-ecj.stamp: stamps/clone.stamp
if ! test -d openjdk-ecj ; \
then \
- mkdir tmp-ecj ; \
- $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \
- mv tmp-ecj/openjdk openjdk-ecj ; \
- rmdir tmp-ecj ; \
- chmod -R ug+w openjdk-ecj ; \
+ hg fclone $(OPENJDK_URL) 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.stamp
+stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
for target in ports/hotspot/build/*/platform_* \
ports/hotspot/build/*/makefiles/* \
ports/hotspot/src/*/* \
@@ -767,7 +747,7 @@ stamps/ports-ecj.stamp: stamps/extract.s
mkdir -p stamps
touch stamps/ports-ecj.stamp
-stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
+stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
More information about the distro-pkg-dev
mailing list