Mercurial > hg > openjdk > jigsaw > jaxp
changeset 98:26b97fd0e595
6898251: Add ALT_DROPS_DIR feature to jaxp/jaxws
Summary: Allow the directory for downloaded drops to be set using ALT_DROPS_DIR
Reviewed-by: ohair, jjg
author | andrew |
---|---|
date | Thu, 05 Nov 2009 00:00:48 +0000 |
parents | 2f83acf616a7 |
children | 233a4871d336 |
files | build.properties jaxp.properties make/Makefile |
diffstat | 3 files changed, 16 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/build.properties Fri Oct 23 13:35:33 2009 -0700 +++ b/build.properties Thu Nov 05 00:00:48 2009 +0000 @@ -25,7 +25,7 @@ # Base locations where bundles are located slashjava=/java -devtools=${slashjava}/devtools +drops.dir=${slashjava}/devtools/share/jdk7-drops # This is the JDK used to build and run the bootstrap version of javac. # The bootstrap javac is used to compile both boostrap versions of the @@ -97,6 +97,7 @@ build.dir=${build.dir}${line.separator}\ dist.dir=${dist.dir}${line.separator}\ drop.dir=${drop.dir}${line.separator}\ + drops.dir=${drops.dir}${line.separator}\ ${line.separator} #------------------------------------------------------------
--- a/jaxp.properties Fri Oct 23 13:35:33 2009 -0700 +++ b/jaxp.properties Thu Nov 05 00:00:48 2009 +0000 @@ -23,7 +23,7 @@ # have any questions. # -drops.master.copy.base=${devtools}/share/jdk7-drops +drops.master.copy.base=${drops.dir} drops.master.url.base=https://jaxp.dev.java.net/files/documents/913/144160 jaxp_src.bundle.name=jdk7-jaxp-m5.zip
--- a/make/Makefile Fri Oct 23 13:35:33 2009 -0700 +++ b/make/Makefile Thu Nov 05 00:00:48 2009 +0000 @@ -86,15 +86,22 @@ endif endif -# Where is /java/devtools in case we need it -ifdef ALT_JDK_DEVTOOLS_DIR - _DEVTOOLS = $(ALT_JDK_DEVTOOLS_DIR) +# Do we have the drops already downloaded? +# Check ALT_DROPS_DIR for a full path first, +# before trying to use the devtools path, +# either via ALT_JDK_DEVTOOLS_DIR or /java/devtools. +ifdef ALT_DROPS_DIR + DROPS_DIR = $(ALT_DROPS_DIR) else - _DEVTOOLS = $(_SLASHJAVA)/devtools + ifdef ALT_JDK_DEVTOOLS_DIR + DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops + else + DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops + endif endif -# Add in path to devtools -ANT_OPTIONS += -Ddevtools=$(_DEVTOOLS) +# Add in path to drops already downloaded +ANT_OPTIONS += -Ddrops.dir=$(DROPS_DIR) ifdef ALT_OUTPUTDIR OUTPUTDIR = $(ALT_OUTPUTDIR)