/hg/icedtea: Remove fake tools.jar used in bootstrap JDK.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 1 07:24:39 PDT 2010
changeset 007d1cc7ea12 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=007d1cc7ea12
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 01 15:24:24 2010 +0100
Remove fake tools.jar used in bootstrap JDK.
2010-06-01 Andrew John Hughes <ahughes at redhat.com>
Drop fake tools.jar in bootstrap JDK.
* Makefile.am: (.PHONY): Remove clean-tools-jar.
(bootstrap-directory-stage1.stamp): Remove tools.jar
symlink; can be avoided by patching HotSpot as part of
patch below. (bootstrap/jdk1.7.0/lib/tools.jar): Removed.
(clean-tools-jar): Likewise. (plugs.stamp): Remove
dependency on tools.jar. (clean-plugs): Remove dependency on
clean-tools-jar.
* patches/boot/icedtea-hotspot-default.patch: Remove
references to tools.jar, setting SA_CLASSPATH to rt.jar
instead of tools.jar.
diffstat:
3 files changed, 23 insertions(+), 46 deletions(-)
ChangeLog | 16 ++++++++++++++
Makefile.am | 31 ++++------------------------
patches/boot/icedtea-hotspot-default.patch | 22 +------------------
diffs (123 lines):
diff -r 76f02702e374 -r 007d1cc7ea12 ChangeLog
--- a/ChangeLog Tue Jun 01 12:59:18 2010 +0100
+++ b/ChangeLog Tue Jun 01 15:24:24 2010 +0100
@@ -1,3 +1,19 @@ 2010-06-01 Andrew John Hughes <ahughes@
+2010-06-01 Andrew John Hughes <ahughes at redhat.com>
+
+ Drop fake tools.jar in bootstrap JDK.
+ * Makefile.am:
+ (.PHONY): Remove clean-tools-jar.
+ (bootstrap-directory-stage1.stamp): Remove
+ tools.jar symlink; can be avoided by patching
+ HotSpot as part of patch below.
+ (bootstrap/jdk1.7.0/lib/tools.jar): Removed.
+ (clean-tools-jar): Likewise.
+ (plugs.stamp): Remove dependency on tools.jar.
+ (clean-plugs): Remove dependency on clean-tools-jar.
+ * patches/boot/icedtea-hotspot-default.patch:
+ Remove references to tools.jar, setting SA_CLASSPATH
+ to rt.jar instead of tools.jar.
+
2010-06-01 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Update langtools
diff -r 76f02702e374 -r 007d1cc7ea12 Makefile.am
--- a/Makefile.am Tue Jun 01 12:59:18 2010 +0100
+++ b/Makefile.am Tue Jun 01 15:24:24 2010 +0100
@@ -775,9 +775,9 @@ install:
clean-bootstrap-directory-symlink-stage2 clean-bootstrap-directory-stage1 \
clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \
clean-icedtea icedtea-stage2 clean-icedtea-boot clean-plugs \
- clean-tools-jar clean-visualvm clean-nbplatform \
- clean-rt clean-plugin hotspot hotspot-helper clean-extra clean-jtreg \
- clean-jtreg-reports clean-netx clean-drops
+ clean-visualvm clean-nbplatform clean-rt clean-plugin hotspot \
+ hotspot-helper clean-extra clean-jtreg clean-jtreg-reports clean-netx \
+ clean-drops
env:
@echo 'unset JAVA_HOME'
@@ -1722,10 +1722,6 @@ stamps/bootstrap-directory-stage1.stamp:
ln -sf ./$(JRE_ARCH_DIR) \
bootstrap/boot/jre/lib/$(INSTALL_ARCH_DIR); \
fi
-# For HotSpot
- mkdir -p $(abs_top_builddir)/bootstrap/boot/lib && \
- ln -sf $(abs_top_builddir)/bootstrap/boot/jre/lib/rt.jar \
- $(abs_top_builddir)/bootstrap/boot/lib/tools.jar
mkdir -p bootstrap/boot/include && \
for i in $(SYSTEM_JDK_DIR)/include/*; do \
test -r $$i | continue; \
@@ -2711,34 +2707,17 @@ clean-rt:
rm -f stamps/rt-class-files.stamp stamps/rt.stamp
rm -f rt-source-files.txt
-# tools.jar
-bootstrap/jdk1.7.0/lib/tools.jar: stamps/rt.stamp
- mkdir -p bootstrap/boot/lib
- ln -sf $(abs_top_builddir)/bootstrap/boot/jre/lib/rt.jar \
- $(abs_top_builddir)/bootstrap/boot/lib/tools.jar
- mkdir -p bootstrap/jdk1.7.0/lib
- ln -sf $(abs_top_builddir)/bootstrap/boot/lib/tools.jar \
- $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar
-
-clean-tools-jar:
- rm -f bootstrap/jdk1.7.0/lib/tools.jar
- rm -f bootstrap/boot/lib/tools.jar
- if test -d bootstrap/boot/lib ; then \
- rm -f $(abs_top_builddir)/bootstrap/boot/lib/tools.jar; \
- fi
-
# rt-closed.jar.
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib
ln -sf ${abs_top_builddir}/bootstrap/boot/jre/lib/rt.jar \
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
-stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- bootstrap/jdk1.7.0/lib/tools.jar
+stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
mkdir -p stamps
touch $@
-clean-plugs: clean-tools-jar clean-rt
+clean-plugs: clean-rt
rm -f stamps/plugs.stamp
rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
rm -rf bootstrap/jdk1.7.0
diff -r 76f02702e374 -r 007d1cc7ea12 patches/boot/icedtea-hotspot-default.patch
--- a/patches/boot/icedtea-hotspot-default.patch Tue Jun 01 12:59:18 2010 +0100
+++ b/patches/boot/icedtea-hotspot-default.patch Tue Jun 01 15:24:24 2010 +0100
@@ -40,30 +40,12 @@ diff -Nru ../openjdk.orig/openjdk-boot/h
diff -Nru ../openjdk.orig/openjdk-boot/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
--- ../openjdk.orig/openjdk-boot/hotspot/make/linux/makefiles/sa.make 2009-10-30 15:58:31.000000000 +0000
+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2009-10-30 17:44:58.000000000 +0000
-@@ -38,7 +38,9 @@
+@@ -38,7 +38,7 @@
GENERATED = $(TOPDIR)/../generated
# tools.jar is needed by the JDI - SA binding
-SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
-+SA_TOOLS_JAR = $(BOOT_JAVA_HOME)/lib/tools.jar
-+SA_RT_JAR = $(BOOT_JAVA_HOME)/jre/lib/rt.jar
-+SA_CLASSPATH = $(SA_TOOLS_JAR):$(SA_RT_JAR)
++SA_CLASSPATH = $(BOOT_JAVA_HOME)/jre/lib/rt.jar
# gnumake 3.78.1 does not accept the *s that
# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
-@@ -65,8 +67,13 @@
- echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
- exit 1; \
- fi
-- $(QUIETLY) if [ ! -f $(SA_CLASSPATH) ] ; then \
-- echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\
-+ $(QUIETLY) if [ ! -f $(SA_TOOLS_JAR) ] ; then \
-+ echo "Missing $(SA_TOOLS_JAR) file. Use 1.6.0 or later version of JDK";\
-+ echo ""; \
-+ exit 1; \
-+ fi
-+ $(QUIETLY) if [ ! -f $(SA_RT_JAR) ] ; then \
-+ echo "Missing $(SA_RT_JAR) file. Use 1.6.0 or later version of JDK";\
- echo ""; \
- exit 1; \
- fi
More information about the distro-pkg-dev
mailing list