comparison make/Makefile @ 520:ab11cef1dfaa

Added tag jdk7u21-b07 for changeset 4a9533495068
author katleman
date Tue, 19 Mar 2013 14:33:49 -0700
parents de11bd049d6f
children
comparison
equal deleted inserted replaced
20:f1fc538a1f7c 21:d3dcdc1cde04
89 else 89 else
90 _SLASHJAVA=/java 90 _SLASHJAVA=/java
91 endif 91 endif
92 endif 92 endif
93 93
94 # Do we have the drops already downloaded?
95 # Check ALT_DROPS_DIR for a full path first,
96 # before trying to use the devtools path,
97 # either via ALT_JDK_DEVTOOLS_DIR or /java/devtools.
98 ifdef ALT_DROPS_DIR
99 DROPS_DIR = $(ALT_DROPS_DIR)
100 else
101 ifdef ALT_JDK_DEVTOOLS_DIR
102 DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
103 else
104 DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
105 endif
106 endif
107
108 # Add in path to drops already downloaded
109 ANT_OPTIONS += -Ddrops.dir=$(DROPS_DIR)
110
111 ifdef ALT_OUTPUTDIR 94 ifdef ALT_OUTPUTDIR
112 OUTPUTDIR = $(ALT_OUTPUTDIR) 95 OUTPUTDIR = $(ALT_OUTPUTDIR)
113 ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR) 96 ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR)
114 else 97 else
115 OUTPUTDIR = .. 98 OUTPUTDIR = ..
142 125
143 # Default target and expected 'do everything' target 126 # Default target and expected 'do everything' target
144 default: all 127 default: all
145 128
146 # All ant targets of interest 129 # All ant targets of interest
147 ANT_TARGETS = all source drop_included build dist clobber clean sanity 130 ANT_TARGETS = all build dist clobber clean sanity
131
132 # Just for compat reasons, delete in future.
133 drop_included:
134 source:
148 135
149 # Create a make target for each 136 # Create a make target for each
150 $(ANT_TARGETS): 137 $(ANT_TARGETS):
151 cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version 138 cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version
152 cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@ 139 cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
162 @echo " " 149 @echo " "
163 @echo " Targets (see ant project information for descriptions):" 150 @echo " Targets (see ant project information for descriptions):"
164 @echo " $(ANT_TARGETS)" 151 @echo " $(ANT_TARGETS)"
165 @echo " " 152 @echo " "
166 @echo " Environment or command line variables (all optional):" 153 @echo " Environment or command line variables (all optional):"
167 $(call helpenvline, ALT_DROPS_DIR,\
168 "Directory that contains the drop source bundles i.e. drops.dir")
169 $(call helpenvline, ALT_BOOTDIR,\ 154 $(call helpenvline, ALT_BOOTDIR,\
170 "JAVA_HOME to use when running ant") 155 "JAVA_HOME to use when running ant")
171 $(call helpenvline, ALT_LANGTOOLS_DIST,\ 156 $(call helpenvline, ALT_LANGTOOLS_DIST,\
172 "path to langtools repository dist directory") 157 "path to langtools repository dist directory")
173 $(call helpenvline, ALT_OUTPUTDIR,\ 158 $(call helpenvline, ALT_OUTPUTDIR,\