changeset 1921:a47b53c08a6a

Remove hotspot-tools build to simplify bootstrapping. Explicitly create the destination directory for the class rewriter. 2010-02-17 Andrew John Hughes <ahughes@redhat.com> Drop hotspot-tools targets to simplify bootstrapping OpenJDK. * Makefile.am: Add additional OPENJDK_BOOTSTRAP_DIRS to compensate for the removal of the hotspot-tools classes. Add OPENJDK_TREE variable as a pseudo-target for targets that require a patched OpenJDK tree with Zero, Shark and any overlays. Remove hotspot-tools aliases. Remove tools-copy from EXTRA_DIST. (distclean-local): No more need to remove hotspot-tools and hotspot-tools-source-files.txt. (extract-ecj.stamp): Depend on OPENJDK_TREE. (bootstrap-directory-ecj.stamp): Always create the ecj tools.jar as a symlink to rt.jar to appease the HotSpot build. (icedtea.stamp): Use OPENJDK_TREE in place of patch, overlay and ports (it implies all three). (icedtea-debug.stamp): Likewise. (icedtea-ecj.stamp): Likewise. (hotspot-helper): Drop hotspot-tools dependency. (rewriter.stamp): Explicitly create destination directory as Sun's javac doesn't. (cacao.stamp): Depend on OPENJDK_TREE. (hotspot-tools-copy-source-files.stamp): Removed. (hotspot-tools-source-files.txt): Removed. (hotspot-tools-class-files.stamp): Removed. (clean-hotspot-tools): Removed. (hotspot-tools.stamp): Removed. (rt-source-files.txt): Depend on OPENJDK_TREE. (rt.stamp): Simplify use of jar. (bootstrap/jdk1.7.0/jre/lib/tools.jar): Create symlink rather than a separate jar file. (clean-tools-jar): Remove hotspot-tools stuff. (plugs.stamp): Depend on tools.jar * tools-copy/tools-corba-copy-files.txt, * tools-copy/tools-jaxws-copy-files.txt, * tools-copy/tools-jdk-copy-files.txt, * tools-copy/tools-langtools-copy-files.txt: Removed.
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 18 Feb 2010 22:02:18 +0000
parents d45442addd83
children c597699b4fa6
files ChangeLog Makefile.am tools-copy/tools-corba-copy-files.txt tools-copy/tools-jaxws-copy-files.txt tools-copy/tools-jdk-copy-files.txt tools-copy/tools-langtools-copy-files.txt
diffstat 6 files changed, 88 insertions(+), 317 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Feb 18 19:31:00 2010 +0000
+++ b/ChangeLog	Thu Feb 18 22:02:18 2010 +0000
@@ -1,3 +1,46 @@
+2010-02-17 Andrew John Hughes  <ahughes@redhat.com>
+
+	Drop hotspot-tools targets to simplify
+	bootstrapping OpenJDK.
+	* Makefile.am:
+	Add additional OPENJDK_BOOTSTRAP_DIRS
+	to compensate for the removal of the
+	hotspot-tools classes.  Add OPENJDK_TREE
+	variable as a pseudo-target for targets
+	that require a patched OpenJDK tree with
+	Zero, Shark and any overlays.  Remove hotspot-tools
+	aliases.  Remove tools-copy from EXTRA_DIST.
+	(distclean-local): No more need to remove hotspot-tools
+	and hotspot-tools-source-files.txt.
+	(extract-ecj.stamp): Depend on OPENJDK_TREE.
+	(bootstrap-directory-ecj.stamp): Always create
+	the ecj tools.jar as a symlink to rt.jar to
+	appease the HotSpot build.
+	(icedtea.stamp): Use OPENJDK_TREE in place of
+	patch, overlay and ports (it implies all three).
+	(icedtea-debug.stamp): Likewise.
+	(icedtea-ecj.stamp): Likewise.
+	(hotspot-helper): Drop hotspot-tools dependency.
+	(rewriter.stamp): Explicitly create destination
+	directory as Sun's javac doesn't.
+	(cacao.stamp): Depend on OPENJDK_TREE.
+	(hotspot-tools-copy-source-files.stamp): Removed.
+	(hotspot-tools-source-files.txt): Removed.
+	(hotspot-tools-class-files.stamp): Removed.
+	(clean-hotspot-tools): Removed.
+	(hotspot-tools.stamp): Removed.
+	(rt-source-files.txt): Depend on OPENJDK_TREE.
+	(rt.stamp): Simplify use of jar.
+	(bootstrap/jdk1.7.0/jre/lib/tools.jar): Create symlink
+	rather than a separate jar file.
+	(clean-tools-jar): Remove hotspot-tools stuff.
+	(plugs.stamp): Depend on tools.jar
+	* tools-copy/tools-corba-copy-files.txt,
+	* tools-copy/tools-jaxws-copy-files.txt,
+	* tools-copy/tools-jdk-copy-files.txt,
+	* tools-copy/tools-langtools-copy-files.txt:
+	Removed.
+
 2010-02-17 Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Thu Feb 18 19:31:00 2010 +0000
+++ b/Makefile.am	Thu Feb 18 22:02:18 2010 +0000
@@ -82,10 +82,14 @@
 	$(SHARE)/java/rmi \
 	$(SHARE)/sun/awt/ \
 	$(SHARE)/sun/nio/cs \
+	$(SHARE)/sun/rmi/rmic \
+	$(SHARE)/sun/tools/java \
 	$(SHARE)/javax/net/ssl \
 	$(SHARE)/javax/script \
 	$(SHARE)/javax/security/auth/kerberos \
-	$(SHARE)/javax/security/sasl
+	$(SHARE)/javax/security/sasl \
+	$(LANGTOOLS)/com/sun/mirror \
+	$(LANGTOOLS)/com/sun/tools/apt
 
 ICEDTEA_BOOTSTRAP_CLASSES = \
 	$(SHARE)/sun/misc/Unsafe.java
@@ -208,6 +212,10 @@
   INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
 endif
 
+# Target to ensure a patched OpenJDK tree containing Zero & Shark
+# and any overlays is available in $(abs_top_builddir)/openjdk
+OPENJDK_TREE = stamps/overlay.stamp
+
 # Sources list
 
 PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
@@ -577,7 +585,7 @@
 
 EXTRA_DIST = rt generated \
 	$(abs_top_srcdir)/patches/* \
-	tools-copy contrib ports \
+	contrib ports \
 	extra overlays \
 	javaws.png javaws.desktop visualvm.desktop \
 	jconsole.desktop policytool.desktop \
@@ -605,14 +613,12 @@
 distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java 
 	rm -rf stamps
 	rm -f rt-source-files.txt \
-	  hotspot-tools-source-files.txt \
 	  extra-source-files.txt
 	rm -rf bootstrap
 	rm -rf lib
 	rm -rf extra-lib
 	rm -rf openjdk-ecj
 	rm -rf openjdk
-	rm -rf hotspot-tools
 	rm -rf rt/netscape
 	rm -rf visualvm
 	rm -rf netbeans
@@ -643,7 +649,7 @@
 	clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
 	clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
 	clean-tools-jar clean-visualvm clean-nbplatform \
-	clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \
+	clean-copy clean-rt $(ICEDTEAPLUGIN_CLEAN) \
 	$(ICEDTEANPPLUGIN_CLEAN) hotspot hotspot-helper clean-extra clean-jtreg \
 	clean-jtreg-reports 
 
@@ -1141,7 +1147,7 @@
 
 # Copy over OpenJDK sources for ecj.
 # FIXME (missing): Rename to clone-ecj.
-stamps/extract-ecj.stamp: stamps/overlay.stamp
+stamps/extract-ecj.stamp: $(OPENJDK_TREE)
 	if ! test -d openjdk-ecj ; then \
 	    cp -pPRl openjdk openjdk-ecj ; \
 	fi
@@ -1246,14 +1252,12 @@
 	  rm -f bootstrap/ecj/include/$$i; \
 	  ln -s $(SYSTEM_JDK_DIR)/include/$$i bootstrap/ecj/include/$$i; \
 	done; \
-	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
-	then \
-	  mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
-	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
-	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar ; \
-	fi
 	cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
 	  $(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar;
+# For HotSpot
+	mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
+	ln -sf $(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar \
+	  $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar ; \
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
 
@@ -1313,11 +1317,9 @@
 # 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.stamp \
-	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
-	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
-	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
-	stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
+	stamps/plugs.stamp $(OPENJDK_TREE) $(ICEDTEAPLUGIN_TARGET) \
+	$(ICEDTEANPPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
+	stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
@@ -1416,11 +1418,9 @@
 	touch stamps/icedtea.stamp
 
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
-	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
-	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
-	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
-	stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
+	stamps/plugs.stamp $(OPENJDK_TREE) $(ICEDTEAPLUGIN_TARGET) \
+	$(ICEDTEANPPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
+	stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
@@ -1545,8 +1545,8 @@
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
-	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/patch-ecj.stamp stamps/cacao.stamp stamps/rewrite-rhino.stamp
+	stamps/plugs.stamp stamps/patch-ecj.stamp stamps/cacao.stamp \
+	stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/ \
@@ -1568,8 +1568,7 @@
 	@echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
 
 hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
-	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/patch-ecj.stamp
+	stamps/plugs.stamp stamps/patch-ecj.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/ hotspot
@@ -1782,6 +1781,7 @@
 
 stamps/rewriter.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
 if WITH_RHINO
+	mkdir -p $(abs_top_builddir)/rewriter
 	(cd $(abs_top_srcdir)/rewriter ; \
 	 $(ICEDTEA_BOOT_DIR)/bin/javac -g \
 	 -d $(abs_top_builddir)/rewriter $(REWRITER_SRCS) \
@@ -1865,7 +1865,7 @@
 
 # CACAO
 
-stamps/cacao.stamp: stamps/replace-hotspot.stamp stamps/rt-class-files.stamp
+stamps/cacao.stamp: $(OPENJDK_TREE) stamps/rt-class-files.stamp
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
 	cd cacao/cacao && \
@@ -2126,69 +2126,8 @@
 
 # Support classes for non-OpenJDK bootstraps
 
-# FIXME (plugs): Remove this
-# 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
-
-	mkdir -p stamps
-	touch stamps/hotspot-tools-copy-source-files.stamp
-
-# FIXME (plugs): Remove this
-hotspot-tools-source-files.txt: stamps/replace-hotspot.stamp \
-	stamps/hotspot-tools-copy-source-files.stamp
-	find hotspot-tools -name '*.java' | sort > $@
-	mkdir -p lib/hotspot-tools
-
-# FIXME (plugs): Remove this
-stamps/hotspot-tools-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) \
-  hotspot-tools-source-files.txt
-	$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
-	  -d lib/hotspot-tools \
-	  -source 1.5 \
-	  -sourcepath \
-	    'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
-	  -classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
-	  -bootclasspath \'\' @hotspot-tools-source-files.txt ;
-	mkdir -p stamps
-	touch stamps/hotspot-tools-class-files.stamp
-
-# FIXME (plugs): Remove this
-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
-
-# FIXME (plugs): Remove this
-stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/jre/lib/tools.jar
-	mkdir -p stamps
-	touch stamps/hotspot-tools.stamp
-
 # rt.jar additional class files.
-rt-source-files.txt: stamps/replace-hotspot.stamp 
+rt-source-files.txt: $(OPENJDK_TREE)
 	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt $(LIVECONNECT_SRCS) -name '*.java' \
 	  | sort -u > $@
 	for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \
@@ -2219,13 +2158,19 @@
 	rm -f stamps/rt.stamp
 	rm -f rt-source-files.txt
 
+stamps/rt.stamp: stamps/rt-class-files.stamp \
+ stamps/bootstrap-directory-ecj.stamp
+	mkdir -p stamps
+if LACKS_SUN_AWT_TOOLKIT
+	$(ICEDTEA_BOOT_DIR)/bin/jar uf $(ICEDTEA_RT) -C lib/rt com -C lib/rt java \
+	  -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ;
+endif
+	touch stamps/rt.stamp
+
 # tools.jar
-bootstrap/jdk1.7.0/jre/lib/tools.jar: $(INITIAL_BOOTSTRAP_LINK_STAMP) \
-  stamps/hotspot-tools-class-files.stamp
+bootstrap/jdk1.7.0/jre/lib/tools.jar: 
 	mkdir -p bootstrap/jdk1.7.0/jre/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 ;
+	ln -sf $(ICEDTEA_RT) $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
@@ -2233,28 +2178,14 @@
 	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
 
-clean-tools-jar: clean-hotspot-tools
-	rm -f stamps/hotspot-tools.stamp
-	rm -rf tools/
+clean-tools-jar: 
 	rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
+	if test -d bootstrap/ecj/lib ; then \
+	  rm -f $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
+	fi
 
-stamps/rt.stamp: stamps/rt-class-files.stamp \
- stamps/bootstrap-directory-ecj.stamp
-	mkdir -p stamps
-if LACKS_SUN_AWT_TOOLKIT
-	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
-	then \
-	  $(JAR) uf $(ICEDTEA_RT) -C lib/rt com -C lib/rt java \
-	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ; \
-	else \
-	  $(ICEDTEA_BOOT_DIR)/bin/jar uf $(ICEDTEA_RT) -C lib/rt com -C lib/rt java \
-	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ; \
-	fi
-endif
-	touch stamps/rt.stamp
-
-stamps/plugs.stamp: stamps/rt.stamp
-	mkdir -p bootstrap/jdk1.7.0/jre/lib
+# rt-closed.jar
+stamps/plugs.stamp: stamps/rt.stamp bootstrap/jdk1.7.0/jre/lib/tools.jar
 	$(ICEDTEA_BOOT_DIR)/bin/jar cf $(ICEDTEA_PLUGS) \
 	  -C lib/rt com/sun/jmx/snmp $(LIVECONNECT_DIR) \
 	  -C lib/rt net -C lib/rt javax/jnlp ;
@@ -2327,12 +2258,6 @@
 
 replace-hotspot: stamps/replace-hotspot.stamp
 
-hotspot-tools-class-files: stamps/hotspot-tools-class-files.stamp
-
-hotspot-tools-copy-source-files: stamps/hotspot-tools-copy-source-files.stamp
-
-hotspot-tools: stamps/hotspot-tools.stamp
-
 hotspot-ports: stamps/ports.stamp
 
 clean: distclean-local
--- a/tools-copy/tools-corba-copy-files.txt	Thu Feb 18 19:31:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-sun/rmi/rmic/iiop/
-com/sun/tools/corba/se/idl/som/
-com/sun/tools/corba/se/idl/som/idlemit/
-com/sun/tools/corba/se/idl/som/cff/
-com/sun/tools/corba/se/idl/toJavaPortable/
-com/sun/tools/corba/se/idl/constExpr/
--- a/tools-copy/tools-jaxws-copy-files.txt	Thu Feb 18 19:31:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-com/sun/tools/internal/xjc/
-com/sun/tools/internal/xjc/generator/
-com/sun/tools/internal/xjc/generator/bean/
-com/sun/tools/internal/xjc/generator/bean/field/
-com/sun/tools/internal/xjc/generator/util/
-com/sun/tools/internal/xjc/generator/annotation/
-com/sun/tools/internal/xjc/generator/annotation/ri/
-com/sun/tools/internal/xjc/generator/annotation/spec/
-com/sun/tools/internal/xjc/addon/
-com/sun/tools/internal/xjc/addon/at_generated/
-com/sun/tools/internal/xjc/addon/code_injector/
-com/sun/tools/internal/xjc/addon/locator/
-com/sun/tools/internal/xjc/addon/sync/
-com/sun/tools/internal/xjc/reader/
-com/sun/tools/internal/xjc/reader/gbind/
-com/sun/tools/internal/xjc/reader/xmlschema/
-com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/
-com/sun/tools/internal/xjc/reader/xmlschema/parser/
-com/sun/tools/internal/xjc/reader/xmlschema/ct/
-com/sun/tools/internal/xjc/reader/internalizer/
-com/sun/tools/internal/xjc/reader/relaxng/
-com/sun/tools/internal/xjc/reader/dtd/
-com/sun/tools/internal/xjc/reader/dtd/bindinfo/
-com/sun/tools/internal/xjc/runtime/
-com/sun/tools/internal/xjc/util/
-com/sun/tools/internal/xjc/outline/
-com/sun/tools/internal/xjc/api/
-com/sun/tools/internal/xjc/api/impl/
-com/sun/tools/internal/xjc/api/impl/s2j/
-com/sun/tools/internal/xjc/api/impl/j2s/
-com/sun/tools/internal/xjc/api/util/
-com/sun/tools/internal/xjc/model/
-com/sun/tools/internal/xjc/model/nav/
-com/sun/tools/internal/xjc/writer/
-com/sun/tools/internal/ws/
-com/sun/tools/internal/ws/spi/
-com/sun/tools/internal/ws/resources/
-com/sun/tools/internal/ws/wscompile/
-com/sun/tools/internal/ws/util/
-com/sun/tools/internal/ws/util/xml/
-com/sun/tools/internal/ws/wsdl/
-com/sun/tools/internal/ws/wsdl/document/
-com/sun/tools/internal/ws/wsdl/document/schema/
-com/sun/tools/internal/ws/wsdl/document/mime/
-com/sun/tools/internal/ws/wsdl/document/http/
-com/sun/tools/internal/ws/wsdl/document/soap/
-com/sun/tools/internal/ws/wsdl/document/jaxws/
-com/sun/tools/internal/ws/wsdl/parser/
-com/sun/tools/internal/ws/wsdl/framework/
-com/sun/tools/internal/ws/processor/
-com/sun/tools/internal/ws/processor/generator/
-com/sun/tools/internal/ws/processor/modeler/
-com/sun/tools/internal/ws/processor/modeler/wsdl/
-com/sun/tools/internal/ws/processor/modeler/annotation/
-com/sun/tools/internal/ws/processor/util/
-com/sun/tools/internal/ws/processor/model/
-com/sun/tools/internal/ws/processor/model/jaxb/
-com/sun/tools/internal/ws/processor/model/java/
-com/sun/tools/internal/ws/processor/model/exporter/
-com/sun/istack/internal/tools/
-com/sun/istack/internal/ws/
-com/sun/codemodel/
-com/sun/codemodel/internal/
-com/sun/codemodel/internal/fmt/
-com/sun/codemodel/internal/util/
-com/sun/codemodel/internal/writer/
-com/sun/tools/internal/jxc/
-com/sun/tools/internal/jxc/apt/
-com/sun/tools/internal/jxc/gen/
-com/sun/tools/internal/jxc/gen/config/
-com/sun/tools/internal/jxc/model/
-com/sun/tools/internal/jxc/model/nav/
-com/sun/xml/internal/rngom/
-com/sun/xml/internal/rngom/nc/
-com/sun/xml/internal/rngom/parse/
-com/sun/xml/internal/rngom/parse/compact/
-com/sun/xml/internal/rngom/parse/xml/
-com/sun/xml/internal/rngom/parse/host/
-com/sun/xml/internal/rngom/ast/
-com/sun/xml/internal/rngom/ast/om/
-com/sun/xml/internal/rngom/ast/util/
-com/sun/xml/internal/rngom/ast/builder/
-com/sun/xml/internal/rngom/xml/
-com/sun/xml/internal/rngom/xml/sax/
-com/sun/xml/internal/rngom/xml/util/
-com/sun/xml/internal/rngom/dt/
-com/sun/xml/internal/rngom/dt/builtin/
-com/sun/xml/internal/rngom/digested/
-com/sun/xml/internal/rngom/util/
-com/sun/xml/internal/rngom/binary/
-com/sun/xml/internal/rngom/binary/visitor/
-com/sun/xml/internal/xsom/
-com/sun/xml/internal/xsom/impl/
-com/sun/xml/internal/xsom/impl/parser/
-com/sun/xml/internal/xsom/impl/parser/state/
-com/sun/xml/internal/xsom/impl/util/
-com/sun/xml/internal/xsom/visitor/
-com/sun/xml/internal/xsom/parser/
-com/sun/xml/internal/xsom/util/
-com/sun/xml/internal/dtdparser/
-com/sun/xml/internal/dtdparser/resources/
--- a/tools-copy/tools-jdk-copy-files.txt	Thu Feb 18 19:31:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-com/sun/jarsigner/
-com/sun/jdi/
-com/sun/jdi/connect/
-com/sun/jdi/request/
-com/sun/tools/attach/
-com/sun/tools/example/debug/expr/
-com/sun/tools/example/debug/tty/
-com/sun/tools/extcheck/
-com/sun/tools/script/shell/
-org/relaxng/datatype/
-org/relaxng/datatype/helpers/
-sun/applet/
-sun/applet/resources/
-sun/jvmstat/monitor/
-sun/jvmstat/monitor/remote/
-sun/jvmstat/perfdata/monitor/
-sun/jvmstat/perfdata/monitor/protocol/file/
-sun/jvmstat/perfdata/monitor/protocol/local/
-sun/jvmstat/perfdata/monitor/protocol/rmi/
-sun/jvmstat/perfdata/monitor/v1_0/
-sun/jvmstat/perfdata/monitor/v2_0/
-sun/rmi/rmic/
-sun/rmi/rmic/newrmic/
-sun/rmi/rmic/newrmic/jrmp/
-sun/tools/asm/
-sun/tools/attach/
-sun/tools/jar/
-sun/tools/java/
-sun/tools/javac/
-sun/tools/jinfo/
-sun/tools/jmap/
-sun/tools/jps/
-sun/tools/jstack/
-sun/tools/jstat/
-sun/tools/jstatd/
-sun/tools/native2ascii/
-sun/tools/serialver/
-sun/tools/tree/
-sun/tools/util/
--- a/tools-copy/tools-langtools-copy-files.txt	Thu Feb 18 19:31:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-sun/tools/javap/
-com/sun/javadoc/
-com/sun/tools/javadoc/
-com/sun/tools/javadoc/resources/
-com/sun/mirror/
-com/sun/mirror/declaration/
-com/sun/mirror/apt/
-com/sun/mirror/util/
-com/sun/mirror/type/
-com/sun/source/
-com/sun/source/util/
-com/sun/source/tree/
-com/sun/tools/doclets/
-com/sun/tools/doclets/formats/
-com/sun/tools/doclets/formats/html/
-com/sun/tools/doclets/formats/html/resources/
-com/sun/tools/doclets/formats/html/markup/
-com/sun/tools/doclets/standard/
-com/sun/tools/doclets/internal/
-com/sun/tools/doclets/internal/toolkit/
-com/sun/tools/doclets/internal/toolkit/resources/
-com/sun/tools/doclets/internal/toolkit/taglets/
-com/sun/tools/doclets/internal/toolkit/util/
-com/sun/tools/doclets/internal/toolkit/util/links/
-com/sun/tools/doclets/internal/toolkit/builders/
-com/sun/tools/javac/
-com/sun/tools/javac/zip/
-com/sun/tools/javac/sym/
-com/sun/tools/javac/comp/
-com/sun/tools/javac/resources/
-com/sun/tools/javac/jvm/
-com/sun/tools/javac/processing/
-com/sun/tools/javac/parser/
-com/sun/tools/javac/util/
-com/sun/tools/javac/main/
-com/sun/tools/javac/api/
-com/sun/tools/javac/model/
-com/sun/tools/javac/code/
-com/sun/tools/javac/tree/
-com/sun/tools/apt/
-com/sun/tools/apt/comp/
-com/sun/tools/apt/resources/
-com/sun/tools/apt/mirror/
-com/sun/tools/apt/mirror/declaration/
-com/sun/tools/apt/mirror/apt/
-com/sun/tools/apt/mirror/util/
-com/sun/tools/apt/mirror/type/
-com/sun/tools/apt/util/
-com/sun/tools/apt/main/
-com/sun/tools/javah/
-com/sun/tools/javah/resources/