/hg/icedtea: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 28 16:04:05 PDT 2009
changeset 853eaa194f9a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=853eaa194f9a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 28 22:42:45 2009 +0000
One jar to rule them all and simplify the build.
2009-10-28 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Have one jar to rule them all
(rt.jar) and make others (tools.jar, rt-closed.jar)
symlinks to it. Remove the hotspot-tools target and do all
patching, etc. prior to building rt.jar. Use zip rather
than jar to update rt.jar for efficiency.
changeset c2763f965b2d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c2763f965b2d
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Oct 28 23:07:25 2009 +0000
Check the md5sum of zips after downloading and fix the checksum for
the jaxws drop.
2009-10-28 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Fix the checksum for the jaxws drop.
Check the md5sum of newly downloaded zips.
diffstat:
2 files changed, 152 insertions(+), 164 deletions(-)
ChangeLog | 16 +++
Makefile.am | 300 ++++++++++++++++++++++++++---------------------------------
diffs (truncated from 568 to 500 lines):
diff -r 1a7fa6604936 -r c2763f965b2d ChangeLog
--- a/ChangeLog Wed Oct 28 01:09:18 2009 +0000
+++ b/ChangeLog Wed Oct 28 23:07:25 2009 +0000
@@ -1,3 +1,19 @@ 2009-10-27 Andrew John Hughes <ahughes
+2009-10-28 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Fix the checksum for the jaxws drop.
+ Check the md5sum of newly downloaded zips.
+
+2009-10-28 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Have one jar to rule them all (rt.jar)
+ and make others (tools.jar, rt-closed.jar)
+ symlinks to it. Remove the hotspot-tools
+ target and do all patching, etc. prior to
+ building rt.jar. Use zip rather than jar
+ to update rt.jar for efficiency.
+
2009-10-27 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Bump to b74.
diff -r 1a7fa6604936 -r c2763f965b2d Makefile.am
--- a/Makefile.am Wed Oct 28 01:09:18 2009 +0000
+++ b/Makefile.am Wed Oct 28 23:07:25 2009 +0000
@@ -33,7 +33,7 @@ VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642
DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip
-JAXWS_DROP_MD5SUM = debb949440c5a15ce999cfefbbc56526
+JAXWS_DROP_MD5SUM = f5010ebf636db9f465a61a7a74944543
JAF_DROP_ZIP = jdk7-jaf-2009_08_28.zip
JAF_DROP_MD5SUM = eb8cb7a4a7f14e211fbe2354878a2472
JAXP_DROP_ZIP = jdk7-jaxp-2009_09_28.zip
@@ -64,13 +64,34 @@ CORBA = openjdk/corba/src/share/classes
CORBA = openjdk/corba/src/share/classes
JAXWS = openjdk/jaxws/src/share/classes
+NETX_SRCDIR = $(abs_top_srcdir)/netx
+NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
+
OPENJDK_SOURCEPATH_DIRS = \
- $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
+ $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS):$(NETX_SRCDIR)
SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
-NETX_DIR=$(abs_top_srcdir)/netx/net/sourceforge
-NETX_RESOURCE_DIR=$(NETX_DIR)/jnlp/resources
+# Sources used from OpenJDK.
+ICEDTEA_BOOTSTRAP_DIRS = \
+ $(JDK_SHARE)/com/sun/jdi \
+ $(JDK_SHARE)/com/sun/tools/jdi \
+ $(JDK_SHARE)/com/sun/net/httpserver \
+ $(JDK_SHARE)/java/io \
+ $(JDK_SHARE)/java/security/cert \
+ $(JDK_SHARE)/java/util \
+ $(JDK_SHARE)/java/rmi \
+ $(JDK_SHARE)/javax/net/ssl \
+ $(JDK_SHARE)/javax/rmi/ssl \
+ $(JDK_SHARE)/javax/script \
+ $(JDK_SHARE)/javax/security/auth/kerberos \
+ $(JDK_SHARE)/javax/security/sasl \
+ $(JDK_SHARE)/sun/awt/ \
+ $(JDK_SHARE)/sun/rmi/rmic \
+ $(JDK_SHARE)/sun/tools/java \
+ $(JAXWS)/javax/xml/bind \
+ $(LANGTOOLS)/com/sun/mirror \
+ $(LANGTOOLS)/com/sun/tools/apt
IT_LANGUAGE_SOURCE_VERSION=5
IT_CLASS_TARGET_VERSION=5
@@ -680,13 +701,11 @@ distclean-local: clean-jtreg clean-jtreg
rm -rf stamps
rm -rf drops
rm -f rt-source-files.txt \
- hotspot-tools-source-files.txt \
extra-source-files.txt \
netx-source-files.txt
rm -rf bootstrap
rm -rf lib
rm -rf extra-lib
- rm -rf hotspot-tools
rm -rf rt/netscape
rm -rf visualvm
rm -rf netbeans
@@ -720,7 +739,7 @@ install:
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-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \
+ clean-rt $(ICEDTEAPLUGIN_CLEAN) \
$(ICEDTEANPPLUGIN_CLEAN) hotspot hotspot-helper clean-extra clean-jtreg \
clean-jtreg-reports
@@ -763,6 +782,10 @@ endif
mv drops/$(JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP).old ; \
fi ; \
$(WGET) $(DROP_URL)/$(JAXP_DROP_ZIP) -O drops/$(JAXP_DROP_ZIP); \
+ if ! echo "$(JAXP_DROP_MD5SUM) drops/$(JAXP_DROP_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of jaxp drop zip"; false; \
+ fi; \
fi ;
mkdir -p stamps
touch stamps/download-jaxp-drop.stamp
@@ -780,6 +803,10 @@ endif
mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \
fi ; \
$(WGET) $(DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
+ if ! echo "$(JAF_DROP_MD5SUM) drops/$(JAF_DROP_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of jaf drop zip"; false; \
+ fi; \
fi ;
mkdir -p stamps
touch stamps/download-jaf-drop.stamp
@@ -797,6 +824,10 @@ endif
mv drops/$(JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP).old ; \
fi ; \
$(WGET) $(DROP_URL)/$(JAXWS_DROP_ZIP) -O drops/$(JAXWS_DROP_ZIP); \
+ if ! echo "$(JAXWS_DROP_MD5SUM) drops/$(JAXWS_DROP_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of jaxws drop zip"; false; \
+ fi; \
fi ;
mkdir -p stamps
touch stamps/download-jaxws-drop.stamp
@@ -843,6 +874,10 @@ else
mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
fi ; \
$(WGET) $(OPENJDK_URL)/archive/$(OPENJDK_CHANGESET).tar.gz -O $(OPENJDK_SRC_ZIP); \
+ if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of OpenJDK root zip"; false; \
+ fi; \
fi ; \
if ! echo "$(CORBA_MD5SUM) $(CORBA_SRC_ZIP)" \
| $(MD5SUM) --check ; \
@@ -852,6 +887,10 @@ else
mv $(CORBA_SRC_ZIP) $(CORBA_SRC_ZIP).old ; \
fi ; \
$(WGET) $(CORBA_URL)/archive/$(CORBA_CHANGESET).tar.gz -O $(CORBA_SRC_ZIP); \
+ if ! echo "$(CORBA_MD5SUM) $(CORBA_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of CORBA zip"; false; \
+ fi; \
fi ; \
if ! echo "$(JAXP_MD5SUM) $(JAXP_SRC_ZIP)" \
| $(MD5SUM) --check ; \
@@ -861,6 +900,10 @@ else
mv $(JAXP_SRC_ZIP) $(JAXP_SRC_ZIP).old ; \
fi ; \
$(WGET) $(JAXP_URL)/archive/$(JAXP_CHANGESET).tar.gz -O $(JAXP_SRC_ZIP); \
+ if ! echo "$(JAXP_MD5SUM) $(JAXP_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of JAXP zip"; false; \
+ fi; \
fi ; \
if ! echo "$(JAXWS_MD5SUM) $(JAXWS_SRC_ZIP)" \
| $(MD5SUM) --check ; \
@@ -870,6 +913,10 @@ else
mv $(JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP).old ; \
fi ; \
$(WGET) $(JAXWS_URL)/archive/$(JAXWS_CHANGESET).tar.gz -O $(JAXWS_SRC_ZIP); \
+ if ! echo "$(JAXWS_MD5SUM) $(JAXWS_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of JAXWS zip"; false; \
+ fi; \
fi ; \
if ! echo "$(JDK_MD5SUM) $(JDK_SRC_ZIP)" \
| $(MD5SUM) --check ; \
@@ -879,6 +926,10 @@ else
mv $(JDK_SRC_ZIP) $(JDK_SRC_ZIP).old ; \
fi ; \
$(WGET) $(JDK_URL)/archive/$(JDK_CHANGESET).tar.gz -O $(JDK_SRC_ZIP); \
+ if ! echo "$(JDK_MD5SUM) $(JDK_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of JDK zip"; false; \
+ fi; \
fi ; \
if ! echo "$(LANGTOOLS_MD5SUM) $(LANGTOOLS_SRC_ZIP)" \
| $(MD5SUM) --check ; \
@@ -888,6 +939,10 @@ else
mv $(LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP).old ; \
fi ; \
$(WGET) $(LANGTOOLS_URL)/archive/$(LANGTOOLS_CHANGESET).tar.gz -O $(LANGTOOLS_SRC_ZIP); \
+ if ! echo "$(LANGTOOLS_MD5SUM) $(LANGTOOLS_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of langtools zip"; false; \
+ fi; \
fi ;
if ! echo "$(HS_MD5SUM) $(HOTSPOT_SRC_ZIP)" \
| $(MD5SUM) --check ; \
@@ -897,6 +952,10 @@ else
mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
fi ; \
$(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
+ if ! echo "$(HOTSPOT_MD5SUM) $(HOTSPOT_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of HotSpot zip"; false; \
+ fi; \
fi
endif
endif
@@ -919,6 +978,10 @@ else
mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
fi ; \
$(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
+ if ! echo "$(CACAO_MD5SUM) $(CACAO_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of CACAO zip"; false; \
+ fi; \
fi
endif
endif
@@ -933,7 +996,11 @@ if WITH_VISUALVM
fi ; \
$(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
-O $(NETBEANS_PROFILER_SRC_ZIP) ; \
- fi
+ if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of NetBeans profiler zip"; false; \
+ fi; \
+ fi
if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
| $(MD5SUM) --check ; \
@@ -944,7 +1011,11 @@ if WITH_VISUALVM
fi ; \
$(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) \
-O $(VISUALVM_SRC_ZIP) ; \
- fi
+ if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
+ | $(MD5SUM) --check ; \
+ then echo "ERROR: Bad download of VisualVM zip"; false; \
+ fi; \
+ fi
endif
mkdir -p stamps
touch stamps/download.stamp
@@ -1159,7 +1230,7 @@ endif
rm -f stamps/extract-cacao.stamp
# Link ports sources into tree
-stamps/ports.stamp: stamps/extract.stamp
+stamps/ports.stamp: stamps/extract-cacao.stamp
for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/* \
$(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
@@ -1179,7 +1250,7 @@ stamps/ports.stamp: stamps/extract.stamp
mkdir -p stamps
touch stamps/ports.stamp
-stamps/generated.stamp: stamps/extract-cacao.stamp
+stamps/generated.stamp: stamps/ports.stamp
if [ ! -e $(abs_top_builddir)/generated ]; then \
cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
@@ -1475,18 +1546,6 @@ stamps/bootstrap-directory-stage1.stamp:
rm -f bootstrap/boot/include/$$i; \
ln -s $(SYSTEM_JDK_DIR)/include/$$i bootstrap/boot/include/$$i; \
done; \
- if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar ; \
- then \
- mkdir -p $(abs_top_builddir)/bootstrap/boot/lib ; \
- ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \
- $(abs_top_builddir)/bootstrap/boot/lib/tools.jar ; \
- fi
- if test -f \
- $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
- then \
- cp $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- $(abs_top_builddir)/bootstrap/boot/jre/lib/rt.jar ; \
- fi
mkdir -p stamps
touch stamps/bootstrap-directory-stage1.stamp
@@ -1545,7 +1604,7 @@ clean-bootstrap-directory-symlink-stage2
# If you change anything here in the icedtea target, please make sure
# you change it in the icedtea-debug target as well.
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
- stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
+ stamps/ports.stamp stamps/overlay.stamp \
$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \
stamps/cacao.stamp stamps/netx-dist.stamp stamps/liveconnect.stamp \
stamps/pulse-java.stamp
@@ -1711,9 +1770,8 @@ icedtea-debug-stage2: \
# ===================
stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
- stamps/hotspot-tools.stamp stamps/plugs.stamp stamps/netx-dist.stamp \
- stamps/liveconnect.stamp stamps/ports.stamp stamps/patch-boot.stamp \
- stamps/cacao.stamp
+ stamps/plugs.stamp stamps/netx-dist.stamp stamps/liveconnect.stamp \
+ stamps/ports.stamp stamps/patch-boot.stamp stamps/cacao.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_BOOT) \
-C openjdk-boot \
@@ -1735,8 +1793,7 @@ hotspot:
@echo "Hotspot is served:" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
hotspot-helper: stamps/bootstrap-directory-symlink-stage1.stamp \
- stamps/hotspot-tools.stamp stamps/plugs.stamp \
- stamps/ports.stamp stamps/patch-boot.stamp
+ stamps/plugs.stamp stamps/ports.stamp stamps/patch-boot.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_BOOT) \
-C openjdk-boot hotspot
@@ -1831,7 +1888,7 @@ clean-IcedTeaPlugin:
rm -f IcedTeaPlugin.so
endif
-stamps/liveconnect.stamp: stamps/hotspot-tools.stamp
+stamps/liveconnect.stamp: stamps/rt-class-files.stamp
if test "x${LIVECONNECT_DIR}" != x; then \
$(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar $(LIVECONNECT_DIR) ; \
fi
@@ -1845,14 +1902,14 @@ stamps/liveconnect.stamp: stamps/hotspot
# a patch applied to sun.plugin.AppletViewerPanel and generated sources
netx-source-files.txt:
- find $(abs_top_srcdir)/netx -name '*.java' | sort > $@
-
-stamps/netx.stamp: netx-source-files.txt stamps/hotspot-tools.stamp
+ find $(NETX_SRCDIR) -name '*.java' | sort > $@
+
+stamps/netx.stamp: netx-source-files.txt stamps/rt-class-files.stamp
mkdir -p $(abs_top_builddir)/netx.build
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \
-d $(abs_top_builddir)/netx.build \
- -classpath $(abs_top_builddir)/lib/hotspot-tools \
- -sourcepath $(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS): \
+ -classpath $(abs_top_builddir)/lib/rt \
+ -sourcepath $(SOURCEPATH_DIRS) \
-bootclasspath \'\' \
@netx-source-files.txt ;
mkdir -p stamps
@@ -1862,7 +1919,7 @@ stamps/netx-dist.stamp: stamps/netx.stam
(cd $(abs_top_builddir)/netx.build ; \
mkdir -p lib ; \
$(ICEDTEA_BOOT_DIR)/bin/jar cf lib/classes.jar javax/jnlp net ; \
- cp -a $(abs_top_srcdir)/netx src; \
+ cp -a $(NETX_SRCDIR) src; \
find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \
cd src ; \
$(ICEDTEA_BOOT_DIR)/bin/jar uf $(abs_top_builddir)/netx.build/lib/classes.jar \
@@ -1877,7 +1934,7 @@ stamps/extra-class-files.stamp: extra-so
stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp
mkdir -p extra-lib
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) -d extra-lib \
- -classpath $(abs_top_builddir)/lib/hotspot-tools \
+ -classpath $(abs_top_builddir)/lib/rt \
-sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \
-bootclasspath \'\' \
@extra-source-files.txt ; \
@@ -2038,7 +2095,7 @@ clean-nbplatform:
# CACAO
-stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp
+stamps/cacao.stamp: stamps/rt-class-files.stamp
if BUILD_CACAO
if !USE_SYSTEM_CACAO
cd cacao/cacao && \
@@ -2275,140 +2332,61 @@ jtregcheck: jtreg check-hotspot check-la
# Support classes for non-OpenJDK bootstraps
-stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
- mkdir -p stamps
- touch stamps/plugs.stamp
-
-stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/lib/tools.jar
- mkdir -p stamps
- touch stamps/hotspot-tools.stamp
-
-clean-plugs: clean-plugs clean-rt
- rm -f stamps/plugs.stamp
- rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
-
-clean-tools-jar: clean-hotspot-tools
- rm -f stamps/hotspot-tools.stamp
- rm -f bootstrap/jdk1.7.0/lib/tools.jar
-
-# Sources used from OpenJDK.
-ICEDTEA_BOOTSTRAP_DIRS = \
- $(JDK_SHARE)/com/sun/jdi \
- $(JDK_SHARE)/com/sun/tools/jdi \
- $(JDK_SHARE)/com/sun/net/httpserver \
- $(JDK_SHARE)/java/io \
- $(JDK_SHARE)/java/security/cert \
- $(JDK_SHARE)/java/util \
- $(JDK_SHARE)/java/rmi \
- $(JDK_SHARE)/javax/net/ssl \
- $(JDK_SHARE)/javax/rmi/ssl \
- $(JDK_SHARE)/javax/script \
- $(JDK_SHARE)/javax/security/auth/kerberos \
- $(JDK_SHARE)/javax/security/sasl \
- $(JDK_SHARE)/sun/awt/ \
- $(JAXWS)/javax/xml/bind
-
-# tools.jar class files.
-stamps/hotspot-tools-copy-source-files.stamp: stamps/overlay.stamp
- 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 $(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 $(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 $(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/* \
- hotspot-tools/$$copy_dir ; \
- done
- mkdir -p stamps
- touch stamps/hotspot-tools-copy-source-files.stamp
-
-hotspot-tools-source-files.txt: stamps/generated.stamp \
- stamps/hotspot-tools-copy-source-files.stamp
- find hotspot-tools -name '*.java' | sort > $@
- mkdir -p lib/hotspot-tools
-
-stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \
- $(INITIAL_BOOTSTRAP_LINK_STAMP)
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \
- -d lib/hotspot-tools \
- -sourcepath \
- 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \
- -bootclasspath \'\' @$< ;
- mkdir -p stamps
- touch stamps/hotspot-tools-class-files.stamp
-
-clean-hotspot-tools:
- rm -rf lib/hotspot-tools
- rm -f stamps/hotspot-tools-class-files.stamp
- rm -f hotspot-tools-source-files.txt
- rm -f stamps/hotspot-tools-copy-source-files.stamp
-
-# tools.jar
-bootstrap/jdk1.7.0/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
- mkdir -p bootstrap/jdk1.7.0/lib/
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com \
- -C lib/hotspot-tools sun \
- -C lib/hotspot-tools org -C lib/hotspot-tools java \
- -C lib/hotspot-tools javax ;
- if test -d bootstrap/boot ; \
- then \
- mkdir -p bootstrap/boot/lib/; \
- ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/lib/tools.jar \
- $(abs_top_builddir)/bootstrap/boot/lib/tools.jar; \
- fi
-
-# rt-closed.jar class files.
-rt-source-files.txt: stamps/extract.stamp
- find $(abs_top_builddir)/rt -name '*.java' \
+rt-source-files.txt: stamps/overlay.stamp
+ $(FIND) $(abs_top_builddir)/rt -name '*.java' \
| sort -u > $@
for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \
do \
- find $(abs_top_builddir)/$$dir -name '*.java' >> $@; \
+ $(FIND) $(abs_top_builddir)/$$dir -name '*.java' >> $@; \
done
-stamps/rt-class-files.stamp: rt-source-files.txt stamps/hotspot-tools.stamp
+stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
mkdir -p lib/rt
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) -d lib/rt \
- -classpath $(abs_top_builddir)/lib/hotspot-tools \
-sourcepath '$(SOURCEPATH_DIRS)' \
- -bootclasspath \'\' @$< ;
+ -bootclasspath \'\' @rt-source-files.txt ;
mkdir -p stamps
touch stamps/rt-class-files.stamp
+
+stamps/rt.stamp: stamps/rt-class-files.stamp
+ (cd lib/rt ; \
+ $(ZIP) -qur $(abs_top_builddir)/bootstrap/boot/jre/lib/rt.jar \
+ com java javax sun );
+ mkdir -p stamps
More information about the distro-pkg-dev
mailing list