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

(-)apisupport/harness/release/build.xml (-10 / +12 lines)
Lines 56-87 Link Here
56
    </target>
56
    </target>
57
57
58
    <target name="basic-init" depends="projectized-common.basic-init">
58
    <target name="basic-init" depends="projectized-common.basic-init">
59
        <property name="build.dir" value="build" />
60
    
59
        <!-- Must be done even without build-init, or clean will not work. -->
61
        <!-- Must be done even without build-init, or clean will not work. -->
60
        <condition property="cluster" value="${suite.dir}/build/cluster"> <!-- #59872 -->
62
        <condition property="cluster" value="${suite.dir}/${build.dir}/cluster"> <!-- #59872 -->
61
            <isset property="suite.dir"/>
63
            <isset property="suite.dir"/>
62
        </condition>
64
        </condition>
63
        <property name="cluster" location="build/cluster"/>
65
        <property name="cluster" location="${build.dir}/cluster"/>
64
        
66
        
65
        <condition property="test.dist.dir" value="${suite.dir}/build/testdist">
67
        <condition property="test.dist.dir" value="${suite.dir}/${build.dir}/testdist">
66
            <isset property="suite.dir"/>
68
            <isset property="suite.dir"/>
67
        </condition>
69
        </condition>
68
        <property name="test.dist.dir" location="build/testdist"/>
70
        <property name="test.dist.dir" location="${build.dir}/testdist"/>
69
        
71
        
70
    </target>
72
    </target>
71
    
73
    
72
    <target name="init" depends="basic-init,files-init,build-init"/>
74
    <target name="init" depends="basic-init,files-init,build-init"/>
73
75
74
    <target name="nbm-license-init" unless="license.file">
76
    <target name="nbm-license-init" unless="license.file">
75
        <mkdir dir="build"/>
77
        <mkdir dir="${build.dir}"/>
76
        <property name="license.file" location="build/no-license.txt"/>
78
        <property name="license.file" location="${build.dir}/no-license.txt"/>
77
        <echo file="${license.file}">[NO LICENSE SPECIFIED]</echo>
79
        <echo file="${license.file}">[NO LICENSE SPECIFIED]</echo>
78
    </target>
80
    </target>
79
81
80
    <target name="build-init" depends="basic-init,nbm-license-init">
82
    <target name="build-init" depends="basic-init,nbm-license-init">
81
        <condition property="public.package.jar.dir" value="${suite.dir}/build/public-package-jars">
83
        <condition property="public.package.jar.dir" value="${suite.dir}/${build.dir}/public-package-jars">
82
            <isset property="suite.dir"/>
84
            <isset property="suite.dir"/>
83
        </condition>
85
        </condition>
84
        <property name="public.package.jar.dir" location="build/public-package-jars"/>
86
        <property name="public.package.jar.dir" location="${build.dir}/public-package-jars"/>
85
        <mkdir dir="${public.package.jar.dir}"/>
87
        <mkdir dir="${public.package.jar.dir}"/>
86
        <!-- Similar to projectized.xml but does not try to set NBM homepage/distribution, nor is javahelp.excludes predefined. -->
88
        <!-- Similar to projectized.xml but does not try to set NBM homepage/distribution, nor is javahelp.excludes predefined. -->
87
        <parseprojectxml
89
        <parseprojectxml
Lines 124-130 Link Here
124
        <property name="build.package.index" value="false"/>
126
        <property name="build.package.index" value="false"/>
125
        <property name="manifest.mf" location="manifest.mf"/>
127
        <property name="manifest.mf" location="manifest.mf"/>
126
        <property name="src.dir" location="src"/>
128
        <property name="src.dir" location="src"/>
127
        <property name="build.classes.dir" location="build/classes"/>
129
        <property name="build.classes.dir" location="${build.dir}/classes"/>
128
        <property name="nbm" value="${code.name.base.dashes}.nbm"/>
130
        <property name="nbm" value="${code.name.base.dashes}.nbm"/>
129
        <property name="nbm.module.author" value=""/>
131
        <property name="nbm.module.author" value=""/>
130
        <property name="nbm.release.date" value=""/>
132
        <property name="nbm.release.date" value=""/>
Lines 137-143 Link Here
137
            <pathelement path="${module.classpath}"/>
139
            <pathelement path="${module.classpath}"/>
138
            <pathelement path="${cp.extra}"/>
140
            <pathelement path="${cp.extra}"/>
139
        </path>
141
        </path>
140
        <property name="build.javahelp.dir" location="build/javahelp"/>
142
        <property name="build.javahelp.dir" location="${build.dir}/javahelp"/>
141
        <property name="javahelp.base" value="${code.name.base.slashes}/docs"/>
143
        <property name="javahelp.base" value="${code.name.base.slashes}/docs"/>
142
        <property name="javahelp.search" value="JavaHelpSearch"/>
144
        <property name="javahelp.search" value="JavaHelpSearch"/>
143
    </target>
145
    </target>
(-)apisupport/harness/release/jnlp.xml (-11 / +14 lines)
Lines 49-54 Link Here
49
    <!-- if not specified, assign all codebases to value suitable for jnlp-servlet.jar -->
49
    <!-- if not specified, assign all codebases to value suitable for jnlp-servlet.jar -->
50
    <property name="jnlp.codebase" value="$$$$codebase" />
50
    <property name="jnlp.codebase" value="$$$$codebase" />
51
    <property name="jnlp.codebase.app" value="$$$$codebase" />
51
    <property name="jnlp.codebase.app" value="$$$$codebase" />
52
    
53
    <property name="build.dir" value="build" />
54
    <property name="dist.dir" value="dist" />
52
55
53
    <target name="-check-for-master.jnlp">
56
    <target name="-check-for-master.jnlp">
54
        <available file="master.jnlp" property="master.jnlp.exists"/>
57
        <available file="master.jnlp" property="master.jnlp.exists"/>
Lines 101-108 Link Here
101
    <target name="jnlp-init" depends="jnlp-init-generate-master">
104
    <target name="jnlp-init" depends="jnlp-init-generate-master">
102
        <fail unless="app.name">Must have set at least an application name ('app.name')</fail>
105
        <fail unless="app.name">Must have set at least an application name ('app.name')</fail>
103
        
106
        
104
        <property name="jnlp.dest.dir" location="build/jnlp"/>
107
        <property name="jnlp.dest.dir" location="${build.dir}/jnlp"/>
105
        <property name="jnlp.master.dir" location="build/tmp/master-jnlp"/>
108
        <property name="jnlp.master.dir" location="${build.dir}/tmp/master-jnlp"/>
106
        <mkdir dir="${jnlp.master.dir}"/>
109
        <mkdir dir="${jnlp.master.dir}"/>
107
        
110
        
108
        <property name="disabled.modules" value=""/>
111
        <property name="disabled.modules" value=""/>
Lines 127-133 Link Here
127
            </and>
130
            </and>
128
        </fileset>
131
        </fileset>
129
        <property name="jnlp.sign.jars" value="true"/>
132
        <property name="jnlp.sign.jars" value="true"/>
130
        <property name="jnlp.signjar.keystore" location="build/default.keystore"/>
133
        <property name="jnlp.signjar.keystore" location="${build.dir}/default.keystore"/>
131
        <property name="jnlp.signjar.alias" value="jnlp"/>
134
        <property name="jnlp.signjar.alias" value="jnlp"/>
132
        <property name="jnlp.signjar.password" value="netbeans"/>
135
        <property name="jnlp.signjar.password" value="netbeans"/>
133
        <available property="jnlp.signjar.keystore.exists" file="${jnlp.signjar.keystore}"/>
136
        <available property="jnlp.signjar.keystore.exists" file="${jnlp.signjar.keystore}"/>
Lines 209-215 Link Here
209
            </condition>
212
            </condition>
210
        </fail>
213
        </fail>
211
        
214
        
212
        <echo file="build/tmp/web.xml"><![CDATA[
215
        <echo file="${build.dir}/tmp/web.xml"><![CDATA[
213
<web-app>
216
<web-app>
214
 <servlet>
217
 <servlet>
215
    <servlet-name>JnlpDownloadServlet</servlet-name>
218
    <servlet-name>JnlpDownloadServlet</servlet-name>
Lines 221-248 Link Here
221
 </servlet-mapping>
224
 </servlet-mapping>
222
</web-app>         
225
</web-app>         
223
]]></echo>
226
]]></echo>
224
        <mkdir dir="dist"/>
227
        <mkdir dir="${dist.dir}"/>
225
        <war basedir="${jnlp.dest.dir}" destfile="dist/${app.name}.war" webxml="build/tmp/web.xml">
228
        <war basedir="${jnlp.dest.dir}" destfile="${dist.dir}/${app.name}.war" webxml="${build.dir}/tmp/web.xml">
226
            <zipfileset dir="${jnlp.servlet.jar}/.." file="${jnlp.servlet.jar}" prefix="WEB-INF/lib"/>
229
            <zipfileset dir="${jnlp.servlet.jar}/.." file="${jnlp.servlet.jar}" prefix="WEB-INF/lib"/>
227
        </war>
230
        </war>
228
    </target>
231
    </target>
229
232
230
    <target name="build-jnlp-local" depends="build-jnlp-nowar">
233
    <target name="build-jnlp-local" depends="build-jnlp-nowar">
231
        <property name="build.jnlp.local.dir" location="dist/jnlp/local"/>
234
        <property name="build.jnlp.local.dir" location="${dist.dir}/jnlp/local"/>
232
        <mkdir dir="${build.jnlp.local.dir}"/>
235
        <mkdir dir="${build.jnlp.local.dir}"/>
233
        <mkdir dir="${build.jnlp.local.dir}/netbeans/"/>
236
        <mkdir dir="${build.jnlp.local.dir}/netbeans/"/>
234
        <mkdir dir="${build.jnlp.local.dir}/app/"/>
237
        <mkdir dir="${build.jnlp.local.dir}/app/"/>
235
        
238
        
236
        <makeurl property="build.jnlp.local.url" file="${build.jnlp.local.dir}"/>
239
        <makeurl property="build.jnlp.local.url" file="${build.jnlp.local.dir}"/>
237
        <copy todir="${build.jnlp.local.dir}">
240
        <copy todir="${build.jnlp.local.dir}">
238
            <fileset dir="build/jnlp">
241
            <fileset dir="${build.dir}/jnlp">
239
                <include name="*.jnlp"/>
242
                <include name="*.jnlp"/>
240
            </fileset>
243
            </fileset>
241
            <filterchain>
244
            <filterchain>
242
                <replacestring from="$$$$codebase" to="${build.jnlp.local.url}"/>
245
                <replacestring from="$$$$codebase" to="${build.jnlp.local.url}"/>
243
            </filterchain>
246
            </filterchain>
244
        </copy>
247
        </copy>
245
        <mkdir dir="build/jnlp/netbeans"/> <!-- else fileset will croak -->
248
        <mkdir dir="${build.dir}/jnlp/netbeans"/> <!-- else fileset will croak -->
246
        <copy todir="${build.jnlp.local.dir}/netbeans/">
249
        <copy todir="${build.jnlp.local.dir}/netbeans/">
247
            <fileset dir="build/jnlp/netbeans">
250
            <fileset dir="build/jnlp/netbeans">
248
                <include name="**/*.jnlp"/>
251
                <include name="**/*.jnlp"/>
Lines 252-258 Link Here
252
            </filterchain>
255
            </filterchain>
253
        </copy>
256
        </copy>
254
        <copy todir="${build.jnlp.local.dir}/app/">
257
        <copy todir="${build.jnlp.local.dir}/app/">
255
            <fileset dir="build/jnlp/app">
258
            <fileset dir="${build.dir}/jnlp/app">
256
                <include name="**/*.jnlp"/>
259
                <include name="**/*.jnlp"/>
257
            </fileset>
260
            </fileset>
258
            <filterchain>
261
            <filterchain>
Lines 260-266 Link Here
260
            </filterchain>
263
            </filterchain>
261
        </copy>
264
        </copy>
262
        <copy todir="${build.jnlp.local.dir}">
265
        <copy todir="${build.jnlp.local.dir}">
263
            <fileset dir="build/jnlp">
266
            <fileset dir="${build.dir}/jnlp">
264
                <exclude name="**/*.jnlp"/>
267
                <exclude name="**/*.jnlp"/>
265
            </fileset>
268
            </fileset>
266
        </copy>
269
        </copy>
(-)apisupport/harness/release/run.xml (-2 / +4 lines)
Lines 43-53 Link Here
43
<project name="run" basedir=".">
43
<project name="run" basedir=".">
44
44
45
    <target name="-init">
45
    <target name="-init">
46
        <property name="build.dir" value="build"/>    
47
    
46
        <property name="run.jdkhome" location="${nbjdk.home}"/>
48
        <property name="run.jdkhome" location="${nbjdk.home}"/>
47
        <condition property="test.user.dir" value="${suite.dir}/build/testuserdir">
49
        <condition property="test.user.dir" value="${suite.dir}/${build.dir}/testuserdir">
48
            <isset property="suite.dir"/>
50
            <isset property="suite.dir"/>
49
        </condition>
51
        </condition>
50
        <property name="test.user.dir" location="build/testuserdir"/>
52
        <property name="test.user.dir" location="${build.dir}/testuserdir"/>
51
        <property name="install" location="${netbeans.dest.dir}"/>
53
        <property name="install" location="${netbeans.dest.dir}"/>
52
        <property name="run.args.common" value='--userdir "${test.user.dir}" -J-Dnetbeans.logger.console=true -J-ea'/>
54
        <property name="run.args.common" value='--userdir "${test.user.dir}" -J-Dnetbeans.logger.console=true -J-ea'/>
53
        <!-- In case run from a suite module, to get app.name and/or branding.token: -->
55
        <!-- In case run from a suite module, to get app.name and/or branding.token: -->
(-)apisupport/harness/release/suite.xml (-25 / +27 lines)
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">

Return to bug 125602