Attachment 185122 Details for Bug 330337 – Additional patch for Athena builder

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Additional patch for Athena builder

remove_discovery_2.diff.txt (text/plain), 2.51 KB, created by Martin Oberhuber

on 2010-12-14 06:13:13 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Oberhuber

Created: 2010-12-14 06:13:13 EST

Size: 2.51 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.build
>Index: bin/doit_irsbuild.sh
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh,v
>retrieving revision 1.40
>diff -u -r1.40 doit_irsbuild.sh
>--- bin/doit_irsbuild.sh	29 Nov 2010 10:10:49 -0000	1.40
>+++ bin/doit_irsbuild.sh	14 Dec 2010 11:12:45 -0000
>@@ -131,7 +131,6 @@
>     else
>       echo "ERROR: missing TM-terminal-*.zip"
>     fi
>-    #cp -f TM-discovery-*.zip ../N.latest/TM-discovery-latest.zip
>     chgrp dsdp-tmadmin ../N.latest/*.zip
>     chmod g+w ../N.latest/*.zip
>     if [ -d /shared/dsdp/public_html/tm/downloads/drops/N.latest ]; then
>Index: bin/doit_nightly.sh
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/releng/org.eclipse.rse.build/bin/doit_nightly.sh,v
>retrieving revision 1.26
>diff -u -r1.26 doit_nightly.sh
>--- bin/doit_nightly.sh	29 Nov 2010 10:10:49 -0000	1.26
>+++ bin/doit_nightly.sh	14 Dec 2010 11:12:45 -0000
>@@ -74,7 +74,6 @@
>     else
>       echo "ERROR: missing TM-terminal-*.zip"
>     fi
>-    #cp -f TM-discovery-*.zip ../N.latest/TM-discovery-latest.zip
>     cd ../N.latest
>     chgrp dsdp-tmadmin *.zip
>     chmod g+w *.zip
>#P org.eclipse.tm.releng
>Index: buildExtra.xml
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/releng/org.eclipse.tm.releng/buildExtra.xml,v
>retrieving revision 1.12
>diff -u -r1.12 buildExtra.xml
>--- buildExtra.xml	14 Dec 2010 10:55:27 -0000	1.12
>+++ buildExtra.xml	14 Dec 2010 11:12:46 -0000
>@@ -119,16 +119,6 @@
> 			<zipfileset refid="rootfiles" />
> 		</zip>
> 		
>-		
>-		<zip destfile="${buildDirectory}/${buildLabel}/TM-discovery-${buildAlias}.zip" update="true">
>-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
>-				<include name="**/org.eclipse.*.discovery*" />
>-				<include name="**/org.eclipse.*.discovery*/**" />
>-				<include name="**/org.eclipse.*.discovery*/**/**" />
>-			</zipfileset>
>-			<zipfileset refid="rootfiles" />
>-		</zip>
>-
> 		
> 		<zip destfile="${buildDirectory}/${buildLabel}/TM-terminal-${buildAlias}.zip" update="true">
> 			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" excludes="**/org.eclipse.*.test*, **/org.eclipse.*.test*/**, **/org.eclipse.tm.terminal.local*, **/org.eclipse.tm.terminal.local*/**">

Actions: View | Diff

Attachments on bug 330337: 185118 | 185122