Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/make/Makefile	Sat Dec 18 09:38:39 2010 -0800
     1.2 +++ b/make/Makefile	Tue Dec 21 16:29:10 2010 -0800
     1.3 @@ -187,7 +187,7 @@
     1.4  clobber: clean
     1.5  
     1.6  # All ant targets of interest
     1.7 -ANT_TARGETS = build clean sanity post-sanity diagnostics # for now
     1.8 +ANT_TARGETS = build clean sanity post-sanity diagnostics build-all-tools  # for now
     1.9  
    1.10  # Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
    1.11  $(OUTPUTDIR)/build/ant-diagnostics.log:

     2.1 --- a/make/build.xml	Sat Dec 18 09:38:39 2010 -0800
     2.2 +++ b/make/build.xml	Tue Dec 21 16:29:10 2010 -0800
     2.3 @@ -327,6 +327,7 @@
     2.4          <!-- can override the following on the command line if desired. -->
     2.5          <property name="diags.examples.out" location="${build.dir}/diag-examples/diags-examples.html"/>
     2.6          <mkdir dir="${build.dir}/diag-examples/classes"/>
     2.7 +<echo message="jj: diags-examples dist.bin.dir ${dist.bin.dir}/javac"/>
     2.8          <javac fork="true"
     2.9              executable="${dist.bin.dir}/javac"
    2.10              srcdir="test/tools/javac/diags"
    2.11 @@ -741,6 +742,7 @@
    2.12                  <pcompile srcdir="@{gensrc.dir}"
    2.13                            destdir="@{gensrc.dir}"
    2.14                            includes="**/*.properties"/>
    2.15 +<echo message="jj: -def-build-classes @java.home: @{java.home}/bin/javac"/>
    2.16                  <javac fork="true"
    2.17                         executable="@{java.home}/bin/javac"
    2.18                         srcdir="${src.classes.dir}:@{gensrc.dir}"
    2.19 @@ -808,6 +810,8 @@
    2.20  
    2.21      <target name="-def-pcompile">
    2.22          <mkdir dir="${build.toolclasses.dir}"/>
    2.23 +<echo message="jj: -def-pcompile boot.java.home ${boot.java.home}/bin/javac"/>
    2.24 +
    2.25          <javac fork="true"
    2.26                 source="${boot.javac.source}"
    2.27                 target="${boot.javac.target}"
    2.28 @@ -823,6 +827,8 @@
    2.29  
    2.30      <target name="-def-genstubs" depends="build-bootstrap-javac" if="require.import.jdk.stubs">
    2.31          <mkdir dir="${build.toolclasses.dir}"/>
    2.32 +<echo message="jj: -def-genstubs boot.java.home ${boot.java.home}/bin/javac"/>
    2.33 +
    2.34          <javac fork="true"
    2.35                 source="${boot.javac.source}"
    2.36                 target="${boot.javac.target}"

     3.1 --- a/src/share/bin/launcher.sh-template	Sat Dec 18 09:38:39 2010 -0800
     3.2 +++ b/src/share/bin/launcher.sh-template	Tue Dec 21 16:29:10 2010 -0800
     3.3 @@ -26,6 +26,12 @@
     3.4  #
     3.5  
     3.6  mydir="`dirname $0`"
     3.7 +case `uname -s` in
     3.8 +    CYGWIN*)
     3.9 +      mydir=`cygpath -m $mydir`
    3.10 +      ;;
    3.11 +esac
    3.12 +
    3.13  mylib="`dirname $mydir`"/lib
    3.14  
    3.15  # By default, put the jar file and its dependencies on the bootclasspath.