changeset 127:5ac1c2dd7687

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sun, 20 Dec 2009 19:50:00 -0800
parents 73ff7e7dbb45 b1005c504358
children 8f68f4c91d9b
files
diffstat 5 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Fri Nov 13 00:08:46 2009 -0800
+++ b/.hgignore	Sun Dec 20 19:50:00 2009 -0800
@@ -3,4 +3,4 @@
 ^drop/
 ^drop_included/
 ^webrev/
-^nbproject/private/
+/nbproject/private/
--- a/.hgtags	Fri Nov 13 00:08:46 2009 -0800
+++ b/.hgtags	Sun Dec 20 19:50:00 2009 -0800
@@ -51,3 +51,5 @@
 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74
 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75
 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76
+bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
+7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
--- a/build.properties	Fri Nov 13 00:08:46 2009 -0800
+++ b/build.properties	Sun Dec 20 19:50:00 2009 -0800
@@ -34,6 +34,10 @@
 # one of the standard user build.properties files (see build.xml)
 javac.jar=${bootstrap.dir}/lib/javac.jar
 
+# The tools.jar is needed in the classpath to compile these sources
+jdk.home=${java.home}/..
+tools.jar=${jdk.home}/lib/tools.jar
+
 # options for the <javac> tasks used to compile the tools
 javac.source = 7
 javac.target = 7
--- a/build.xml	Fri Nov 13 00:08:46 2009 -0800
+++ b/build.xml	Sun Dec 20 19:50:00 2009 -0800
@@ -113,7 +113,10 @@
     <!-- Build (compilation) of sources to class files. -->
     <target name="build"
 	    depends="init, -init-src-dirs, -build-prep">
-        <javac fork="true"
+        <javac 
+	     includeAntRuntime="false"
+	     classpath="${build.classes.dir}"
+	     fork="true"
              destdir="${build.classes.dir}"
              memoryInitialSize="${javac.memoryInitialSize}"
              memoryMaximumSize="${javac.memoryMaximumSize}"
--- a/make/Makefile	Fri Nov 13 00:08:46 2009 -0800
+++ b/make/Makefile	Sun Dec 20 19:50:00 2009 -0800
@@ -113,11 +113,13 @@
 ifdef ALT_LANGTOOLS_DIST
   ifdef ALT_BOOTDIR
     ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
+    ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
   endif
   ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
 else
   ifdef ALT_JDK_IMPORT_PATH
     ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
+    ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH)
   endif
 endif
 
@@ -141,7 +143,7 @@
 
 # Create a make target for each
 $(ANT_TARGETS):
-	cd .. && $(ANT_JAVA_HOME) $(ANT) -version
+	cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version
 	cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
 
 # Help target