|
Lines 224-368
Link Here
|
| 224 |
<target name="compareAttribs"> |
224 |
<target name="compareAttribs"> |
| 225 |
<!--poll file for change in attributes--> |
225 |
<!--poll file for change in attributes--> |
| 226 |
<exec dir="${buildDirectory}" executable="${signpoll}" outputProperty="polledAttribs"> |
226 |
<exec dir="${buildDirectory}" executable="${signpoll}" outputProperty="polledAttribs"> |
| 227 |
<arg line="${signpollline}" /> |
227 |
<arg line="${signpollline}" /> |
| 228 |
</exec> |
228 |
</exec> |
| 229 |
<echo message="original: ${originalAttribs}" /> |
229 |
<echo message="original: ${originalAttribs}" /> |
| 230 |
<condition property="attribChanged"> |
230 |
<condition property="attribChanged"> |
| 231 |
<and> |
231 |
<and> |
| 232 |
<not> |
232 |
<not> |
| 233 |
<contains string="${polledAttribs}" substring="Permission denied, please try again." casesensitive="no" /> |
233 |
<contains string="${polledAttribs}" substring="Permission denied, please try again." casesensitive="no" /> |
| 234 |
</not> |
234 |
</not> |
|
|
235 |
<not> |
| 236 |
<contains string="${polledAttribs}" substring="Host key verification failed." casesensitive="no" /> |
| 237 |
</not> |
| 238 |
<or> |
| 235 |
<not> |
239 |
<not> |
| 236 |
<contains string="${polledAttribs}" substring="Host key verification failed." casesensitive="no" /> |
240 |
<contains string="${polledAttribs}" substring="No such file or directory" casesensitive="no" /> |
| 237 |
</not> |
241 |
</not> |
| 238 |
<or> |
242 |
<contains string="${polledAttribs}" substring="bash: line 0: cd:" casesensitive="no" /> |
| 239 |
<not> |
243 |
</or> |
| 240 |
<contains string="${polledAttribs}" substring="No such file or directory" casesensitive="no" /> |
244 |
</and> |
| 241 |
</not> |
245 |
</condition> |
| 242 |
<contains string="${polledAttribs}" substring="bash: line 0: cd:" casesensitive="no" /> |
246 |
<echo message="polled: ${polledAttribs}" /> |
| 243 |
</or> |
247 |
<antcall target="writeDiffResult" /> |
| 244 |
</and> |
248 |
<sleep seconds="120" /> |
| 245 |
</condition> |
249 |
<available property="attribs.changed" file="${buildDirectory}/attribDiff.txt" /> |
| 246 |
<echo message="polled: ${polledAttribs}" /> |
250 |
<antcall target="waitForChangedAttribs" /> |
| 247 |
<antcall target="writeDiffResult" /> |
251 |
</target> |
| 248 |
<sleep seconds="120" /> |
252 |
|
| 249 |
<available property="attribs.changed" file="${buildDirectory}/attribDiff.txt" /> |
253 |
<target name="writeDiffResult" if="attribChanged"> |
| 250 |
<antcall target="waitForChangedAttribs" /> |
254 |
<echo message="original: ${originalAttribs}" file="${buildDirectory}/attribDiff.txt" /> |
| 251 |
</target> |
255 |
<echo message="new: ${polledAttribs}" file="${buildDirectory}/attribDiff.txt" append="true" /> |
| 252 |
|
256 |
</target> |
| 253 |
<target name="writeDiffResult" if="attribChanged"> |
257 |
|
| 254 |
<echo message="original: ${originalAttribs}" file="${buildDirectory}/attribDiff.txt" /> |
258 |
<target name="updatePackProperties"> |
| 255 |
<echo message="new: ${polledAttribs}" file="${buildDirectory}/attribDiff.txt" append="true" /> |
259 |
<!--exclude pre-built Orbit bundles from being signed and packed--> |
| 256 |
</target> |
260 |
<property name="packproperties" value="${buildDirectory}/updatePackProperties.txt" /> |
| 257 |
|
261 |
<generateExcludeList mapFile="${buildDirectory}/maps/org.eclipse.releng/maps/orbit.map" outputFile="${packproperties}" /> |
| 258 |
<target name="updatePackProperties"> |
262 |
<loadfile property="pack.properties" srcFile="${packproperties}" /> |
| 259 |
<!--exclude pre-built Orbit bundles from being signed and packed--> |
263 |
<delete file="${packproperties}" failonerror="false" /> |
| 260 |
<property name="packproperties" value="${buildDirectory}/updatePackProperties.txt" /> |
264 |
<replace file="${eclipse.build.configs}/../../extras/pack.properties" token="@excludejars@" value="${pack.properties}" /> |
| 261 |
<generateExcludeList mapFile="${buildDirectory}/maps/org.eclipse.releng/maps/orbit.map" outputFile="${packproperties}" /> |
265 |
<property name="archiveName" value="eclipse-master-${buildId}.zip" /> |
| 262 |
<loadfile property="pack.properties" srcFile="${packproperties}" /> |
266 |
<!-- add pack.properties file that specifies effort level --> |
| 263 |
<delete file="${packproperties}" failonerror="false" /> |
267 |
<exec dir="${eclipse.build.configs}/../../extras" executable="zip"> |
| 264 |
<replace file="${eclipse.build.configs}/../../extras/pack.properties" token="@excludejars@" value="${pack.properties}" /> |
268 |
<arg line="-r ${buildDirectory}/${buildLabel}/${archiveName} pack.properties" /> |
| 265 |
<property name="archiveName" value="eclipse-master-${buildId}.zip" /> |
269 |
</exec> |
| 266 |
<!-- add pack.properties file that specifies effort level --> |
270 |
</target> |
| 267 |
<exec dir="${eclipse.build.configs}/../../extras" executable="zip"> |
271 |
|
| 268 |
<arg line="-r ${buildDirectory}/${buildLabel}/${archiveName} pack.properties" /> |
272 |
<target name="signMasterFeature" if="sign"> |
| 269 |
</exec> |
273 |
<property name="packtmp" value="${buildDirectory}/packtmp" /> |
| 270 |
</target> |
274 |
<property name="stagingDirectoryOutput" value="/home/data/httpd/download-staging.priv/eclipse/${buildId}-out" /> |
| 271 |
|
275 |
<property name="stagingDirectory" value="/home/data/httpd/download-staging.priv/eclipse" /> |
| 272 |
<target name="signMasterFeature" if="sign"> |
276 |
<property name="archiveName" value="eclipse-master-${buildId}.zip" /> |
| 273 |
<property name="packtmp" value="${buildDirectory}/packtmp" /> |
277 |
<property name="outputFile" value="${stagingDirectoryOutput}/${archiveName}" /> |
| 274 |
<property name="stagingDirectoryOutput" value="/home/data/httpd/download-staging.priv/eclipse/${buildId}-out" /> |
278 |
<mkdir dir="${packtmp}" /> |
| 275 |
<property name="stagingDirectory" value="/home/data/httpd/download-staging.priv/eclipse" /> |
279 |
<move file="${buildDirectory}/${buildLabel}/${archiveName}" tofile="${packtmp}/${archiveName}" /> |
| 276 |
<property name="archiveName" value="eclipse-master-${buildId}.zip" /> |
280 |
|
| 277 |
<property name="outputFile" value="${stagingDirectoryOutput}/${archiveName}" /> |
281 |
<!--push drop to staging directory--> |
| 278 |
<mkdir dir="${packtmp}" /> |
282 |
<echo message="push drop to staging directory" /> |
| 279 |
<move file="${buildDirectory}/${buildLabel}/${archiveName}" tofile="${packtmp}/${archiveName}" /> |
283 |
|
| 280 |
|
284 |
<condition property="signcopy" value="cp"> |
| 281 |
<!--push drop to staging directory--> |
285 |
<equals arg1="${hudson}" arg2="true" /> |
| 282 |
<echo message="push drop to staging directory" /> |
286 |
</condition> |
| 283 |
|
287 |
<property name="signcopy" value="scp" /> |
| 284 |
<condition property="signcopy" value="cp"> |
288 |
|
| 285 |
<equals arg1="${hudson}" arg2="true" /> |
289 |
<condition property="signexec" value="/bin/bash"> |
| 286 |
</condition> |
290 |
<equals arg1="${hudson}" arg2="true" /> |
| 287 |
<property name="signcopy" value="scp" /> |
291 |
</condition> |
| 288 |
|
292 |
<property name="signexec" value="ssh" /> |
| 289 |
<condition property="signexec" value="/bin/bash"> |
293 |
|
| 290 |
<equals arg1="${hudson}" arg2="true" /> |
294 |
<condition property="signhost" value=""> |
| 291 |
</condition> |
295 |
<equals arg1="${hudson}" arg2="true" /> |
| 292 |
<property name="signexec" value="ssh" /> |
296 |
</condition> |
| 293 |
|
297 |
<property name="signhost" value="build.eclipse.org" /> |
| 294 |
<condition property="signhost" value=""> |
298 |
|
| 295 |
<equals arg1="${hudson}" arg2="true" /> |
299 |
<condition property="signdelimiter" value=""> |
| 296 |
</condition> |
300 |
<equals arg1="${hudson}" arg2="true" /> |
| 297 |
<property name="signhost" value="build.eclipse.org" /> |
301 |
</condition> |
| 298 |
|
302 |
<property name="signdelimiter" value=":" /> |
| 299 |
<condition property="signdelimiter" value=""> |
303 |
|
| 300 |
<equals arg1="${hudson}" arg2="true" /> |
304 |
<condition property="signquote" value=""> |
| 301 |
</condition> |
305 |
<equals arg1="${hudson}" arg2="true" /> |
| 302 |
<property name="signdelimiter" value=":" /> |
306 |
</condition> |
| 303 |
|
307 |
<property name="signquote" value=""" /> |
| 304 |
<condition property="signquote" value=""> |
308 |
|
| 305 |
<equals arg1="${hudson}" arg2="true" /> |
309 |
<condition property="signpoll" value="ls"> |
| 306 |
</condition> |
310 |
<equals arg1="${hudson}" arg2="true" /> |
| 307 |
<property name="signquote" value=""" /> |
311 |
</condition> |
| 308 |
|
312 |
<property name="signpoll" value="ssh" /> |
| 309 |
<condition property="signpoll" value="ls"> |
313 |
|
| 310 |
<equals arg1="${hudson}" arg2="true" /> |
314 |
<exec dir="${packtmp}" executable="${signcopy}" output="signing.txt"> |
| 311 |
</condition> |
315 |
<arg line="${archiveName} ${signhost}${signdelimiter}${stagingDirectory}" /> |
| 312 |
<property name="signpoll" value="ssh" /> |
316 |
</exec> |
| 313 |
|
317 |
|
| 314 |
<exec dir="${packtmp}" executable="${signcopy}" output="signing.txt"> |
318 |
<exec dir="${buildDirectory}" executable="${signexec}" output="signing.txt" append="true"> |
| 315 |
<arg line="${archiveName} ${signhost}${signdelimiter}${stagingDirectory}" /> |
319 |
<arg line="${signhost} /bin/chmod ugo+rw ${stagingDirectory}/${archiveName}" /> |
| 316 |
</exec> |
320 |
</exec> |
| 317 |
|
321 |
|
| 318 |
<exec dir="${buildDirectory}" executable="${signexec}" output="signing.txt" append="true"> |
322 |
<!--invoke sign script and wait--> |
| 319 |
<arg line="${signhost} /bin/chmod ugo+rw ${stagingDirectory}/${archiveName}" /> |
323 |
<echo message="invoke sign script and wait" /> |
| 320 |
</exec> |
324 |
<exec dir="." executable="${signexec}" output="signing.txt" append="true"> |
| 321 |
|
325 |
<arg line="${signhost} ${signquote}/usr/bin/sign ${stagingDirectory}/${archiveName} mail ${stagingDirectoryOutput}${signquote}" /> |
| 322 |
<!--invoke sign script and wait--> |
326 |
</exec> |
| 323 |
<echo message="invoke sign script and wait" /> |
327 |
|
| 324 |
<exec dir="." executable="${signexec}" output="signing.txt" append="true"> |
328 |
<!--Wait for build to be available --> |
| 325 |
<arg line="${signhost} ${signquote}/usr/bin/sign ${stagingDirectory}/${archiveName} mail ${stagingDirectoryOutput}${signquote}" /> |
329 |
<condition property="signpollline" value="${stagingDirectoryOutput}/${archiveName}"> |
| 326 |
</exec> |
330 |
<equals arg1="${hudson}" arg2="true" /> |
| 327 |
|
331 |
</condition> |
| 328 |
<!--Wait for build to be available --> |
332 |
<property name="signpollline" value="${signhost}; ls ${stagingDirectoryOutput}/${archiveName}" /> |
| 329 |
<condition property="signpollline" value="${stagingDirectoryOutput}/${archiveName}"> |
333 |
|
| 330 |
<equals arg1="${hudson}" arg2="true" /> |
334 |
<antcall target="waitForChangedAttribs"> |
| 331 |
</condition> |
335 |
<param name="signpoll" value="${signpoll}" /> |
| 332 |
<property name="signpollline" value="${signhost} ${signquote}ls ${stagingDirectoryOutput}/${archiveName}" /> |
336 |
<param name="signpollline" value="${signpollline}" /> |
| 333 |
|
337 |
</antcall> |
| 334 |
<antcall target="waitForChangedAttribs"> |
338 |
|
| 335 |
<param name="signpoll" value="${signpoll}" /> |
339 |
<!--copy zip back to build machine --> |
| 336 |
<param name="signpollline" value="${signpollline}" /> |
340 |
<sleep minutes="2" /> |
| 337 |
</antcall> |
341 |
<echo message="copy zip back to build machine" /> |
| 338 |
|
342 |
<exec dir="." executable="${signcopy}" output="signing.txt" append="true"> |
| 339 |
<!--copy zip back to build machine --> |
343 |
<arg line="${signhost}${signdelimiter}${stagingDirectory}/${buildId}-out/${archiveName} ${buildDirectory}/${buildLabel}" /> |
| 340 |
<sleep minutes="2" /> |
344 |
</exec> |
| 341 |
<echo message="copy zip back to build machine" /> |
345 |
|
| 342 |
<exec dir="." executable="${signcopy}" output="signing.txt" append="true"> |
346 |
<echo message="delete temp files on build.eclipse.org" /> |
| 343 |
<arg line="${signhost}${signdelimiter}${stagingDirectory}/${buildId}-out/${archiveName} ${buildDirectory}/${buildLabel}" /> |
347 |
<condition property="signdeleteline" value="/bin/rm -rf ${stagingDirectory}/${buildId}-out ${stagingDirectory}/${archiveName}"> |
| 344 |
</exec> |
348 |
<equals arg1="${hudson}" arg2="true" /> |
| 345 |
|
349 |
</condition> |
| 346 |
<!--delete files on build.eclipse.org--> |
350 |
<property name="signdeleteline" value="${signhost} ${signquote}/bin/rm -rf ${stagingDirectory}/${buildId}-out ${stagingDirectory}/${archiveName}${signquote}" /> |
| 347 |
<echo message="delete temp files on build.eclipse.org" /> |
351 |
<exec dir="." executable="${signexec}" output="signing.txt" append="true"> |
| 348 |
<exec dir="." executable="${signexec}" output="signing.txt" append="true"> |
352 |
<arg line="${signdeleteline}" /> |
| 349 |
<arg line="${signhost} ${signquote}/bin/rm -rf ${stagingDirectory}/${buildId}-out ${stagingDirectory}/${archiveName}${signquote}" /> |
353 |
</exec> |
| 350 |
</exec> |
354 |
</target> |
| 351 |
</target> |
355 |
|
| 352 |
|
356 |
<target name="testEclipse"> |
| 353 |
<target name="testEclipse"> |
357 |
<parallel> |
| 354 |
<parallel> |
358 |
<ant antfile="eclipse/helper.xml" target="testAll" /> |
| 355 |
<ant antfile="eclipse/helper.xml" target="testAll" /> |
359 |
</parallel> |
| 356 |
</parallel> |
360 |
</target> |
| 357 |
</target> |
361 |
|
| 358 |
|
362 |
<target name="apiTooling"> |
| 359 |
<target name="apiTooling"> |
363 |
<property name="reference" value="${buildDirectory}/apitooolingreference" /> |
| 360 |
<property name="reference" value="${buildDirectory}/apitooolingreference" /> |
364 |
<mkdir dir="${reference}" /> |
| 361 |
<mkdir dir="${reference}" /> |
365 |
<property name="report" value="${postingDirectory}/${buildLabel}/apitools" /> |
| 362 |
<property name="report" value="${postingDirectory}/${buildLabel}/apitools" /> |
366 |
<mkdir dir="${report}" /> |
| 363 |
<mkdir dir="${report}" /> |
367 |
<property name="current_location" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-win32.zip" /> |
| 364 |
<property name="current_location" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-win32.zip" /> |
368 |
<!-- <property name="reference_location" value="${reference}/eclipse-SDK-3.5M6-win32.zip" /> |
| 365 |
<!-- <property name="reference_location" value="${reference}/eclipse-SDK-3.5M6-win32.zip" /> |
|
|
| 366 |
<exec executable="/usr/bin/wget" dir="${reference}" output="${reference}/error.txt" failonerror="false" os="Linux"> |
369 |
<exec executable="/usr/bin/wget" dir="${reference}" output="${reference}/error.txt" failonerror="false" os="Linux"> |
| 367 |
<arg line="-q -O ${reference_location} http://fullmoon.ottawa.ibm.com/downloads/drops/S-3.5M6-200903130100/eclipse-SDK-3.5M6-win32.zip" /> |
370 |
<arg line="-q -O ${reference_location} http://fullmoon.ottawa.ibm.com/downloads/drops/S-3.5M6-200903130100/eclipse-SDK-3.5M6-win32.zip" /> |
| 368 |
</exec> |
371 |
</exec> |
|
Lines 373-661
Link Here
|
| 373 |
<property name="exclude_list_location" value="${buildDirectory}/maps/org.eclipse.releng/apiexclude/exclude_list.txt" /> |
376 |
<property name="exclude_list_location" value="${buildDirectory}/maps/org.eclipse.releng/apiexclude/exclude_list.txt" /> |
| 374 |
<property name="exclude_list_external_location" value="${buildDirectory}/maps/org.eclipse.releng/apiexclude/exclude_list_external.txt" /> |
377 |
<property name="exclude_list_external_location" value="${buildDirectory}/maps/org.eclipse.releng/apiexclude/exclude_list_external.txt" /> |
| 375 |
<apitooling.apifreeze baseline="${reference_location}" profile="${current_location}" report="${report_location}" excludelist="${exclude_list_location}" debug="true" /> --> |
378 |
<apitooling.apifreeze baseline="${reference_location}" profile="${current_location}" report="${report_location}" excludelist="${exclude_list_location}" debug="true" /> --> |
| 376 |
<!-- html report will be dumped at the same location as the xml report --> |
379 |
<!-- html report will be dumped at the same location as the xml report --> |
| 377 |
<!-- <apitooling.apifreeze_reportconversion xmlfile="${report_location}" debug="true" /> --> |
380 |
<!-- <apitooling.apifreeze_reportconversion xmlfile="${report_location}" debug="true" /> --> |
| 378 |
<property name="filter_store" value="${buildDirectory}/apifilters" /> |
381 |
<property name="filter_store" value="${buildDirectory}/apifilters" /> |
| 379 |
<mkdir dir="${filter_store}" /> |
382 |
<mkdir dir="${filter_store}" /> |
| 380 |
|
383 |
|
| 381 |
<copy todir="${filter_store}"> |
384 |
<copy todir="${filter_store}"> |
| 382 |
<fileset dir="${buildDirectory}/plugins" includes="**/.settings/.api_filters" /> |
385 |
<fileset dir="${buildDirectory}/plugins" includes="**/.settings/.api_filters" /> |
| 383 |
<regexpmapper from="^(org.eclipse.*\/)(\.settings\/)(\.api_filters)" to="\1\3" /> |
386 |
<regexpmapper from="^(org.eclipse.*\/)(\.settings\/)(\.api_filters)" to="\1\3" /> |
| 384 |
</copy> |
387 |
</copy> |
| 385 |
<property name="apifilterzip" value="${report}/apifilters-${buildId}.zip" /> |
388 |
<property name="apifilterzip" value="${report}/apifilters-${buildId}.zip" /> |
| 386 |
<exec executable="zip" dir="${report}"> |
389 |
<exec executable="zip" dir="${report}"> |
| 387 |
<arg line="-r ${apifilterzip} ${filter_store}" /> |
390 |
<arg line="-r ${apifilterzip} ${filter_store}" /> |
| 388 |
</exec> |
391 |
</exec> |
| 389 |
<property name="html_directory_location" value="${report}/apitoolsverifications/html" /> |
392 |
<property name="html_directory_location" value="${report}/apitoolsverifications/html" /> |
| 390 |
<property name="report_directory_location" value="${report}/apitoolsverifications/xml" /> |
393 |
<property name="report_directory_location" value="${report}/apitoolsverifications/xml" /> |
| 391 |
<property name="3_4_reference_location" value="${reference}/eclipse-SDK-3.4-win32.zip" /> |
394 |
<property name="3_4_reference_location" value="${reference}/eclipse-SDK-3.4-win32.zip" /> |
| 392 |
<exec executable="/usr/bin/wget" dir="${reference}" output="${reference}/error.txt" failonerror="false" os="Linux"> |
395 |
<exec executable="/usr/bin/wget" dir="${reference}" output="${reference}/error.txt" failonerror="false" os="Linux"> |
| 393 |
<arg line="-q -O ${3_4_reference_location} http://fullmoon.ottawa.ibm.com/downloads/drops/R-3.5-200906111540/eclipse-SDK-3.5-win32.zip" /> |
396 |
<arg line="-q -O ${3_4_reference_location} http://fullmoon.ottawa.ibm.com/downloads/drops/R-3.5-200906111540/eclipse-SDK-3.5-win32.zip" /> |
| 394 |
</exec> |
397 |
</exec> |
| 395 |
<apitooling.analysis baseline="${3_4_reference_location}" profile="${current_location}" report="${report_directory_location}" filters="${filter_store}" excludelist="${exclude_list_external_location}" debug="true" /> |
398 |
<apitooling.analysis baseline="${3_4_reference_location}" profile="${current_location}" report="${report_directory_location}" filters="${filter_store}" excludelist="${exclude_list_external_location}" debug="true" /> |
| 396 |
<apitooling.analysis_reportconversion xmlfiles="${report_directory_location}" debug="true" htmlfiles="${html_directory_location}" /> |
399 |
<apitooling.analysis_reportconversion xmlfiles="${report_directory_location}" debug="true" htmlfiles="${html_directory_location}" /> |
| 397 |
</target> |
400 |
</target> |
| 398 |
|
401 |
|
| 399 |
<target name="publishEclipse"> |
402 |
<target name="publishEclipse"> |
| 400 |
<parallel> |
403 |
<parallel> |
| 401 |
<ant antfile="eclipse/helper.xml" target="rSyncWithSnzZrh" /> |
404 |
<ant antfile="eclipse/helper.xml" target="rSyncWithSnzZrh" /> |
| 402 |
<sequential> |
405 |
<sequential> |
| 403 |
<ant antfile="eclipse/helper.xml" target="buildStandAloneSWT" /> |
406 |
<ant antfile="eclipse/helper.xml" target="buildStandAloneSWT" /> |
| 404 |
<ant antfile="eclipse/helper.xml" target="publish" /> |
407 |
<ant antfile="eclipse/helper.xml" target="publish" /> |
| 405 |
</sequential> |
408 |
</sequential> |
| 406 |
</parallel> |
409 |
</parallel> |
| 407 |
</target> |
410 |
</target> |
| 408 |
|
411 |
|
| 409 |
<target name="publishEquinox"> |
412 |
<target name="publishEquinox"> |
| 410 |
<ant antfile="${equinox.build.configs}/../helper.xml" target="publish" /> |
413 |
<ant antfile="${equinox.build.configs}/../helper.xml" target="publish" /> |
| 411 |
</target> |
414 |
</target> |
| 412 |
|
415 |
|
| 413 |
<target name="unpackUpdateJarsForPackaging"> |
416 |
<target name="unpackUpdateJarsForPackaging"> |
| 414 |
<property name="tmpsite" value="${buildDirectory}/tmpsite" /> |
417 |
<property name="tmpsite" value="${buildDirectory}/tmpsite" /> |
| 415 |
<mkdir dir="${tmpsite}/new/eclipse/features" /> |
418 |
<mkdir dir="${tmpsite}/new/eclipse/features" /> |
| 416 |
<mkdir dir="${tmpsite}/new/eclipse/plugins" /> |
419 |
<mkdir dir="${tmpsite}/new/eclipse/plugins" /> |
| 417 |
<exec executable="unzip" dir="${buildDirectory}/${buildLabel}"> |
420 |
<exec executable="unzip" dir="${buildDirectory}/${buildLabel}"> |
| 418 |
<arg line="-q eclipse-master-${buildId}.zip -d ${tmpsite}" /> |
421 |
<arg line="-q eclipse-master-${buildId}.zip -d ${tmpsite}" /> |
| 419 |
</exec> |
422 |
</exec> |
| 420 |
<unpackUpdateJars site="${tmpsite}/eclipse" output="${tmpsite}/new/eclipse" /> |
423 |
<unpackUpdateJars site="${tmpsite}/eclipse" output="${tmpsite}/new/eclipse" /> |
| 421 |
<waitfor maxwait="4" maxwaitunit="hour" checkevery="1" checkeveryunit="minute"> |
424 |
<waitfor maxwait="4" maxwaitunit="hour" checkevery="1" checkeveryunit="minute"> |
| 422 |
<available file="${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.zip" /> |
425 |
<available file="${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.zip" /> |
| 423 |
</waitfor> |
426 |
</waitfor> |
| 424 |
<move file="${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.zip" tofile="${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.bak.zip" /> |
427 |
<move file="${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.zip" tofile="${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.bak.zip" /> |
| 425 |
<exec executable="zip" dir="${tmpsite}/new"> |
428 |
<exec executable="zip" dir="${tmpsite}/new"> |
| 426 |
<arg line="-q ${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.zip -r eclipse" /> |
429 |
<arg line="-q ${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.zip -r eclipse" /> |
| 427 |
</exec> |
430 |
</exec> |
| 428 |
</target> |
431 |
</target> |
| 429 |
|
432 |
|
| 430 |
|
433 |
|
| 431 |
<target name="packageEclipseDistributables"> |
434 |
<target name="packageEclipseDistributables"> |
| 432 |
<replace token="@qualifier@" file="${eclipse.build.configs}/sdk/builder/sdk.product" value="${buildId}" /> |
435 |
<replace token="@qualifier@" file="${eclipse.build.configs}/sdk/builder/sdk.product" value="${buildId}" /> |
| 433 |
<replace token="@qualifier@" file="${eclipse.build.configs}/platform/platform.product" value="${buildId}" /> |
436 |
<replace token="@qualifier@" file="${eclipse.build.configs}/platform/platform.product" value="${buildId}" /> |
| 434 |
<replace token="@qualifier@" file="${eclipse.build.configs}/platform.sdk/platform.product" value="${buildId}" /> |
437 |
<replace token="@qualifier@" file="${eclipse.build.configs}/platform.sdk/platform.product" value="${buildId}" /> |
| 435 |
<replace token="@qualifier@" file="${buildDirectory}/plugins/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product" value="${buildId}" /> |
438 |
<replace token="@qualifier@" file="${buildDirectory}/plugins/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product" value="${buildId}" /> |
| 436 |
<replace token="@qualifier@" file="${eclipse.build.configs}/rcp/rcp.product" value="${buildId}" /> |
439 |
<replace token="@qualifier@" file="${eclipse.build.configs}/rcp/rcp.product" value="${buildId}" /> |
| 437 |
<replace token="@qualifier@" file="${eclipse.build.configs}/rcp.sdk/rcp.product" value="${buildId}" /> |
440 |
<replace token="@qualifier@" file="${eclipse.build.configs}/rcp.sdk/rcp.product" value="${buildId}" /> |
| 438 |
<replace token="@qualifier@" file="${eclipse.build.configs}/rcp.config/feature.xml" value="${buildId}" /> |
441 |
<replace token="@qualifier@" file="${eclipse.build.configs}/rcp.config/feature.xml" value="${buildId}" /> |
| 439 |
<delete dir="${repo}" /> |
442 |
<delete dir="${repo}" /> |
| 440 |
<mkdir dir="${repo}" /> |
443 |
<mkdir dir="${repo}" /> |
| 441 |
<delete dir="${reposource}" /> |
444 |
<delete dir="${reposource}" /> |
| 442 |
<mkdir dir="${reposource}" /> |
445 |
<mkdir dir="${reposource}" /> |
| 443 |
<exec executable="unzip" dir="."> |
446 |
<exec executable="unzip" dir="."> |
| 444 |
<arg line="${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.zip -x */features/master/* */features/master-ecf* */features/master-jetty* */plugins/org.eclipse.swt.tools* */plugins/com.ibm.icu.base* */features/com.ibm.icu.base* -d ${reposource}" /> |
447 |
<arg line="${buildDirectory}/${buildLabel}/eclipse-master-${buildId}.zip -x */features/master/* */features/master-ecf* */features/master-jetty* */plugins/org.eclipse.swt.tools* */plugins/com.ibm.icu.base* */features/com.ibm.icu.base* -d ${reposource}" /> |
| 445 |
</exec> |
448 |
</exec> |
| 446 |
<property name="tempexec" value="${buildDirectory}/tempexec" /> |
449 |
<property name="tempexec" value="${buildDirectory}/tempexec" /> |
| 447 |
<mkdir dir="${tempexec}" /> |
450 |
<mkdir dir="${tempexec}" /> |
| 448 |
<delete dir="${tempexec}" /> |
451 |
<delete dir="${tempexec}" /> |
| 449 |
<copy todir="${tempexec}"> |
452 |
<copy todir="${tempexec}"> |
| 450 |
<fileset dir="${reposource}"> |
453 |
<fileset dir="${reposource}"> |
| 451 |
<include name="features/org.eclipse.equinox.executable_*.jar" /> |
454 |
<include name="features/org.eclipse.equinox.executable_*.jar" /> |
| 452 |
</fileset> |
455 |
</fileset> |
| 453 |
</copy> |
456 |
</copy> |
| 454 |
<exec executable="unzip" dir="${tempexec}"> |
457 |
<exec executable="unzip" dir="${tempexec}"> |
| 455 |
<arg line="features/*.jar -d ${tempexec}" /> |
458 |
<arg line="features/*.jar -d ${tempexec}" /> |
| 456 |
</exec> |
459 |
</exec> |
| 457 |
|
460 |
|
| 458 |
<subant antfile="build.xml" target="publish.bin.parts" buildpath="${tempexec}/build.xml"> |
461 |
<subant antfile="build.xml" target="publish.bin.parts" buildpath="${tempexec}/build.xml"> |
| 459 |
<property name="p2.gathering" value="true" /> |
462 |
<property name="p2.gathering" value="true" /> |
| 460 |
<property name="p2.build.repo" value="file:/${buildDirectoryAbsolute}" /> |
463 |
<property name="p2.build.repo" value="file:/${buildDirectoryAbsolute}" /> |
| 461 |
</subant> |
464 |
</subant> |
| 462 |
|
465 |
|
| 463 |
<ant target="main" antfile="buildConfiguration.xml" dir="${eclipse.build.configs}/rcp.config" /> |
466 |
<ant target="main" antfile="buildConfiguration.xml" dir="${eclipse.build.configs}/rcp.config" /> |
| 464 |
|
467 |
|
| 465 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/sdk/builder/sdk.product" compress="true"> |
468 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/sdk/builder/sdk.product" compress="true"> |
| 466 |
<config os="win32" ws="win32" arch="x86" /> |
469 |
<config os="win32" ws="win32" arch="x86" /> |
| 467 |
<config os="win32" ws="win32" arch="x86_64" /> |
470 |
<config os="win32" ws="win32" arch="x86_64" /> |
| 468 |
<config os="win32" ws="wpf" arch="x86" /> |
471 |
<config os="win32" ws="wpf" arch="x86" /> |
| 469 |
<config os="linux" ws="gtk" arch="x86" /> |
472 |
<config os="linux" ws="gtk" arch="x86" /> |
| 470 |
<config os="linux" ws="gtk" arch="x86_64" /> |
473 |
<config os="linux" ws="gtk" arch="x86_64" /> |
| 471 |
<config os="linux" ws="gtk" arch="ppc" /> |
474 |
<config os="linux" ws="gtk" arch="ppc" /> |
| 472 |
<config os="linux" ws="gtk" arch="s390" /> |
475 |
<config os="linux" ws="gtk" arch="s390" /> |
| 473 |
<config os="linux" ws="gtk" arch="s390x" /> |
476 |
<config os="linux" ws="gtk" arch="s390x" /> |
| 474 |
<config os="linux" ws="motif" arch="x86" /> |
477 |
<config os="linux" ws="motif" arch="x86" /> |
| 475 |
<config os="solaris" ws="gtk" arch="sparc" /> |
478 |
<config os="solaris" ws="gtk" arch="sparc" /> |
| 476 |
<config os="solaris" ws="gtk" arch="x86" /> |
479 |
<config os="solaris" ws="gtk" arch="x86" /> |
| 477 |
<config os="macosx" ws="cocoa" arch="x86" /> |
480 |
<config os="macosx" ws="cocoa" arch="x86" /> |
| 478 |
<config os="macosx" ws="cocoa" arch="x86_64" /> |
481 |
<config os="macosx" ws="cocoa" arch="x86_64" /> |
| 479 |
<config os="macosx" ws="carbon" arch="ppc" /> |
482 |
<config os="macosx" ws="carbon" arch="ppc" /> |
| 480 |
<config os="macosx" ws="carbon" arch="x86" /> |
483 |
<config os="macosx" ws="carbon" arch="x86" /> |
| 481 |
<config os="hpux" ws="motif" arch="ia64_32" /> |
484 |
<config os="hpux" ws="motif" arch="ia64_32" /> |
| 482 |
<config os="aix" ws="motif" arch="ppc" /> |
485 |
<config os="aix" ws="motif" arch="ppc" /> |
| 483 |
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> |
486 |
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> |
| 484 |
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" /> |
487 |
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" /> |
| 485 |
</p2.publish.product> |
488 |
</p2.publish.product> |
| 486 |
|
489 |
|
| 487 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/platform/platform.product" compress="true"> |
490 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/platform/platform.product" compress="true"> |
| 488 |
<config os="win32" ws="win32" arch="x86" /> |
491 |
<config os="win32" ws="win32" arch="x86" /> |
| 489 |
<config os="win32" ws="win32" arch="x86_64" /> |
492 |
<config os="win32" ws="win32" arch="x86_64" /> |
| 490 |
<config os="win32" ws="wpf" arch="x86" /> |
493 |
<config os="win32" ws="wpf" arch="x86" /> |
| 491 |
<config os="linux" ws="gtk" arch="x86" /> |
494 |
<config os="linux" ws="gtk" arch="x86" /> |
| 492 |
<config os="linux" ws="gtk" arch="x86_64" /> |
495 |
<config os="linux" ws="gtk" arch="x86_64" /> |
| 493 |
<config os="linux" ws="gtk" arch="ppc" /> |
496 |
<config os="linux" ws="gtk" arch="ppc" /> |
| 494 |
<config os="solaris" ws="gtk" arch="sparc" /> |
497 |
<config os="solaris" ws="gtk" arch="sparc" /> |
| 495 |
<config os="solaris" ws="gtk" arch="x86" /> |
498 |
<config os="solaris" ws="gtk" arch="x86" /> |
| 496 |
<config os="macosx" ws="cocoa" arch="x86" /> |
499 |
<config os="macosx" ws="cocoa" arch="x86" /> |
| 497 |
<config os="macosx" ws="cocoa" arch="x86_64" /> |
500 |
<config os="macosx" ws="cocoa" arch="x86_64" /> |
| 498 |
<config os="macosx" ws="carbon" arch="x86" /> |
501 |
<config os="macosx" ws="carbon" arch="x86" /> |
| 499 |
<config os="hpux" ws="motif" arch="ia64_32" /> |
502 |
<config os="hpux" ws="motif" arch="ia64_32" /> |
| 500 |
<config os="aix" ws="motif" arch="ppc" /> |
503 |
<config os="aix" ws="motif" arch="ppc" /> |
| 501 |
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> |
504 |
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> |
| 502 |
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" /> |
505 |
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" /> |
| 503 |
</p2.publish.product> |
506 |
</p2.publish.product> |
| 504 |
|
507 |
|
| 505 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/platform.sdk/platform.product" compress="true"> |
508 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/platform.sdk/platform.product" compress="true"> |
| 506 |
<config os="win32" ws="win32" arch="x86" /> |
509 |
<config os="win32" ws="win32" arch="x86" /> |
| 507 |
<config os="win32" ws="win32" arch="x86_64" /> |
510 |
<config os="win32" ws="win32" arch="x86_64" /> |
| 508 |
<config os="win32" ws="wpf" arch="x86" /> |
511 |
<config os="win32" ws="wpf" arch="x86" /> |
| 509 |
<config os="linux" ws="gtk" arch="x86" /> |
512 |
<config os="linux" ws="gtk" arch="x86" /> |
| 510 |
<config os="linux" ws="gtk" arch="x86_64" /> |
513 |
<config os="linux" ws="gtk" arch="x86_64" /> |
| 511 |
<config os="linux" ws="gtk" arch="ppc" /> |
514 |
<config os="linux" ws="gtk" arch="ppc" /> |
| 512 |
<config os="solaris" ws="gtk" arch="sparc" /> |
515 |
<config os="solaris" ws="gtk" arch="sparc" /> |
| 513 |
<config os="solaris" ws="gtk" arch="x86" /> |
516 |
<config os="solaris" ws="gtk" arch="x86" /> |
| 514 |
<config os="macosx" ws="cocoa" arch="x86" /> |
517 |
<config os="macosx" ws="cocoa" arch="x86" /> |
| 515 |
<config os="macosx" ws="cocoa" arch="x86_64" /> |
518 |
<config os="macosx" ws="cocoa" arch="x86_64" /> |
| 516 |
<config os="macosx" ws="carbon" arch="ppc" /> |
519 |
<config os="macosx" ws="carbon" arch="ppc" /> |
| 517 |
<config os="hpux" ws="motif" arch="ia64_32" /> |
520 |
<config os="hpux" ws="motif" arch="ia64_32" /> |
| 518 |
<config os="aix" ws="motif" arch="ppc" /> |
521 |
<config os="aix" ws="motif" arch="ppc" /> |
| 519 |
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> |
522 |
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> |
| 520 |
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" /> |
523 |
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" /> |
| 521 |
</p2.publish.product> |
524 |
</p2.publish.product> |
| 522 |
|
525 |
|
| 523 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/rcp/rcp.product" compress="true"> |
526 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/rcp/rcp.product" compress="true"> |
| 524 |
<config os="win32" ws="win32" arch="x86" /> |
527 |
<config os="win32" ws="win32" arch="x86" /> |
| 525 |
<config os="win32" ws="win32" arch="x86_64" /> |
528 |
<config os="win32" ws="win32" arch="x86_64" /> |
| 526 |
<config os="win32" ws="wpf" arch="x86" /> |
529 |
<config os="win32" ws="wpf" arch="x86" /> |
| 527 |
<config os="linux" ws="gtk" arch="x86" /> |
530 |
<config os="linux" ws="gtk" arch="x86" /> |
| 528 |
<config os="linux" ws="gtk" arch="x86_64" /> |
531 |
<config os="linux" ws="gtk" arch="x86_64" /> |
| 529 |
<config os="linux" ws="gtk" arch="ppc" /> |
532 |
<config os="linux" ws="gtk" arch="ppc" /> |
| 530 |
<config os="linux" ws="gtk" arch="s390" /> |
533 |
<config os="linux" ws="gtk" arch="s390" /> |
| 531 |
<config os="linux" ws="gtk" arch="s390x" /> |
534 |
<config os="linux" ws="gtk" arch="s390x" /> |
| 532 |
<config os="solaris" ws="gtk" arch="sparc" /> |
535 |
<config os="solaris" ws="gtk" arch="sparc" /> |
| 533 |
<config os="solaris" ws="gtk" arch="x86" /> |
536 |
<config os="solaris" ws="gtk" arch="x86" /> |
| 534 |
<config os="macosx" ws="cocoa" arch="x86" /> |
537 |
<config os="macosx" ws="cocoa" arch="x86" /> |
| 535 |
<config os="macosx" ws="cocoa" arch="x86_64" /> |
538 |
<config os="macosx" ws="cocoa" arch="x86_64" /> |
| 536 |
<config os="macosx" ws="carbon" arch="x86" /> |
539 |
<config os="macosx" ws="carbon" arch="x86" /> |
| 537 |
<config os="hpux" ws="motif" arch="ia64_32" /> |
540 |
<config os="hpux" ws="motif" arch="ia64_32" /> |
| 538 |
<config os="aix" ws="motif" arch="ppc" /> |
541 |
<config os="aix" ws="motif" arch="ppc" /> |
| 539 |
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> |
542 |
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> |
| 540 |
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" /> |
543 |
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" /> |
| 541 |
</p2.publish.product> |
544 |
</p2.publish.product> |
| 542 |
|
545 |
|
| 543 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/rcp.sdk/rcp.product" compress="true"> |
546 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/rcp.sdk/rcp.product" compress="true"> |
| 544 |
<config os="win32" ws="win32" arch="x86" /> |
547 |
<config os="win32" ws="win32" arch="x86" /> |
| 545 |
<config os="win32" ws="win32" arch="x86_64" /> |
548 |
<config os="win32" ws="win32" arch="x86_64" /> |
| 546 |
<config os="win32" ws="wpf" arch="x86" /> |
549 |
<config os="win32" ws="wpf" arch="x86" /> |
| 547 |
<config os="linux" ws="gtk" arch="x86" /> |
550 |
<config os="linux" ws="gtk" arch="x86" /> |
| 548 |
<config os="linux" ws="gtk" arch="x86_64" /> |
551 |
<config os="linux" ws="gtk" arch="x86_64" /> |
| 549 |
<config os="linux" ws="gtk" arch="ppc" /> |
552 |
<config os="linux" ws="gtk" arch="ppc" /> |
| 550 |
<config os="solaris" ws="gtk" arch="sparc" /> |
553 |
<config os="solaris" ws="gtk" arch="sparc" /> |
| 551 |
<config os="solaris" ws="gtk" arch="x86" /> |
554 |
<config os="solaris" ws="gtk" arch="x86" /> |
| 552 |
<config os="macosx" ws="cocoa" arch="x86" /> |
555 |
<config os="macosx" ws="cocoa" arch="x86" /> |
| 553 |
<config os="macosx" ws="cocoa" arch="x86_64" /> |
556 |
<config os="macosx" ws="cocoa" arch="x86_64" /> |
| 554 |
<config os="macosx" ws="carbon" arch="x86" /> |
557 |
<config os="macosx" ws="carbon" arch="x86" /> |
| 555 |
<config os="hpux" ws="motif" arch="ia64_32" /> |
558 |
<config os="hpux" ws="motif" arch="ia64_32" /> |
| 556 |
<config os="aix" ws="motif" arch="ppc" /> |
559 |
<config os="aix" ws="motif" arch="ppc" /> |
| 557 |
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> |
560 |
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> |
| 558 |
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" /> |
561 |
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" /> |
| 559 |
</p2.publish.product> |
562 |
</p2.publish.product> |
| 560 |
|
563 |
|
| 561 |
<property name="equinox.p2.agent.dir" value="${equinox.build.configs}/equinox.p2.agent" /> |
564 |
<property name="equinox.p2.agent.dir" value="${equinox.build.configs}/equinox.p2.agent" /> |
| 562 |
<replace file="${equinox.p2.agent.dir}/p2.inf" token="@qualifier@" value="${buildId}" /> |
565 |
<replace file="${equinox.p2.agent.dir}/p2.inf" token="@qualifier@" value="${buildId}" /> |
| 563 |
<copy todir="${equinox.p2.agent.dir}"> |
566 |
<copy todir="${equinox.p2.agent.dir}"> |
| 564 |
<fileset file="${buildDirectory}/plugins/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product" /> |
567 |
<fileset file="${buildDirectory}/plugins/org.eclipse.equinox.p2.ui.admin.rcp/rcp.product" /> |
| 565 |
</copy> |
568 |
</copy> |
| 566 |
<mkdir dir="${equinox.p2.agent.dir}/org.eclipse.equinox.p2.ui.admin.rcp" /> |
569 |
<mkdir dir="${equinox.p2.agent.dir}/org.eclipse.equinox.p2.ui.admin.rcp" /> |
| 567 |
<copy todir="${equinox.p2.agent.dir}/org.eclipse.equinox.p2.ui.admin.rcp"> |
570 |
<copy todir="${equinox.p2.agent.dir}/org.eclipse.equinox.p2.ui.admin.rcp"> |
| 568 |
<fileset file="${buildDirectory}/plugins/org.eclipse.equinox.p2.ui.admin.rcp/config.ini" /> |
571 |
<fileset file="${buildDirectory}/plugins/org.eclipse.equinox.p2.ui.admin.rcp/config.ini" /> |
| 569 |
</copy> |
572 |
</copy> |
| 570 |
|
573 |
|
| 571 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${equinox.p2.agent.dir}/rcp.product" compress="true"> |
574 |
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${equinox.p2.agent.dir}/rcp.product" compress="true"> |
| 572 |
<config os="win32" ws="win32" arch="x86" /> |
575 |
<config os="win32" ws="win32" arch="x86" /> |
| 573 |
<config os="linux" ws="gtk" arch="x86" /> |
576 |
<config os="linux" ws="gtk" arch="x86" /> |
| 574 |
<config os="macosx" ws="cocoa" arch="x86" /> |
577 |
<config os="macosx" ws="cocoa" arch="x86" /> |
| 575 |
</p2.publish.product> |
578 |
</p2.publish.product> |
| 576 |
|
579 |
|
| 577 |
<antcall target="packMasterFeature" /> |
580 |
<antcall target="packMasterFeature" /> |
| 578 |
|
581 |
|
| 579 |
<mkdir dir="${buildRepo}" /> |
582 |
<mkdir dir="${buildRepo}" /> |
| 580 |
<!-- <p2.mirror source="file:${reposource}" ignoreErrors="true" log="${buildlogs}/mirrorlog.txt"> |
583 |
<!-- <p2.mirror source="file:${reposource}" ignoreErrors="true" log="${buildlogs}/mirrorlog.txt"> |
| 581 |
<destination compressed="true" name="${p2.repo.name}" location="file:${buildRepo}" append="true" /> |
584 |
<destination compressed="true" name="${p2.repo.name}" location="file:${buildRepo}" append="true" /> |
| 582 |
<comparator comparatorId="org.eclipse.equinox.p2.repository.tools.jar.comparator" comparatorLog="${buildlogs}/comparatorlog.txt"> |
585 |
<comparator comparatorId="org.eclipse.equinox.p2.repository.tools.jar.comparator" comparatorLog="${buildlogs}/comparatorlog.txt"> |
| 583 |
<repository location="file:${updateSite}" /> |
586 |
<repository location="file:${updateSite}" /> |
| 584 |
</comparator> |
587 |
</comparator> |
| 585 |
</p2.mirror> --> |
588 |
</p2.mirror> --> |
| 586 |
<p2.metadata.mirror source="file:${reposource}" writeMode="append" destinationName="${p2.repo.name}" destination="file:${buildRepo}" /> |
589 |
<p2.metadata.mirror source="file:${reposource}" writeMode="append" destinationName="${p2.repo.name}" destination="file:${buildRepo}" /> |
| 587 |
<p2.artifact.mirror source="file:${reposource}" baseline="file:${updateSite}" comparatorId="org.eclipse.equinox.p2.repository.tools.jar.comparator" destinationName="${p2.repo.name}" destination="file:${buildRepo}" ignoreErrors="true" comparatorLog="${buildlogs}/comparatorlog.txt" log="${buildlogs}/mirrorlog.txt" /> |
590 |
<p2.artifact.mirror source="file:${reposource}" baseline="file:${updateSite}" comparatorId="org.eclipse.equinox.p2.repository.tools.jar.comparator" destinationName="${p2.repo.name}" destination="file:${buildRepo}" ignoreErrors="true" comparatorLog="${buildlogs}/comparatorlog.txt" log="${buildlogs}/mirrorlog.txt" /> |
| 588 |
<copy todir="${buildRepo}"> |
591 |
<copy todir="${buildRepo}"> |
| 589 |
<fileset file="${eclipse.build.configs}/../../extras/sdkinstaller.properties" /> |
592 |
<fileset file="${eclipse.build.configs}/../../extras/sdkinstaller.properties" /> |
| 590 |
</copy> |
593 |
</copy> |
| 591 |
|
594 |
|
| 592 |
<!--try create composite repository--> |
595 |
<!--try create composite repository--> |
| 593 |
<p2.composite.artifact.repository.create location="file://${updateSite}" name="${p2.repo.name}" compressed="true" failOnExists="false" /> |
596 |
<p2.composite.artifact.repository.create location="file://${updateSite}" name="${p2.repo.name}" compressed="true" failOnExists="false" /> |
| 594 |
<p2.composite.metadata.repository.create location="file://${updateSite}" name="${p2.repo.name}" compressed="true" failOnExists="false" /> |
597 |
<p2.composite.metadata.repository.create location="file://${updateSite}" name="${p2.repo.name}" compressed="true" failOnExists="false" /> |
| 595 |
|
598 |
|
| 596 |
<!--add childRepo to composite repo--> |
599 |
<!--add childRepo to composite repo--> |
| 597 |
<p2.composite.artifact.repository.add location="file://${updateSite}" child="${buildId}" /> |
600 |
<p2.composite.artifact.repository.add location="file://${updateSite}" child="${buildId}" /> |
| 598 |
<p2.composite.metadata.repository.add location="file://${updateSite}" child="${buildId}" /> |
601 |
<p2.composite.metadata.repository.add location="file://${updateSite}" child="${buildId}" /> |
| 599 |
|
602 |
|
| 600 |
<!--call to generate pde, rcp, cvs and jdt repos--> |
603 |
<!--call to generate pde, rcp, cvs and jdt repos--> |
| 601 |
<ant antfile="${eclipse.build.configs}/repos/build.xml" /> |
604 |
<ant antfile="${eclipse.build.configs}/repos/build.xml" /> |
| 602 |
<ant antfile="${eclipse.build.configs}/repos/platformrepo.xml" /> |
605 |
<ant antfile="${eclipse.build.configs}/repos/platformrepo.xml" /> |
| 603 |
<ant antfile="${eclipse.build.configs}/repos/rcprepo.xml" /> |
606 |
<ant antfile="${eclipse.build.configs}/repos/rcprepo.xml" /> |
| 604 |
<ant antfile="${eclipse.build.configs}/rcp.deltapack/build.xml" /> |
607 |
<ant antfile="${eclipse.build.configs}/rcp.deltapack/build.xml" /> |
| 605 |
</target> |
608 |
</target> |
| 606 |
|
609 |
|
| 607 |
<target name="packageEquinoxDistributables"> |
610 |
<target name="packageEquinoxDistributables"> |
| 608 |
<ant antfile="${equinox.build.configs}/repos/build.xml" /> |
611 |
<ant antfile="${equinox.build.configs}/repos/build.xml" /> |
| 609 |
<!-- equinox slicer build now includes master equinox--> |
612 |
<!-- equinox slicer build now includes master equinox--> |
| 610 |
<ant antfile="${equinox.build.configs}/equinox/build.xml" /> |
613 |
<ant antfile="${equinox.build.configs}/equinox/build.xml" /> |
| 611 |
<ant antfile="${equinox.build.configs}/equinox-launchers/build.xml" /> |
614 |
<ant antfile="${equinox.build.configs}/equinox-launchers/build.xml" /> |
| 612 |
<!-- invoke equinox.p2.installer in a separate process --> |
615 |
<!-- invoke equinox.p2.installer in a separate process --> |
| 613 |
<ant antfile="${equinox.build.configs}/../helper.xml" target="build.p2.installer.product" /> |
616 |
<ant antfile="${equinox.build.configs}/../helper.xml" target="build.p2.installer.product" /> |
| 614 |
</target> |
617 |
</target> |
| 615 |
|
618 |
|
| 616 |
<target name="package"> |
619 |
<target name="package"> |
| 617 |
<ant antfile="package.xml" dir="${eclipse.pdebuild.scripts}"> |
620 |
<ant antfile="package.xml" dir="${eclipse.pdebuild.scripts}"> |
| 618 |
<property name="packagingInfo" value="${packagingInfo}" /> |
621 |
<property name="packagingInfo" value="${packagingInfo}" /> |
| 619 |
<property name="assemblyTempDir" value="${packagingInfo}/jartmp" /> |
622 |
<property name="assemblyTempDir" value="${packagingInfo}/jartmp" /> |
| 620 |
</ant> |
623 |
</ant> |
| 621 |
</target> |
624 |
</target> |
| 622 |
|
625 |
|
| 623 |
<target name="publishRSS" unless="skip.feed"> |
626 |
<target name="publishRSS" unless="skip.feed"> |
| 624 |
<property name="rssproperties" value="feedPublish.eclipse.properties" /> |
627 |
<property name="rssproperties" value="feedPublish.eclipse.properties" /> |
| 625 |
<property name="buildrssproperties" value="${postingDirectory}/${buildLabel}/${rssproperties}" /> |
628 |
<property name="buildrssproperties" value="${postingDirectory}/${buildLabel}/${rssproperties}" /> |
| 626 |
<copy file="${eclipse.build.configs}/../publishingFiles/templateFiles/${rssproperties}" tofile="${buildrssproperties}" failonerror="true" /> |
629 |
<copy file="${eclipse.build.configs}/../publishingFiles/templateFiles/${rssproperties}" tofile="${buildrssproperties}" failonerror="true" /> |
| 627 |
<condition property="updateManagerURL" value="http://download.eclipse.org/eclipse/testUpdates"> |
630 |
<condition property="updateManagerURL" value="http://download.eclipse.org/eclipse/testUpdates"> |
| 628 |
<equals arg1="${buildType}" arg2="I" /> |
631 |
<equals arg1="${buildType}" arg2="I" /> |
| 629 |
</condition> |
632 |
</condition> |
| 630 |
<replace file="${buildrssproperties}" token="@updateManagerURL@" value="updateManagerURL=${updateManagerURL}" /> |
633 |
<replace file="${buildrssproperties}" token="@updateManagerURL@" value="updateManagerURL=${updateManagerURL}" /> |
| 631 |
<replace file="${buildrssproperties}" token="@buildid@" value="${buildId}" /> |
634 |
<replace file="${buildrssproperties}" token="@buildid@" value="${buildId}" /> |
| 632 |
<replace file="${buildrssproperties}" token="@buildType@" value="${buildType}" /> |
635 |
<replace file="${buildrssproperties}" token="@buildType@" value="${buildType}" /> |
| 633 |
<condition property="feedFileValue" value="${base.builder}/plugins/org.eclipse.build.tools/data/builds-eclipse.xml"> |
636 |
<condition property="feedFileValue" value="${base.builder}/plugins/org.eclipse.build.tools/data/builds-eclipse.xml"> |
| 634 |
<equals arg1="${test}" arg2="true" /> |
637 |
<equals arg1="${test}" arg2="true" /> |
| 635 |
</condition> |
638 |
</condition> |
| 636 |
<condition property="feedFileValue" value="/builds/transfer/files/master/downloads/builds-eclipse-3.5.xml"> |
639 |
<condition property="feedFileValue" value="/builds/transfer/files/master/downloads/builds-eclipse-3.5.xml"> |
| 637 |
<equals arg1="${buildType}" arg2="I" /> |
640 |
<equals arg1="${buildType}" arg2="I" /> |
| 638 |
</condition> |
641 |
</condition> |
| 639 |
<condition property="feedFileValue" value="/builds/transfer/files/master/downloads/builds-eclipse-N.xml"> |
642 |
<condition property="feedFileValue" value="/builds/transfer/files/master/downloads/builds-eclipse-N.xml"> |
| 640 |
<equals arg1="${buildType}" arg2="N" /> |
643 |
<equals arg1="${buildType}" arg2="N" /> |
| 641 |
</condition> |
644 |
</condition> |
| 642 |
<replace file="${buildrssproperties}" token="@file@" value="file=${feedFileValue}" /> |
645 |
<replace file="${buildrssproperties}" token="@file@" value="file=${feedFileValue}" /> |
| 643 |
<condition property="feedURL" value="http://download.eclipse.org/eclipse/downloads/builds-eclipse-test.xml"> |
646 |
<condition property="feedURL" value="http://download.eclipse.org/eclipse/downloads/builds-eclipse-test.xml"> |
| 644 |
<equals arg1="${test}" arg2="true" /> |
647 |
<equals arg1="${test}" arg2="true" /> |
| 645 |
</condition> |
648 |
</condition> |
| 646 |
<condition property="feedURL" value="http://download.eclipse.org/eclipse/downloads/builds-eclipse-3.5.xml"> |
649 |
<condition property="feedURL" value="http://download.eclipse.org/eclipse/downloads/builds-eclipse-3.5.xml"> |
| 647 |
<equals arg1="${buildType}" arg2="I" /> |
650 |
<equals arg1="${buildType}" arg2="I" /> |
| 648 |
</condition> |
651 |
</condition> |
| 649 |
<condition property="feedURL" value="http://download.eclipse.org/eclipse/downloads/builds-eclipse-N.xml"> |
652 |
<condition property="feedURL" value="http://download.eclipse.org/eclipse/downloads/builds-eclipse-N.xml"> |
| 650 |
<equals arg1="${buildType}" arg2="N" /> |
653 |
<equals arg1="${buildType}" arg2="N" /> |
| 651 |
</condition> |
654 |
</condition> |
| 652 |
<replace file="${buildrssproperties}" token="@feedURL@" value="feedURL=${feedURL}" /> |
655 |
<replace file="${buildrssproperties}" token="@feedURL@" value="feedURL=${feedURL}" /> |
| 653 |
<condition property="signStatus" value="SIGNED"> |
656 |
<condition property="signStatus" value="SIGNED"> |
| 654 |
<equals arg1="${sign}" arg2="true" /> |
657 |
<equals arg1="${sign}" arg2="true" /> |
| 655 |
</condition> |
658 |
</condition> |
| 656 |
<property name="signStatus" value="UNSIGNED" /> |
659 |
<property name="signStatus" value="UNSIGNED" /> |
| 657 |
<replace file="${buildrssproperties}" token="@jarSigningStatus@" value="jarSigningStatus=${signStatus}" /> |
660 |
<replace file="${buildrssproperties}" token="@jarSigningStatus@" value="jarSigningStatus=${signStatus}" /> |
| 658 |
<copy file="${buildrssproperties}" tofile="${base.builder}/plugins/org.eclipse.build.tools/properties/${rssproperties}" overwrite="true" failonerror="true" /> |
661 |
<copy file="${buildrssproperties}" tofile="${base.builder}/plugins/org.eclipse.build.tools/properties/${rssproperties}" overwrite="true" failonerror="true" /> |
| 659 |
</target> |
662 |
</target> |
| 660 |
|
663 |
|
| 661 |
</project> |
664 |
</project> |
