diff options
| author | andrew <none@none> | 2009-11-05 00:00:48 +0000 |
|---|---|---|
| committer | andrew <none@none> | 2009-11-05 00:00:48 +0000 |
| commit | 92e6c1002c0a95bdaa124c5292eb16bf2b12a4a2 (patch) | |
| tree | 20eee6c59c803d91c8e82f2e53cac9511b0933fb /make | |
| parent | 93e0443cac62dd3137ce7a77ac247f265de4628f (diff) | |
| download | jdk8u_jaxp-92e6c1002c0a95bdaa124c5292eb16bf2b12a4a2.tar.gz | |
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
Diffstat (limited to 'make')
| -rw-r--r-- | make/Makefile | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/make/Makefile b/make/Makefile index 34e2822..071a434 100644 --- a/make/Makefile +++ b/make/Makefile @@ -86,15 +86,22 @@ else 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) |