Mercurial > jdk8-mips64-public > jaxws / changeset

     1.1 --- a/build.properties	Thu Nov 12 15:35:47 2009 -0800
     1.2 +++ b/build.properties	Tue Nov 17 10:23:50 2009 -0800
     1.3 @@ -34,6 +34,10 @@
     1.4  # one of the standard user build.properties files (see build.xml)
     1.5  javac.jar=${bootstrap.dir}/lib/javac.jar
     1.6  
     1.7 +# The tools.jar is needed in the classpath to compile these sources
     1.8 +jdk.home=${java.home}/..
     1.9 +tools.jar=${jdk.home}/lib/tools.jar
    1.10 +
    1.11  # options for the <javac> tasks used to compile the tools
    1.12  javac.source = 7
    1.13  javac.target = 7

     2.1 --- a/build.xml	Thu Nov 12 15:35:47 2009 -0800
     2.2 +++ b/build.xml	Tue Nov 17 10:23:50 2009 -0800
     2.3 @@ -113,7 +113,10 @@
     2.4      <!-- Build (compilation) of sources to class files. -->
     2.5      <target name="build"
     2.6  	    depends="init, -init-src-dirs, -build-prep">
     2.7 -        <javac fork="true"
     2.8 +        <javac 
     2.9 +	     includeAntRuntime="false" 
    2.10 +	     classpath="${build.classes.dir}:${tools.jar}"
    2.11 +	     fork="true"
    2.12               destdir="${build.classes.dir}"
    2.13               memoryInitialSize="${javac.memoryInitialSize}"
    2.14               memoryMaximumSize="${javac.memoryMaximumSize}"

     3.1 --- a/make/Makefile	Thu Nov 12 15:35:47 2009 -0800
     3.2 +++ b/make/Makefile	Tue Nov 17 10:23:50 2009 -0800
     3.3 @@ -113,11 +113,13 @@
     3.4  ifdef ALT_LANGTOOLS_DIST
     3.5    ifdef ALT_BOOTDIR
     3.6      ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
     3.7 +    ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
     3.8    endif
     3.9    ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
    3.10  else
    3.11    ifdef ALT_JDK_IMPORT_PATH
    3.12      ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
    3.13 +    ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH)
    3.14    endif
    3.15  endif
    3.16  
    3.17 @@ -141,7 +143,7 @@
    3.18  
    3.19  # Create a make target for each
    3.20  $(ANT_TARGETS):
    3.21 -	cd .. && $(ANT_JAVA_HOME) $(ANT) -version
    3.22 +	cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version
    3.23  	cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
    3.24  
    3.25  # Help target