Lines 49-63
Link Here
|
49 |
<dirname property="harness.dir" file="${suite.file}"/> |
49 |
<dirname property="harness.dir" file="${suite.file}"/> |
50 |
<echo level="verbose">Using build harness in ${harness.dir}</echo> |
50 |
<echo level="verbose">Using build harness in ${harness.dir}</echo> |
51 |
<taskdef classpath="${harness.dir}/tasks.jar" resource="org/netbeans/nbbuild/taskdefs.properties"/> |
51 |
<taskdef classpath="${harness.dir}/tasks.jar" resource="org/netbeans/nbbuild/taskdefs.properties"/> |
|
|
52 |
<typedef name="pathfileset" classname="org.netbeans.nbbuild.PathFileSet" |
53 |
classpath="${harness.dir}/tasks.jar"/> |
52 |
<property name="harness.taskdefs.done" value="true"/> |
54 |
<property name="harness.taskdefs.done" value="true"/> |
53 |
</target> |
55 |
</target> |
54 |
|
56 |
|
55 |
<target name="-init" depends="-taskdefs"> |
57 |
<target name="-convert-old-project" unless="cluster.path.evaluated"> |
|
|
58 |
<!-- netbeans.dest.dir -> cluster.path.id translation for pre-7.0 modules --> |
59 |
<fail unless="netbeans.dest.dir" message="Either 'cluster.path.evaluated' or 'netbeans.dest.dir' property must be set."/> |
60 |
|
61 |
<pathconvert property="old.project.update.tracking"> |
62 |
<fileset dir="${netbeans.dest.dir}" includes="**/update_tracking/*.xml"/> |
63 |
</pathconvert> |
64 |
|
65 |
<selector id="old.project.included.files"> |
66 |
<custom classpath="${harness.dir}/tasks.jar" classname="org.netbeans.nbbuild.ModuleSelector"> |
67 |
<param name="excludeModules" value="${disabled.modules}"/> |
68 |
<!-- XXX inc/exc clusters --> |
69 |
<param name="includeClusters" value="${enabled.clusters}"/> |
70 |
<param name="excludeClusters" value="${disabled.clusters}"/> |
71 |
<param name="updateTrackingFiles" value="${old.project.update.tracking}"/> |
72 |
</custom> |
73 |
</selector> |
74 |
|
75 |
<pathconvert property="old.project.clusters.duplicates" pathsep=" "> |
76 |
<fileset dir="${netbeans.dest.dir}"> |
77 |
<selector refid="old.project.included.files"/> |
78 |
</fileset> |
79 |
<chainedmapper> |
80 |
<mapper type="regexp" from="(^.+)[/\\]config[/\\]Modules[/\\]" to="\1"/> <!-- #71849 --> |
81 |
<filtermapper> |
82 |
<linecontainsregexp negate="true"> |
83 |
<regexp pattern="update[/\\]backup[/\\]netbeans[/\\]?$"/> |
84 |
</linecontainsregexp> |
85 |
</filtermapper> |
86 |
</chainedmapper> |
87 |
</pathconvert> |
88 |
<tempfile property="old.project.clusters.duplicates.file" destdir="${basedir}/build" deleteonexit="true"/> |
89 |
<mkdir dir="${basedir}/build"/> |
90 |
<echo file="${old.project.clusters.duplicates.file}" message="${old.project.clusters.duplicates}"/> |
91 |
|
92 |
<pathconvert property="cluster.path.evaluated"> |
93 |
<union> <!-- union removes duplicates --> |
94 |
<files includesfile="${old.project.clusters.duplicates.file}"/> |
95 |
</union> |
96 |
</pathconvert> |
97 |
</target> |
98 |
|
99 |
<target name="-init" depends="-taskdefs,-convert-old-project"> |
100 |
<convertclusterpath from="${cluster.path.evaluated}" to="cluster.path" id="cluster.path.id"/> |
56 |
<property file="nbproject/private/private.properties"/> |
101 |
<property file="nbproject/private/private.properties"/> |
57 |
<property file="nbproject/project.properties"/> |
102 |
<property file="nbproject/project.properties"/> |
58 |
<sortsuitemodules unsortedmodules="${modules}" sortedmodulesproperty="modules.sorted"/> |
103 |
<sortsuitemodules unsortedmodules="${modules}" sortedmodulesproperty="modules.sorted"/> |
59 |
<property name="cluster" location="build/cluster"/> |
104 |
<property name="cluster" location="build/cluster"/> |
60 |
<echo level="verbose">Suite in ${basedir} with target platform ${netbeans.dest.dir}, build cluster ${cluster}, and sorted modules ${modules.sorted}</echo> |
105 |
<echo level="verbose">Suite in ${basedir} with clusters ${cluster.path}, build cluster ${cluster}, and sorted modules ${modules.sorted}</echo> |
61 |
<!-- synchronize with SuiteProject --> |
106 |
<!-- synchronize with SuiteProject --> |
62 |
<property name="disabled.modules" value=""/> |
107 |
<property name="disabled.modules" value=""/> |
63 |
<property name="enabled.clusters" value=""/> |
108 |
<property name="enabled.clusters" value=""/> |
Lines 103-118
Link Here
|
103 |
|
148 |
|
104 |
|
149 |
|
105 |
<target name="build" depends="-init,branding,release" description="Build all modules in the suite."> |
150 |
<target name="build" depends="-init,branding,release" description="Build all modules in the suite."> |
106 |
<subant target="netbeans" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"/> |
151 |
<subant target="netbeans" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"> |
|
|
152 |
<property name="cluster.path.evaluated" value="${cluster.path.evaluated}"/> <!-- Just for speed of pre-7.0 projects --> |
153 |
</subant> |
107 |
<mkdir dir="${cluster}/config/Modules"/> |
154 |
<mkdir dir="${cluster}/config/Modules"/> |
108 |
<createmodulexml xmldir="${cluster}/config/Modules"> |
155 |
<pathconvert pathsep="," property="disabled.modules.paths.list"> |
109 |
<hidden dir="${netbeans.dest.dir}"> |
156 |
<pathfileset> |
|
|
157 |
<path refid="cluster.path.id"/> |
110 |
<custom classpath="${harness.dir}/tasks.jar" classname="org.netbeans.nbbuild.ModuleSelector"> |
158 |
<custom classpath="${harness.dir}/tasks.jar" classname="org.netbeans.nbbuild.ModuleSelector"> |
111 |
<param name="excludeModules" value="${disabled.modules}"/> |
159 |
<param name="excludeModules" value="${disabled.modules}"/> |
112 |
<param name="excluded" value="true"/> |
160 |
<param name="excluded" value="true"/> |
113 |
</custom> |
161 |
</custom> |
114 |
</hidden> |
162 |
</pathfileset> |
115 |
</createmodulexml> |
163 |
</pathconvert> |
|
|
164 |
<createmodulexml xmldir="${cluster}/config/Modules" hidden="${disabled.modules.paths.list}"/> |
116 |
</target> |
165 |
</target> |
117 |
|
166 |
|
118 |
<target name="nbms" depends="build" description="Build NBMs and an Auto Update site descriptor for all modules in the suite."> |
167 |
<target name="nbms" depends="build" description="Build NBMs and an Auto Update site descriptor for all modules in the suite."> |
Lines 122-136
Link Here
|
122 |
<isset property="nbm.target.cluster"/> |
171 |
<isset property="nbm.target.cluster"/> |
123 |
</condition> |
172 |
</condition> |
124 |
<!-- reads app.name if exists --> |
173 |
<!-- reads app.name if exists --> |
|
|
174 |
<pathfileset id="updater.jar"> |
175 |
<path refid="cluster.path.id"/> |
176 |
<filename name="modules/ext/updater.jar"/> |
177 |
</pathfileset> |
125 |
<condition property="help.target.cluster" value="${app.name}" > |
178 |
<condition property="help.target.cluster" value="${app.name}" > |
126 |
<and> |
179 |
<and> |
127 |
<isset property="app.name"/> |
180 |
<isset property="app.name"/> |
128 |
<!-- #74866: only works for 6.0+ platforms. --> |
181 |
<!-- #74866: only works for 6.0+ platforms. --> |
129 |
<available resource="org/netbeans/updater/resources/autoupdate-info-2_4.dtd"> |
182 |
<available resource="org/netbeans/updater/resources/autoupdate-info-2_4.dtd"> |
130 |
<classpath> |
183 |
<classpath> |
131 |
<fileset dir="${netbeans.dest.dir}"> |
184 |
<resources refid="updater.jar"/> |
132 |
<include name="platform*/modules/ext/updater.jar"/> |
|
|
133 |
</fileset> |
134 |
</classpath> |
185 |
</classpath> |
135 |
</available> |
186 |
</available> |
136 |
</and> |
187 |
</and> |
Lines 144-156
Link Here
|
144 |
<subant target="nbm" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"> |
195 |
<subant target="nbm" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"> |
145 |
<property name="nbm.target.dir" location="${build.updates.dir}"/> |
196 |
<property name="nbm.target.dir" location="${build.updates.dir}"/> |
146 |
<property name="${nbm.target.cluster.name}" value="${help.target.cluster}" /> |
197 |
<property name="${nbm.target.cluster.name}" value="${help.target.cluster}" /> |
|
|
198 |
<property name="cluster.path.evaluated" value="${cluster.path.evaluated}"/> <!-- Just for speed of pre-7.0 projects --> |
147 |
</subant> |
199 |
</subant> |
148 |
<makeupdatedesc desc="${build.updates.dir}/updates.xml" distbase="." automaticgrouping="true"> |
200 |
<makeupdatedesc desc="${build.updates.dir}/updates.xml" distbase="." automaticgrouping="true"> |
149 |
<fileset dir="${build.updates.dir}"> |
201 |
<fileset dir="${build.updates.dir}"> |
150 |
<include name="*.nbm"/> |
202 |
<include name="*.nbm"/> |
151 |
</fileset> |
203 |
</fileset> |
152 |
<updaterjar> |
204 |
<updaterjar> |
153 |
<fileset dir="${netbeans.dest.dir}" includes="platform*/modules/ext/updater.jar"/> |
205 |
<resources refid="updater.jar"/> |
154 |
</updaterjar> |
206 |
</updaterjar> |
155 |
</makeupdatedesc> |
207 |
</makeupdatedesc> |
156 |
</target> |
208 |
</target> |
Lines 159-196
Link Here
|
159 |
<fail unless="app.name">Must have set at least an application name ('app.name')</fail> |
211 |
<fail unless="app.name">Must have set at least an application name ('app.name')</fail> |
160 |
|
212 |
|
161 |
<pathconvert property="zip.platform.update.tracking"> |
213 |
<pathconvert property="zip.platform.update.tracking"> |
162 |
<path> |
214 |
<pathfileset> |
163 |
<fileset dir="${netbeans.dest.dir}"> |
215 |
<path refid="cluster.path.id"/> |
164 |
<include name="**/update_tracking/*.xml"/> |
216 |
<filename name="**/update_tracking/*.xml"/> |
165 |
</fileset> |
217 |
</pathfileset> |
166 |
</path> |
|
|
167 |
</pathconvert> |
218 |
</pathconvert> |
168 |
|
219 |
|
169 |
<selector id="zip.platform.included.files"> |
220 |
<selector id="zip.platform.included.files"> |
170 |
<custom classpath="${harness.dir}/tasks.jar" classname="org.netbeans.nbbuild.ModuleSelector"> |
221 |
<custom classpath="${harness.dir}/tasks.jar" classname="org.netbeans.nbbuild.ModuleSelector"> |
171 |
<param name="excludeModules" value="${disabled.modules}"/> |
222 |
<param name="excludeModules" value="${disabled.modules}"/> |
|
|
223 |
<!-- XXX inc/exc clusters --> |
172 |
<param name="includeClusters" value="${enabled.clusters}"/> |
224 |
<param name="includeClusters" value="${enabled.clusters}"/> |
173 |
<param name="excludeClusters" value="${disabled.clusters}"/> |
225 |
<param name="excludeClusters" value="${disabled.clusters}"/> |
174 |
<param name="updateTrackingFiles" value="${zip.platform.update.tracking}"/> |
226 |
<param name="updateTrackingFiles" value="${zip.platform.update.tracking}"/> |
175 |
</custom> |
227 |
</custom> |
176 |
</selector> |
228 |
</selector> |
177 |
|
229 |
|
178 |
<pathconvert property="zip.platform.clusters.duplicates" pathsep=","> |
230 |
<pathconvert property="zip.platform.clusters.duplicates" pathsep=" "> |
179 |
<path> |
231 |
<pathfileset> |
180 |
<fileset dir="${netbeans.dest.dir}"> |
232 |
<path refid="cluster.path.id"/> |
181 |
<selector refid="zip.platform.included.files"/> |
233 |
<selector refid="zip.platform.included.files"/> |
182 |
</fileset> |
234 |
</pathfileset> |
183 |
</path> |
235 |
<chainedmapper> |
184 |
<mapper type="regexp" from="[/\\]([^/\\]+)[/\\]config[/\\]Modules[/\\]" to="\1"/> <!-- #71849 --> |
236 |
<mapper type="regexp" from="(^.+)[/\\]config[/\\]Modules[/\\]" to="\1"/> <!-- #71849 --> |
|
|
237 |
<filtermapper> |
238 |
<linecontainsregexp negate="true"> |
239 |
<regexp pattern="update[/\\]backup[/\\]netbeans[/\\]?$"/> |
240 |
</linecontainsregexp> |
241 |
</filtermapper> |
242 |
</chainedmapper> |
185 |
</pathconvert> |
243 |
</pathconvert> |
186 |
|
244 |
<tempfile property="zip.platform.clusters.duplicates.file" destdir="${basedir}/build" deleteonexit="true"/> |
187 |
<dirset id="zip.platform.clusters" dir="${netbeans.dest.dir}" includes="${zip.platform.clusters.duplicates}" excludes="platform*"/> |
245 |
<echo file="${zip.platform.clusters.duplicates.file}" message="${zip.platform.clusters.duplicates}"/> |
188 |
|
246 |
|
|
|
247 |
<union id="zip.platform.clusters"> <!-- union removes duplicates --> |
248 |
<files includesfile="${zip.platform.clusters.duplicates.file}"/> |
249 |
</union> |
189 |
<pathconvert property="zip.platform.clusters.bare" pathsep=" "> <!-- #71128: \n OK on Win but \r\n bad on Unix --> |
250 |
<pathconvert property="zip.platform.clusters.bare" pathsep=" "> <!-- #71128: \n OK on Win but \r\n bad on Unix --> |
190 |
<path> |
251 |
<resources refid="zip.platform.clusters"/> |
191 |
<dirset refid="zip.platform.clusters"/> |
252 |
<chainedmapper> |
192 |
</path> |
253 |
<filtermapper> |
193 |
<mapper type="regexp" from="[/\\]([^/\\]+)[/\\]?$" to="\1"/> <!-- #71849 --> |
254 |
<linecontainsregexp negate="true"> |
|
|
255 |
<regexp pattern="platform[0-9]*[/\\]?$"/> |
256 |
</linecontainsregexp> |
257 |
</filtermapper> |
258 |
<mapper type="regexp" from="[/\\]([^/\\]+)[/\\]?$" to="\1"/> <!-- #71849 --> |
259 |
</chainedmapper> |
194 |
</pathconvert> |
260 |
</pathconvert> |
195 |
|
261 |
|
196 |
<property name="build.launcher.dir" location="build/launcher"/> |
262 |
<property name="build.launcher.dir" location="build/launcher"/> |
Lines 201-212
Link Here
|
201 |
<mkdir dir="${build.launcher.dir}/bin"/> |
267 |
<mkdir dir="${build.launcher.dir}/bin"/> |
202 |
|
268 |
|
203 |
<!-- make sure correct launchers are present - for pre7 platform use old app.exe launchers --> |
269 |
<!-- make sure correct launchers are present - for pre7 platform use old app.exe launchers --> |
|
|
270 |
<pathconvert property="nbexec.dll.found" setonempty="false"> |
271 |
<pathfileset include="lib/nbexec.dll"> |
272 |
<path refid="cluster.path.id"/> |
273 |
</pathfileset> |
274 |
</pathconvert> |
204 |
<condition property="app.exe.prefix" value="" else="pre7_"> |
275 |
<condition property="app.exe.prefix" value="" else="pre7_"> |
205 |
<available file="nbexec.dll"> |
276 |
<isset property="nbexec.dll.found"/> |
206 |
<filepath> |
|
|
207 |
<dirset dir="${netbeans.dest.dir}" includes="platform*/lib"/> |
208 |
</filepath> |
209 |
</available> |
210 |
</condition> |
277 |
</condition> |
211 |
<copy file="${harness.dir}/launchers/${app.exe.prefix}app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe" overwrite="true"/> |
278 |
<copy file="${harness.dir}/launchers/${app.exe.prefix}app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe" overwrite="true"/> |
212 |
<copy file="${harness.dir}/launchers/${app.exe.prefix}app_w.exe" tofile="${build.launcher.dir}/bin/${app.name}_w.exe" failonerror="false" overwrite="true"/> |
279 |
<copy file="${harness.dir}/launchers/${app.exe.prefix}app_w.exe" tofile="${build.launcher.dir}/bin/${app.name}_w.exe" failonerror="false" overwrite="true"/> |
Lines 226-247
Link Here
|
226 |
|
293 |
|
227 |
<target name="build-zip" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform."> |
294 |
<target name="build-zip" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform."> |
228 |
<mkdir dir="${dist.dir}"/> |
295 |
<mkdir dir="${dist.dir}"/> |
|
|
296 |
<!-- pathfileset does not support 'prefix' and 'filemode' parameters, |
297 |
we have to copy them to temp location --> |
298 |
<tempfile property="temp.dir.nbexec" destdir="${basedir}/build" deleteonexit="true"/> |
299 |
<tempfile property="temp.dir.rest" destdir="${basedir}/build" deleteonexit="delete"/> |
300 |
<subant genericantfile="${harness.dir}/suite.xml" target="copy-cluster" inheritrefs="true"> |
301 |
<property name="dest.dir" value="${temp.dir.rest}"/> |
302 |
<property name="nbexec.dir" value="${temp.dir.nbexec}"/> |
303 |
<property name="build.dir" value="${basedir}/build"/> |
304 |
<resources refid="zip.platform.clusters"/> |
305 |
</subant> |
229 |
<zip destfile="${dist.dir}/${app.name}.zip"> |
306 |
<zip destfile="${dist.dir}/${app.name}.zip"> |
230 |
<zipfileset dir="${build.launcher.dir}/bin/" filemode="755" prefix="${app.name}/bin"/> |
307 |
<zipfileset dir="${build.launcher.dir}/bin/" filemode="755" prefix="${app.name}/bin"/> |
231 |
<zipfileset dir="${build.launcher.dir}/etc/" prefix="${app.name}/etc"/> |
308 |
<zipfileset dir="${build.launcher.dir}/etc/" prefix="${app.name}/etc"/> |
232 |
<zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${app.name}"> |
309 |
<zipfileset dir="${temp.dir.nbexec}" filemode="755" prefix="${app.name}"/> |
233 |
<include name="**/lib/nbexec*"/> |
310 |
<zipfileset dir="${temp.dir.rest}" prefix="${app.name}"/> |
234 |
</zipfileset> |
311 |
|
235 |
|
|
|
236 |
<zipfileset dir="${netbeans.dest.dir}" prefix="${app.name}"> |
237 |
<and> |
238 |
<not> |
239 |
<filename name="**/lib/nbexec*"/> |
240 |
</not> |
241 |
<selector refid="zip.platform.included.files"/> |
242 |
</and> |
243 |
</zipfileset> |
244 |
|
245 |
<!-- Yes, the doubled app.name is a bit ugly, but better than the alternative; cf. #66441: --> |
312 |
<!-- Yes, the doubled app.name is a bit ugly, but better than the alternative; cf. #66441: --> |
246 |
<zipfileset dir="${cluster}" prefix="${app.name}/${app.name}"> |
313 |
<zipfileset dir="${cluster}" prefix="${app.name}/${app.name}"> |
247 |
<exclude name="config/Modules/*.xml_hidden"/> |
314 |
<exclude name="config/Modules/*.xml_hidden"/> |
Lines 249-254
Link Here
|
249 |
|
316 |
|
250 |
</zip> |
317 |
</zip> |
251 |
</target> |
318 |
</target> |
|
|
319 |
|
320 |
<target name="copy-cluster" description="Copies cluster specified by basedir to dir ${dest.dir}"> |
321 |
<pathconvert property="cluster.name"> |
322 |
<path path="${basedir}"/> |
323 |
<mapper type="regexp" from="[/\\]([^/\\]+)[/\\]?$" to="\1"/> |
324 |
</pathconvert> |
325 |
<copy todir="${dest.dir}/${cluster.name}"> |
326 |
<fileset dir="${basedir}"> |
327 |
<and> |
328 |
<not> |
329 |
<filename name="**/lib/nbexec*"/> |
330 |
</not> |
331 |
<selector refid="zip.platform.included.files"/> |
332 |
</and> |
333 |
</fileset> |
334 |
</copy> |
335 |
<condition property="copy.nbexec" value="true"> |
336 |
<matches pattern="^platform[0-9]*$" string="${cluster.name}"/> |
337 |
</condition> |
338 |
<antcall target="copy-nbexec"/> |
339 |
</target> |
340 |
|
341 |
<target name="copy-nbexec" if="copy.nbexec" description="Copies nbexec from given cluster to specified location"> |
342 |
<copy todir="${nbexec.dir}/${cluster.name}"> |
343 |
<fileset dir="${basedir}"> |
344 |
<filename name="**/lib/nbexec*"/> |
345 |
</fileset> |
346 |
</copy> |
347 |
</target> |
348 |
|
252 |
<target name="create-platform" depends="build-zip" description="Creates an unzipped platform from the suite, launchers, and selected modules from the platform."> |
349 |
<target name="create-platform" depends="build-zip" description="Creates an unzipped platform from the suite, launchers, and selected modules from the platform."> |
253 |
<mkdir dir="${dist.dir}/${app.name}"/> |
350 |
<mkdir dir="${dist.dir}/${app.name}"/> |
254 |
<unzip src="${dist.dir}/${app.name}.zip" dest="${dist.dir}/${app.name}"> |
351 |
<unzip src="${dist.dir}/${app.name}.zip" dest="${dist.dir}/${app.name}"> |
Lines 269-288
Link Here
|
269 |
<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/etc"> |
366 |
<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/etc"> |
270 |
<fileset dir="${build.launcher.dir}/etc/" /> |
367 |
<fileset dir="${build.launcher.dir}/etc/" /> |
271 |
</copy> |
368 |
</copy> |
272 |
<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}"> |
369 |
<subant genericantfile="${harness.dir}/suite.xml" target="copy-cluster" inheritrefs="true"> |
273 |
<fileset dir="${netbeans.dest.dir}"> |
370 |
<property name="dest.dir" value="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}"/> |
274 |
<include name="**/lib/nbexec*"/> |
371 |
<property name="nbexec.dir" value="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}"/> |
275 |
</fileset> |
372 |
<property name="build.dir" value="${basedir}/build"/> |
276 |
|
373 |
<resources refid="zip.platform.clusters"/> |
277 |
<fileset dir="${netbeans.dest.dir}"> |
374 |
</subant> |
278 |
<and> |
375 |
|
279 |
<not> |
|
|
280 |
<filename name="**/lib/nbexec*"/> |
281 |
</not> |
282 |
<selector refid="zip.platform.included.files"/> |
283 |
</and> |
284 |
</fileset> |
285 |
</copy> |
286 |
<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/${app.name}"> |
376 |
<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/${app.name}"> |
287 |
|
377 |
|
288 |
<fileset dir="${cluster}"/> |
378 |
<fileset dir="${cluster}"/> |
Lines 336-342
Link Here
|
336 |
<exclude name="testuserdir/"/> |
426 |
<exclude name="testuserdir/"/> |
337 |
</fileset> |
427 |
</fileset> |
338 |
</delete> |
428 |
</delete> |
339 |
<subant target="clean" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"/> |
429 |
<subant target="clean" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"> |
|
|
430 |
<property name="cluster.path.evaluated" value="${cluster.path.evaluated}"/> <!-- Just for speed of pre-7.0 projects --> |
431 |
</subant> |
340 |
<delete dir="${dist.dir}"/> |
432 |
<delete dir="${dist.dir}"/> |
341 |
</target> |
433 |
</target> |
342 |
|
434 |
|
Lines 346-377
Link Here
|
346 |
</target> |
438 |
</target> |
347 |
|
439 |
|
348 |
<target name="run" depends="build,-jdk-init" description="Runs this suite in place."> |
440 |
<target name="run" depends="build,-jdk-init" description="Runs this suite in place."> |
349 |
<ant antfile="${harness.dir}/run.xml" target="run"/> |
441 |
<ant antfile="${harness.dir}/run.xml" target="run"> |
|
|
442 |
<reference refid="cluster.path.id"/> |
443 |
</ant> |
350 |
</target> |
444 |
</target> |
351 |
|
445 |
|
352 |
<target name="debug" depends="build,-jdk-init,-jdk-presetdef-nbjpdastart" description="Runs this suite in place in the debugger."> |
446 |
<target name="debug" depends="build,-jdk-init,-jdk-presetdef-nbjpdastart" description="Runs this suite in place in the debugger."> |
353 |
<ant antfile="${harness.dir}/run.xml" target="debug"/> |
447 |
<ant antfile="${harness.dir}/run.xml" target="debug"> |
|
|
448 |
<reference refid="cluster.path.id"/> |
449 |
</ant> |
354 |
</target> |
450 |
</target> |
355 |
|
451 |
|
356 |
<target name="profile" depends="build,-jdk-init,-jdk-presetdef-nbprofiledirect" description="Runs this suite in place in the profiler."> |
452 |
<target name="profile" depends="build,-jdk-init,-jdk-presetdef-nbprofiledirect" description="Runs this suite in place in the profiler."> |
357 |
<ant antfile="${harness.dir}/run.xml" target="profile"/> |
453 |
<ant antfile="${harness.dir}/run.xml" target="profile"> |
|
|
454 |
<reference refid="cluster.path.id"/> |
455 |
</ant> |
358 |
</target> |
456 |
</target> |
359 |
|
457 |
|
360 |
<target name="build-jnlp" depends="build,-jdk-init" description="Packages this suite as a JNLP application."> |
458 |
<target name="build-jnlp" depends="build,-jdk-init" description="Packages this suite as a JNLP application."> |
361 |
<ant antfile="${harness.dir}/jnlp.xml" target="build"/> |
459 |
<ant antfile="${harness.dir}/jnlp.xml" target="build"> |
|
|
460 |
<reference refid="cluster.path.id"/> |
461 |
</ant> |
362 |
</target> |
462 |
</target> |
363 |
|
463 |
|
364 |
<target name="run-jnlp" depends="build,-jdk-init" description="Runs this suite as a JNLP application."> |
464 |
<target name="run-jnlp" depends="build,-jdk-init" description="Runs this suite as a JNLP application."> |
365 |
<ant antfile="${harness.dir}/jnlp.xml" target="run"/> |
465 |
<ant antfile="${harness.dir}/jnlp.xml" target="run"> |
|
|
466 |
<reference refid="cluster.path.id"/> |
467 |
</ant> |
366 |
</target> |
468 |
</target> |
367 |
|
469 |
|
368 |
<target name="debug-jnlp" depends="build,-jdk-init,-jdk-presetdef-nbjpdastart" description="Runs this suite as a JNLP application in the debugger."> |
470 |
<target name="debug-jnlp" depends="build,-jdk-init,-jdk-presetdef-nbjpdastart" description="Runs this suite as a JNLP application in the debugger."> |
369 |
<ant antfile="${harness.dir}/jnlp.xml" target="debug"/> |
471 |
<ant antfile="${harness.dir}/jnlp.xml" target="debug"> |
|
|
472 |
<reference refid="cluster.path.id"/> |
473 |
</ant> |
370 |
</target> |
474 |
</target> |
371 |
|
475 |
|
372 |
<target name="test" depends="build" description="Runs tests for all modules in the suite."> |
476 |
<target name="test" depends="build" description="Runs tests for all modules in the suite."> |
373 |
<sortsuitemodules unsortedmodules="${modules}" sortedmodulesproperty="modules.test.sorted" sorttests="true"/> |
477 |
<sortsuitemodules unsortedmodules="${modules}" sortedmodulesproperty="modules.test.sorted" sorttests="true"/> |
374 |
<subant target="test" buildpath="${modules.test.sorted}" inheritrefs="false" inheritall="false"/> |
478 |
<subant target="test" buildpath="${modules.test.sorted}" inheritrefs="false" inheritall="false"> |
|
|
479 |
<property name="cluster.path.evaluated" value="${cluster.path.evaluated}"/> <!-- Just for speed of pre-7.0 projects --> |
480 |
</subant> |
375 |
</target> |
481 |
</target> |
376 |
|
482 |
|
377 |
</project> |
483 |
</project> |