Lines 63-68
Link Here
|
63 |
<property name="enabled.clusters" value=""/> |
63 |
<property name="enabled.clusters" value=""/> |
64 |
<property name="disabled.clusters" value=""/> |
64 |
<property name="disabled.clusters" value=""/> |
65 |
<property name="app.version" value="0.1"/> |
65 |
<property name="app.version" value="0.1"/> |
|
|
66 |
<property name="build.dir" location="build"/> |
67 |
<property name="dist.dir" location="dist"/> |
66 |
<property name="branding.dir" location="branding"/> |
68 |
<property name="branding.dir" location="branding"/> |
67 |
<condition property="run.branding"> <!-- #84689 --> |
69 |
<condition property="run.branding"> <!-- #84689 --> |
68 |
<and> |
70 |
<and> |
Lines 115-121
Link Here
|
115 |
</target> |
117 |
</target> |
116 |
|
118 |
|
117 |
<target name="nbms" depends="build" description="Build NBMs and an Auto Update site descriptor for all modules in the suite."> |
119 |
<target name="nbms" depends="build" description="Build NBMs and an Auto Update site descriptor for all modules in the suite."> |
118 |
<property name="build.updates.dir" location="build/updates"/> |
120 |
<property name="build.updates.dir" location="${build.dir}/updates"/> |
119 |
<!-- reads from suite/project.properties first --> |
121 |
<!-- reads from suite/project.properties first --> |
120 |
<condition property="help.target.cluster" value="${nbm.target.cluster}" > |
122 |
<condition property="help.target.cluster" value="${nbm.target.cluster}" > |
121 |
<isset property="nbm.target.cluster"/> |
123 |
<isset property="nbm.target.cluster"/> |
Lines 189-195
Link Here
|
189 |
<mapper type="regexp" from="[/\\]([^/\\]+)[/\\]?$" to="\1"/> <!-- #71849 --> |
191 |
<mapper type="regexp" from="[/\\]([^/\\]+)[/\\]?$" to="\1"/> <!-- #71849 --> |
190 |
</pathconvert> |
192 |
</pathconvert> |
191 |
|
193 |
|
192 |
<property name="build.launcher.dir" location="build/launcher"/> |
194 |
<property name="build.launcher.dir" location="${build.dir}/launcher"/> |
193 |
|
195 |
|
194 |
<mkdir dir="${build.launcher.dir}/etc"/> |
196 |
<mkdir dir="${build.launcher.dir}/etc"/> |
195 |
<mkdir dir="${build.launcher.dir}/bin"/> |
197 |
<mkdir dir="${build.launcher.dir}/bin"/> |
Lines 206-213
Link Here
|
206 |
</target> |
208 |
</target> |
207 |
|
209 |
|
208 |
<target name="build-zip" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform."> |
210 |
<target name="build-zip" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform."> |
209 |
<mkdir dir="dist"/> |
211 |
<mkdir dir="${dist.dir}"/> |
210 |
<zip destfile="dist/${app.name}.zip"> |
212 |
<zip destfile="${dist.dir}/${app.name}.zip"> |
211 |
<zipfileset dir="${build.launcher.dir}/bin/" filemode="755" prefix="${app.name}/bin"/> |
213 |
<zipfileset dir="${build.launcher.dir}/bin/" filemode="755" prefix="${app.name}/bin"/> |
212 |
<zipfileset dir="${build.launcher.dir}/etc/" prefix="${app.name}/etc"/> |
214 |
<zipfileset dir="${build.launcher.dir}/etc/" prefix="${app.name}/etc"/> |
213 |
<zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${app.name}"> |
215 |
<zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${app.name}"> |
Lines 231-256
Link Here
|
231 |
</zip> |
233 |
</zip> |
232 |
</target> |
234 |
</target> |
233 |
<target name="create-platform" depends="build-zip" description="Creates an unzipped platform from the suite, launchers, and selected modules from the platform."> |
235 |
<target name="create-platform" depends="build-zip" description="Creates an unzipped platform from the suite, launchers, and selected modules from the platform."> |
234 |
<mkdir dir="dist/${app.name}"/> |
236 |
<mkdir dir="${dist.dir}/${app.name}"/> |
235 |
<unzip src="dist/${app.name}.zip" dest="dist/${app.name}"> |
237 |
<unzip src="${dist.dir}/${app.name}.zip" dest="${dist.dir}/${app.name}"> |
236 |
<globmapper from="${app.name}/*" to="*"/> |
238 |
<globmapper from="${app.name}/*" to="*"/> |
237 |
</unzip> |
239 |
</unzip> |
238 |
</target> |
240 |
</target> |
239 |
|
241 |
|
240 |
<target name="build-mac" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform."> |
242 |
<target name="build-mac" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform."> |
241 |
<mkdir dir="dist"/> |
243 |
<mkdir dir="${dist.dir}"/> |
242 |
<mkdir dir="dist/${app.name}.app"/> |
244 |
<mkdir dir="${dist.dir}/${app.name}.app"/> |
243 |
<mkdir dir="dist/${app.name}.app/Contents"/> |
245 |
<mkdir dir="${dist.dir}/${app.name}.app/Contents"/> |
244 |
<mkdir dir="dist/${app.name}.app/Contents/MacOS"/> |
246 |
<mkdir dir="${dist.dir}/${app.name}.app/Contents/MacOS"/> |
245 |
<mkdir dir="dist/${app.name}.app/Contents/Resources"/> |
247 |
<mkdir dir="${dist.dir}/${app.name}.app/Contents/Resources"/> |
246 |
<copy file="${harness.dir}/etc/applicationIcon.icns" tofile="dist/${app.name}.app/Contents/Resources/${app.name}.icns"/> |
248 |
<copy file="${harness.dir}/etc/applicationIcon.icns" tofile="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}.icns"/> |
247 |
<copy todir="dist/${app.name}.app/Contents/Resources/${app.name}/bin"> |
249 |
<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/bin"> |
248 |
<fileset dir="${build.launcher.dir}/bin/" /> |
250 |
<fileset dir="${build.launcher.dir}/bin/" /> |
249 |
</copy> |
251 |
</copy> |
250 |
<copy todir="dist/${app.name}.app/Contents/Resources/${app.name}/etc"> |
252 |
<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/etc"> |
251 |
<fileset dir="${build.launcher.dir}/etc/" /> |
253 |
<fileset dir="${build.launcher.dir}/etc/" /> |
252 |
</copy> |
254 |
</copy> |
253 |
<copy todir="dist/${app.name}.app/Contents/Resources/${app.name}"> |
255 |
<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}"> |
254 |
<fileset dir="${netbeans.dest.dir}"> |
256 |
<fileset dir="${netbeans.dest.dir}"> |
255 |
<include name="**/lib/nbexec*"/> |
257 |
<include name="**/lib/nbexec*"/> |
256 |
</fileset> |
258 |
</fileset> |
Lines 264-284
Link Here
|
264 |
</and> |
266 |
</and> |
265 |
</fileset> |
267 |
</fileset> |
266 |
</copy> |
268 |
</copy> |
267 |
<copy todir="dist/${app.name}.app/Contents/Resources/${app.name}/${app.name}"> |
269 |
<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/${app.name}"> |
268 |
|
270 |
|
269 |
<fileset dir="${cluster}"/> |
271 |
<fileset dir="${cluster}"/> |
270 |
</copy> |
272 |
</copy> |
271 |
|
273 |
|
272 |
<copy verbose="true" failonerror="false" |
274 |
<copy verbose="true" failonerror="false" |
273 |
file="dist/${app.name}.app/Contents/Resources/${app.name}/${app.name}/etc/${app.name}.icns" |
275 |
file="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/${app.name}/etc/${app.name}.icns" |
274 |
tofile="dist/${app.name}.app/Contents/Resources/${app.name}.icns"/> |
276 |
tofile="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}.icns"/> |
275 |
|
277 |
|
276 |
<delete file="${basedir}/dist/${app.name}.app/Contents/MacOS/${app.name}"/> |
278 |
<delete file="${basedir}/dist/${app.name}.app/Contents/MacOS/${app.name}"/> |
277 |
<symlink link="${basedir}/dist/${app.name}.app/Contents/MacOS/${app.name}" resource="../Resources/${app.name}/bin/${app.name}"/> |
279 |
<symlink link="${basedir}/dist/${app.name}.app/Contents/MacOS/${app.name}" resource="../Resources/${app.name}/bin/${app.name}"/> |
278 |
<chmod file="dist/${app.name}.app/Contents/Resources/${app.name}/bin/${app.name}" perm="755"/> |
280 |
<chmod file="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/bin/${app.name}" perm="755"/> |
279 |
<chmod dir="dist" includes="${app.name}.app/Contents/Resources/${app.name}/platform*/lib/nbexec" perm="755"/> |
281 |
<chmod dir="${dist.dir}" includes="${app.name}.app/Contents/Resources/${app.name}/platform*/lib/nbexec" perm="755"/> |
280 |
|
282 |
|
281 |
<copy file="${harness.dir}/etc/Info.plist" tofile="dist/${app.name}.app/Contents/Info.plist"> |
283 |
<copy file="${harness.dir}/etc/Info.plist" tofile="${dist.dir}/${app.name}.app/Contents/Info.plist"> |
282 |
<filterchain> |
284 |
<filterchain> |
283 |
<replacestring from="$${app.name}" to="${app.name}"/> |
285 |
<replacestring from="$${app.name}" to="${app.name}"/> |
284 |
<replacestring from="$${app.version}" to="${app.version}"/> |
286 |
<replacestring from="$${app.version}" to="${app.version}"/> |
Lines 288-294
Link Here
|
288 |
</filterchain> |
290 |
</filterchain> |
289 |
</copy> |
291 |
</copy> |
290 |
<!-- zipping in ant doesn't preserve symlinks that seem to be required. |
292 |
<!-- zipping in ant doesn't preserve symlinks that seem to be required. |
291 |
zip destfile="dist/${app.name}-MacOS.zip" basedir="dist" includes="${app.name}.app/**" duplicate="preserve"/--> |
293 |
zip destfile="${dist.dir}/${app.name}-MacOS.zip" basedir="${dist.dir}" includes="${app.name}.app/**" duplicate="preserve"/--> |
292 |
<echo> |
294 |
<echo> |
293 |
You MacOS Application bundle was created at dist/${app.name}.app. For final packaging, use hdiutil or other tools to create a .dmg image. |
295 |
You MacOS Application bundle was created at dist/${app.name}.app. For final packaging, use hdiutil or other tools to create a .dmg image. |
294 |
Alternatively use "zip -yr ${app.name}.app" to create a simple zipped distribution. |
296 |
Alternatively use "zip -yr ${app.name}.app" to create a simple zipped distribution. |
Lines 296-302
Link Here
|
296 |
</target> |
298 |
</target> |
297 |
|
299 |
|
298 |
<target name="-testuserdir-delete-init" depends="-init"> |
300 |
<target name="-testuserdir-delete-init" depends="-init"> |
299 |
<property name="test.user.dir" location="build/testuserdir"/> |
301 |
<property name="test.user.dir" location="${build.dir}/testuserdir"/> |
300 |
<property name="test.user.dir.lock" location="${test.user.dir}/lock"/> |
302 |
<property name="test.user.dir.lock" location="${test.user.dir}/lock"/> |
301 |
<available property="app.running" file="${test.user.dir.lock}"/> |
303 |
<available property="app.running" file="${test.user.dir.lock}"/> |
302 |
</target> |
304 |
</target> |
Lines 313-324
Link Here
|
313 |
|
315 |
|
314 |
<target name="clean" depends="-init,testuserdir-delete" description="Clean everything."> |
316 |
<target name="clean" depends="-init,testuserdir-delete" description="Clean everything."> |
315 |
<delete failonerror="false" includeemptydirs="true"> |
317 |
<delete failonerror="false" includeemptydirs="true"> |
316 |
<fileset dir="build"> |
318 |
<fileset dir="${build.dir}"> |
317 |
<exclude name="testuserdir/"/> |
319 |
<exclude name="testuserdir/"/> |
318 |
</fileset> |
320 |
</fileset> |
319 |
</delete> |
321 |
</delete> |
320 |
<subant target="clean" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"/> |
322 |
<subant target="clean" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"/> |
321 |
<delete dir="dist"/> |
323 |
<delete dir="${dist.dir}"/> |
322 |
</target> |
324 |
</target> |
323 |
|
325 |
|
324 |
<target name="branding" depends="-init" if="run.branding"> |
326 |
<target name="branding" depends="-init" if="run.branding"> |