stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6898251: Add ALT_DROPS_DIR feature to jaxp/jaxws

Browse Source 
Allowthe directory for downloaded drops to beset using ALT_DROPS_DIR

Reviewed-by: ohair, jjg
This commit is contained in:
Andrew John Hughes 2009-11-05 00:02:38 +00:00
parent 2aa71b1071
commit 4b41f78b01
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jaxws/build.properties
View File

@ -25,7 +25,7 @@
# Base locations where bundles are located # Base locations where bundles are located
slashjava=/java 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. # 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 # The bootstrap javac is used to compile both boostrap versions of the
@ -97,6 +97,7 @@ sanity.info= Sanity Settings:${line.separator}\
build.dir=${build.dir}${line.separator}\ build.dir=${build.dir}${line.separator}\
dist.dir=${dist.dir}${line.separator}\ dist.dir=${dist.dir}${line.separator}\
drop.dir=${drop.dir}${line.separator}\ drop.dir=${drop.dir}${line.separator}\
drops.dir=${drops.dir}${line.separator}\
${line.separator} ${line.separator}
#------------------------------------------------------------ #------------------------------------------------------------

2
jaxws/jaxws.properties
View File

@ -23,7 +23,7 @@
# have any questions. # have any questions.
# #
drops.master.copy.base=${devtools}/share/jdk7-drops drops.master.copy.base=${drops.dir}
drops.master.url.base=http://kenai.com/projects/jdk7-drops/downloads/download drops.master.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
jaxws_src.bundle.name=jdk7-jaxws-2009_09_28.zip jaxws_src.bundle.name=jdk7-jaxws-2009_09_28.zip

19
jaxws/make/Makefile
View File

@ -86,15 +86,22 @@ else
endif endif
endif endif
# Where is /java/devtools in case we need it # Do we have the drops already downloaded?
ifdef ALT_JDK_DEVTOOLS_DIR # Check ALT_DROPS_DIR for a full path first,
_DEVTOOLS = $(ALT_JDK_DEVTOOLS_DIR) # 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 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 endif
# Add in path to devtools # Add in path to drops already downloaded
ANT_OPTIONS += -Ddevtools=$(_DEVTOOLS) ANT_OPTIONS += -Ddrops.dir=$(DROPS_DIR)
ifdef ALT_OUTPUTDIR ifdef ALT_OUTPUTDIR
OUTPUTDIR = $(ALT_OUTPUTDIR) OUTPUTDIR = $(ALT_OUTPUTDIR)