Attachment #57147 for bug #125602

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 125602
Collapse All | Expand All




        <property name="jnlp.master.dir" location="build/tmp/master-jnlp"/>
        <mkdir dir="${jnlp.master.dir}"/>
        
        <property name="dist.dir" location="dist"/>
        <property name="disabled.modules" value=""/>
        <property name="enabled.clusters" value=""/>
        <property name="disabled.clusters" value=""/>

 </servlet-mapping>
</web-app>         
]]></echo>
        <mkdir dir="${dist.dir}"/>
        <war basedir="${jnlp.dest.dir}" destfile="${dist.dir}/${app.name}.war" webxml="build/tmp/web.xml">
            <zipfileset dir="${jnlp.servlet.jar}/.." file="${jnlp.servlet.jar}" prefix="WEB-INF/lib"/>
        </war>
    </target>

    <target name="build-jnlp-local" depends="build-jnlp-nowar">
        <property name="build.jnlp.local.dir" location="${dist.dir}/jnlp/local"/>
        <mkdir dir="${build.jnlp.local.dir}"/>
        <mkdir dir="${build.jnlp.local.dir}/netbeans/"/>
        <mkdir dir="${build.jnlp.local.dir}/app/"/>




        <property name="disabled.clusters" value=""/>
        <property name="app.version" value="0.1"/>
        <property name="branding.dir" location="branding"/>
        <property name="dist.dir" location="dist"/>
        <condition property="run.branding"> <!-- #84689 -->
            <and>
                <available file="${branding.dir}" type="dir"/>

    </target>
    
    <target name="build-zip" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform.">
        <mkdir dir="${dist.dir}"/>
        <zip destfile="${dist.dir}/${app.name}.zip">
            <zipfileset dir="${build.launcher.dir}/bin/" filemode="755" prefix="${app.name}/bin"/>
            <zipfileset dir="${build.launcher.dir}/etc/" prefix="${app.name}/etc"/>
            <zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${app.name}">

        </zip>
    </target>
    <target name="create-platform" depends="build-zip" description="Creates an unzipped platform from the suite, launchers, and selected modules from the platform.">
        <mkdir dir="${dist.dir}/${app.name}"/>
        <unzip src="${dist.dir}/${app.name}.zip" dest="${dist.dir}/${app.name}">
            <globmapper from="${app.name}/*" to="*"/>
        </unzip>
    </target>
    
    <target name="build-mac" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform.">
        <mkdir dir="${dist.dir}"/>
        <mkdir dir="${dist.dir}/${app.name}.app"/>
        <mkdir dir="${dist.dir}/${app.name}.app/Contents"/>
        <mkdir dir="${dist.dir}/${app.name}.app/Contents/MacOS"/>
        <mkdir dir="${dist.dir}/${app.name}.app/Contents/Resources"/>
        <copy file="${harness.dir}/etc/applicationIcon.icns" tofile="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}.icns"/>
        <copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/bin">
            <fileset dir="${build.launcher.dir}/bin/" />
        </copy>
        <copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/etc">
            <fileset dir="${build.launcher.dir}/etc/" />
        </copy>
        <copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}">
            <fileset dir="${netbeans.dest.dir}">
                <include name="**/lib/nbexec*"/>
            </fileset>

                </and>
            </fileset>
        </copy>
        <copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/${app.name}">
            
            <fileset dir="${cluster}"/>
        </copy>
        
        <copy verbose="true" failonerror="false" 
              file="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/${app.name}/etc/${app.name}.icns" 
              tofile="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}.icns"/>
        
        <delete file="${basedir}/${dist.dir}/${app.name}.app/Contents/MacOS/${app.name}"/>
        <symlink link="${basedir}/${dist.dir}/${app.name}.app/Contents/MacOS/${app.name}" resource="../Resources/${app.name}/bin/${app.name}"/>
        <chmod file="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/bin/${app.name}" perm="755"/>
        <chmod dir="${dist.dir}" includes="${app.name}.app/Contents/Resources/${app.name}/platform*/lib/nbexec" perm="755"/>
        
        <copy file="${harness.dir}/etc/Info.plist" tofile="${dist.dir}/${app.name}.app/Contents/Info.plist">
            <filterchain>
                <replacestring from="$${app.name}" to="${app.name}"/>
                <replacestring from="$${app.version}" to="${app.version}"/>

        <!-- zipping in ant doesn't preserve symlinks that seem to be required.
        zip destfile="dist/${app.name}-MacOS.zip" basedir="dist" includes="${app.name}.app/**" duplicate="preserve"/-->
        <echo>
You MacOS Application bundle was created at ${dist.dir}/${app.name}.app. For final packaging, use hdiutil or other tools to create a .dmg image.
Alternatively use "zip -yr ${app.name}.app" to create a simple zipped distribution.
        </echo>    
    </target>    

            </fileset>
        </delete>
        <subant target="clean" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"/>
        <delete dir="${dist.dir}"/>
    </target>

    <target name="branding" depends="-init" if="run.branding">

Return to bug 125602

Lines 105-110 made subject to such option by the copyr Link Here

(-)a/apisupport.harness/release/jnlp.xml (-3 / +4 lines)
105	<property name="jnlp.master.dir" location="build/tmp/master-jnlp"/>	105	<property name="jnlp.master.dir" location="build/tmp/master-jnlp"/>
106	<mkdir dir="${jnlp.master.dir}"/>	106	<mkdir dir="${jnlp.master.dir}"/>
107		107
		108	<property name="dist.dir" location="dist"/>
108	<property name="disabled.modules" value=""/>	109	<property name="disabled.modules" value=""/>
109	<property name="enabled.clusters" value=""/>	110	<property name="enabled.clusters" value=""/>
110	<property name="disabled.clusters" value=""/>	111	<property name="disabled.clusters" value=""/>
Lines 221-234 made subject to such option by the copyr Link Here
221	</servlet-mapping>	222	</servlet-mapping>
222	</web-app>	223	</web-app>
223	]]></echo>	224	]]></echo>
224	<mkdir dir="dist"/>	225	<mkdir dir="${dist.dir}"/>
225	<war basedir="${jnlp.dest.dir}" destfile="dist/${app.name}.war" webxml="build/tmp/web.xml">	226	<war basedir="${jnlp.dest.dir}" destfile="${dist.dir}/${app.name}.war" webxml="build/tmp/web.xml">
226	<zipfileset dir="${jnlp.servlet.jar}/.." file="${jnlp.servlet.jar}" prefix="WEB-INF/lib"/>	227	<zipfileset dir="${jnlp.servlet.jar}/.." file="${jnlp.servlet.jar}" prefix="WEB-INF/lib"/>
227	</war>	228	</war>
228	</target>	229	</target>
229		230
230	<target name="build-jnlp-local" depends="build-jnlp-nowar">	231	<target name="build-jnlp-local" depends="build-jnlp-nowar">
231	<property name="build.jnlp.local.dir" location="dist/jnlp/local"/>	232	<property name="build.jnlp.local.dir" location="${dist.dir}/jnlp/local"/>
232	<mkdir dir="${build.jnlp.local.dir}"/>	233	<mkdir dir="${build.jnlp.local.dir}"/>
233	<mkdir dir="${build.jnlp.local.dir}/netbeans/"/>	234	<mkdir dir="${build.jnlp.local.dir}/netbeans/"/>
234	<mkdir dir="${build.jnlp.local.dir}/app/"/>	235	<mkdir dir="${build.jnlp.local.dir}/app/"/>

Lines 64-69 made subject to such option by the copyr Link Here

(-)a/apisupport.harness/release/suite.xml (-23 / +24 lines)
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="branding.dir" location="branding"/>	66	<property name="branding.dir" location="branding"/>
		67	<property name="dist.dir" location="dist"/>
67	<condition property="run.branding"> <!-- #84689 -->	68	<condition property="run.branding"> <!-- #84689 -->
68	<and>	69	<and>
69	<available file="${branding.dir}" type="dir"/>	70	<available file="${branding.dir}" type="dir"/>
Lines 206-213 made subject to such option by the copyr Link Here
206	</target>	207	</target>
207		208
208	<target name="build-zip" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform.">	209	<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"/>	210	<mkdir dir="${dist.dir}"/>
210	<zip destfile="dist/${app.name}.zip">	211	<zip destfile="${dist.dir}/${app.name}.zip">
211	<zipfileset dir="${build.launcher.dir}/bin/" filemode="755" prefix="${app.name}/bin"/>	212	<zipfileset dir="${build.launcher.dir}/bin/" filemode="755" prefix="${app.name}/bin"/>
212	<zipfileset dir="${build.launcher.dir}/etc/" prefix="${app.name}/etc"/>	213	<zipfileset dir="${build.launcher.dir}/etc/" prefix="${app.name}/etc"/>
213	<zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${app.name}">	214	<zipfileset dir="${netbeans.dest.dir}" filemode="755" prefix="${app.name}">
Lines 231-256 made subject to such option by the copyr Link Here
231	</zip>	232	</zip>
232	</target>	233	</target>
233	<target name="create-platform" depends="build-zip" description="Creates an unzipped platform from the suite, launchers, and selected modules from the platform.">	234	<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}"/>	235	<mkdir dir="${dist.dir}/${app.name}"/>
235	<unzip src="dist/${app.name}.zip" dest="dist/${app.name}">	236	<unzip src="${dist.dir}/${app.name}.zip" dest="${dist.dir}/${app.name}">
236	<globmapper from="${app.name}/" to=""/>	237	<globmapper from="${app.name}/" to=""/>
237	</unzip>	238	</unzip>
238	</target>	239	</target>
239		240
240	<target name="build-mac" depends="build,build-launchers" description="Builds a ZIP distribution of the suite, launchers, and selected modules from the platform.">	241	<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"/>	242	<mkdir dir="${dist.dir}"/>
242	<mkdir dir="dist/${app.name}.app"/>	243	<mkdir dir="${dist.dir}/${app.name}.app"/>
243	<mkdir dir="dist/${app.name}.app/Contents"/>	244	<mkdir dir="${dist.dir}/${app.name}.app/Contents"/>
244	<mkdir dir="dist/${app.name}.app/Contents/MacOS"/>	245	<mkdir dir="${dist.dir}/${app.name}.app/Contents/MacOS"/>
245	<mkdir dir="dist/${app.name}.app/Contents/Resources"/>	246	<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"/>	247	<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">	248	<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/bin">
248	<fileset dir="${build.launcher.dir}/bin/" />	249	<fileset dir="${build.launcher.dir}/bin/" />
249	</copy>	250	</copy>
250	<copy todir="dist/${app.name}.app/Contents/Resources/${app.name}/etc">	251	<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/etc">
251	<fileset dir="${build.launcher.dir}/etc/" />	252	<fileset dir="${build.launcher.dir}/etc/" />
252	</copy>	253	</copy>
253	<copy todir="dist/${app.name}.app/Contents/Resources/${app.name}">	254	<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}">
254	<fileset dir="${netbeans.dest.dir}">	255	<fileset dir="${netbeans.dest.dir}">
255	<include name="*/lib/nbexec"/>	256	<include name="*/lib/nbexec"/>
256	</fileset>	257	</fileset>
Lines 264-284 made subject to such option by the copyr Link Here
264	</and>	265	</and>
265	</fileset>	266	</fileset>
266	</copy>	267	</copy>
267	<copy todir="dist/${app.name}.app/Contents/Resources/${app.name}/${app.name}">	268	<copy todir="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}/${app.name}">
268		269
269	<fileset dir="${cluster}"/>	270	<fileset dir="${cluster}"/>
270	</copy>	271	</copy>
271		272
272	<copy verbose="true" failonerror="false"	273	<copy verbose="true" failonerror="false"
273	file="dist/${app.name}.app/Contents/Resources/${app.name}/${app.name}/etc/${app.name}.icns"	274	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"/>	275	tofile="${dist.dir}/${app.name}.app/Contents/Resources/${app.name}.icns"/>
275		276
276	<delete file="${basedir}/dist/${app.name}.app/Contents/MacOS/${app.name}"/>	277	<delete file="${basedir}/${dist.dir}/${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}"/>	278	<symlink link="${basedir}/${dist.dir}/${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"/>	279	<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"/>	280	<chmod dir="${dist.dir}" includes="${app.name}.app/Contents/Resources/${app.name}/platform*/lib/nbexec" perm="755"/>
280		281
281	<copy file="${harness.dir}/etc/Info.plist" tofile="dist/${app.name}.app/Contents/Info.plist">	282	<copy file="${harness.dir}/etc/Info.plist" tofile="${dist.dir}/${app.name}.app/Contents/Info.plist">
282	<filterchain>	283	<filterchain>
283	<replacestring from="$${app.name}" to="${app.name}"/>	284	<replacestring from="$${app.name}" to="${app.name}"/>
284	<replacestring from="$${app.version}" to="${app.version}"/>	285	<replacestring from="$${app.version}" to="${app.version}"/>
Lines 290-296 made subject to such option by the copyr Link Here
290	<!-- zipping in ant doesn't preserve symlinks that seem to be required.	291	<!-- 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"/-->	292	zip destfile="dist/${app.name}-MacOS.zip" basedir="dist" includes="${app.name}.app/**" duplicate="preserve"/-->
292	<echo>	293	<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.	294	You MacOS Application bundle was created at ${dist.dir}/${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.	295	Alternatively use "zip -yr ${app.name}.app" to create a simple zipped distribution.
295	</echo>	296	</echo>
296	</target>	297	</target>
Lines 318-324 Alternatively use "zip -yr ${app.name}.a Link Here
318	</fileset>	319	</fileset>
319	</delete>	320	</delete>
320	<subant target="clean" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"/>	321	<subant target="clean" buildpath="${modules.sorted}" inheritrefs="false" inheritall="false"/>
321	<delete dir="dist"/>	322	<delete dir="${dist.dir}"/>
322	</target>	323	</target>
323		324
324	<target name="branding" depends="-init" if="run.branding">	325	<target name="branding" depends="-init" if="run.branding">