1.1 --- a/make/Makefile Fri Feb 24 18:22:57 2012 -0800
1.2 +++ b/make/Makefile Tue Mar 06 16:09:35 2012 -0800
1.3 @@ -91,23 +91,6 @@
1.4 endif
1.5 endif
1.6
1.7 -# Do we have the drops already downloaded?
1.8 -# Check ALT_DROPS_DIR for a full path first,
1.9 -# before trying to use the devtools path,
1.10 -# either via ALT_JDK_DEVTOOLS_DIR or /java/devtools.
1.11 -ifdef ALT_DROPS_DIR
1.12 - DROPS_DIR = $(ALT_DROPS_DIR)
1.13 -else
1.14 - ifdef ALT_JDK_DEVTOOLS_DIR
1.15 - DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops
1.16 - else
1.17 - DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops
1.18 - endif
1.19 -endif
1.20 -
1.21 -# Add in path to drops already downloaded
1.22 -ANT_OPTIONS += -Ddrops.dir=$(DROPS_DIR)
1.23 -
1.24 ifdef ALT_OUTPUTDIR
1.25 OUTPUTDIR = $(ALT_OUTPUTDIR)
1.26 ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR)
1.27 @@ -144,13 +127,17 @@
1.28 default: all
1.29
1.30 # All ant targets of interest
1.31 -ANT_TARGETS = all source drop_included build dist clobber clean sanity
1.32 +ANT_TARGETS = all build dist clobber clean sanity
1.33
1.34 # Create a make target for each
1.35 $(ANT_TARGETS):
1.36 cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version
1.37 cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
1.38
1.39 +# Just for compat reasons, delete in future.
1.40 +drop_included:
1.41 +source:
1.42 +
1.43 # Help target
1.44 define helpenvline
1.45 @echo " $1";echo " $2"
1.46 @@ -164,8 +151,6 @@
1.47 @echo " $(ANT_TARGETS)"
1.48 @echo " "
1.49 @echo " Environment or command line variables (all optional):"
1.50 - $(call helpenvline, ALT_DROPS_DIR,\
1.51 - "Directory that contains the drop source bundles i.e. drops.dir")
1.52 $(call helpenvline, ALT_BOOTDIR,\
1.53 "JAVA_HOME to use when running ant")
1.54 $(call helpenvline, ALT_LANGTOOLS_DIST,\
