Merging jdk7-b75 into Jigsaw

[Mark Reinhold]

> Date: Tue, 10 Nov 2009 14:05:48 -0800
> From: kelly.ohair at sun.com

> Could be painful ant bite #3 in my list:
>   http://blogs.sun.com/kto/entry/painful_ant_bite_a_generous
> 
> We need to explicitly exclude the Ant runtime classpath entries
> and be explicit about everything on the classpath:
> 
>   <javac> uses to <javac includeAntRuntime="false">
> 
> I will look at the jaxws and jaxp ant scripts and see if the fix is
> simple.

If I set includeAntRuntime="false" then even the pure M5 build fails.
For some bizarre reason ant adds tools.jar to its runtime classpath in
my M5 build, but not in my Jigsaw+M5 build.

The attached patch allows both builds to finish successfully.

- Mark

--

diff --git a/build.properties b/build.properties
--- a/build.properties
+++ b/build.properties
@@ -34,6 +34,9 @@
 # one of the standard user build.properties files (see build.xml)
 javac.jar=${bootstrap.dir}/lib/javac.jar
 
+# jaxws needs tools.jar too, for the old com.sun.mirror (APT) API
+tools.jar=${java.home}/../lib/tools.jar
+
 # options for the <javac> tasks used to compile the tools
 javac.source = 7
 javac.target = 7
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -108,6 +108,8 @@
 	    depends="init, -init-src-dirs, -build-prep">
         <javac fork="true"
              destdir="${build.classes.dir}"
+             includeAntRuntime="false"
+             classpath="${build.classes.dir}:${tools.jar}"
              memoryInitialSize="${javac.memoryInitialSize}"
              memoryMaximumSize="${javac.memoryMaximumSize}"
              source="${javac.source}"