Mercurial > hg > release > icedtea7-forest-2.5 > jaxws
changeset 111:a85341f84531
Use ALT_DROPS_DIR to specify location of drops and extract in build directory.
| author | andrew |
|---|---|
| date | Tue, 13 Oct 2009 20:02:39 +0100 |
| parents | e1f43d641a8e |
| children | b176d7a1d9e9 |
| files | build.properties jaxws.properties make/Makefile |
| diffstat | 3 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/build.properties Sat Oct 03 00:57:57 2009 +0100 +++ b/build.properties Tue Oct 13 20:02:39 2009 +0100 @@ -65,7 +65,7 @@ dist.src.zip=${dist.lib.dir}/src.zip # Where all drop sources live -drop.dir=./drop +drop.dir=${output.dir}/drop # Where patches to drop bundle sources live patches.dir=patches
--- a/jaxws.properties Sat Oct 03 00:57:57 2009 +0100 +++ b/jaxws.properties Tue Oct 13 20:02:39 2009 +0100 @@ -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=http://kenai.com/projects/jdk7-drops/downloads/download jaxws_src.bundle.name=jdk7-jaxws-2009_09_28.zip
--- a/make/Makefile Sat Oct 03 00:57:57 2009 +0100 +++ b/make/Makefile Tue Oct 13 20:02:39 2009 +0100 @@ -87,14 +87,18 @@ endif # Where is /java/devtools in case we need it -ifdef ALT_JDK_DEVTOOLS_DIR - _DEVTOOLS = $(ALT_JDK_DEVTOOLS_DIR) +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) +ANT_OPTIONS += -Ddrops.dir=$(DROPS_DIR) ifdef ALT_OUTPUTDIR OUTPUTDIR = $(ALT_OUTPUTDIR)