Mercurial > jdk8-mips64-public > jaxws / changeset

     1.1 --- a/build.properties	Fri Oct 23 11:06:56 2009 -0700
     1.2 +++ b/build.properties	Thu Nov 05 00:02:38 2009 +0000
     1.3 @@ -25,7 +25,7 @@
     1.4  
     1.5  # Base locations where bundles are located
     1.6  slashjava=/java
     1.7 -devtools=${slashjava}/devtools
     1.8 +drops.dir=${slashjava}/devtools/share/jdk7-drops
     1.9  
    1.10  # This is the JDK used to build and run the bootstrap version of javac.
    1.11  # The bootstrap javac is used to compile both boostrap versions of the
    1.12 @@ -97,6 +97,7 @@
    1.13    build.dir=${build.dir}${line.separator}\
    1.14    dist.dir=${dist.dir}${line.separator}\
    1.15    drop.dir=${drop.dir}${line.separator}\
    1.16 +  drops.dir=${drops.dir}${line.separator}\
    1.17  ${line.separator}
    1.18  
    1.19  #------------------------------------------------------------

     2.1 --- a/jaxws.properties	Fri Oct 23 11:06:56 2009 -0700
     2.2 +++ b/jaxws.properties	Thu Nov 05 00:02:38 2009 +0000
     2.3 @@ -23,7 +23,7 @@
     2.4  # have any questions.
     2.5  #
     2.6  
     2.7 -drops.master.copy.base=${devtools}/share/jdk7-drops
     2.8 +drops.master.copy.base=${drops.dir}
     2.9  drops.master.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
    2.10  
    2.11  jaxws_src.bundle.name=jdk7-jaxws-2009_09_28.zip

     3.1 --- a/make/Makefile	Fri Oct 23 11:06:56 2009 -0700
     3.2 +++ b/make/Makefile	Thu Nov 05 00:02:38 2009 +0000
     3.3 @@ -86,15 +86,22 @@
     3.4    endif
     3.5  endif
     3.6  
     3.7 -# Where is /java/devtools in case we need it
     3.8 -ifdef ALT_JDK_DEVTOOLS_DIR
     3.9 -  _DEVTOOLS = $(ALT_JDK_DEVTOOLS_DIR)
    3.10 +# Do we have the drops already downloaded?
    3.11 +# Check ALT_DROPS_DIR for a full path first,
    3.12 +# before trying to use the devtools path,
    3.13 +# either via ALT_JDK_DEVTOOLS_DIR or /java/devtools.
    3.14 +ifdef ALT_DROPS_DIR
    3.15 +  DROPS_DIR = $(ALT_DROPS_DIR)
    3.16  else
    3.17 -  _DEVTOOLS = $(_SLASHJAVA)/devtools
    3.18 +  ifdef ALT_JDK_DEVTOOLS_DIR
    3.19 +    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
    3.20 +  else
    3.21 +    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
    3.22 +  endif
    3.23  endif
    3.24  
    3.25 -# Add in path to devtools
    3.26 -ANT_OPTIONS += -Ddevtools=$(_DEVTOOLS)
    3.27 +# Add in path to drops already downloaded
    3.28 +ANT_OPTIONS += -Ddrops.dir=$(DROPS_DIR)
    3.29  
    3.30  ifdef ALT_OUTPUTDIR
    3.31    OUTPUTDIR = $(ALT_OUTPUTDIR)