Attachment 152784 Details for Bug 295773 – another attempt at hacking around this issue

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

[patch] another attempt at hacking around this issue

clipboard.txt (text/plain), 1.98 KB, created by Nick Boldt

on 2009-11-21 15:18:06 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Boldt

Created: 2009-11-21 15:18:06 EST

Size: 1.98 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.dash.common.releng
>Index: tools/scripts/buildAllHelper.xml
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.dash/athena/org.eclipse.dash.commonbuilder/org.eclipse.dash.common.releng/tools/scripts/buildAllHelper.xml,v
>retrieving revision 1.139
>diff -u -r1.139 buildAllHelper.xml
>--- tools/scripts/buildAllHelper.xml	21 Nov 2009 04:30:55 -0000	1.139
>+++ tools/scripts/buildAllHelper.xml	21 Nov 2009 20:20:41 -0000
>@@ -1535,23 +1535,13 @@
> 			</then>
> 		</if>
> 
>-		
> 		<if>
>-			<or>
>-				<not>
>-					<isset property="incubation" />
>-				</not>
>-				<isfalse value="${incubation}" />
>-			</or>
>+			<not>
>+				<isset property="incubation" />
>+			</not>
> 			<then>
> 				<property name="incubation" value="" />
> 			</then>
>-			<elseif>
>-				<istrue value="${incubation}" />
>-				<then>
>-					<property name="incubation" value="-incubation" />
>-				</then>
>-			</elseif>
> 		</if>
> 
> 		<for param="allInOneBuildType" list="${allInOneBuildTypes}">
>Index: buildAll.xml
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.dash/athena/org.eclipse.dash.commonbuilder/org.eclipse.dash.common.releng/buildAll.xml,v
>retrieving revision 1.63
>diff -u -r1.63 buildAll.xml
>--- buildAll.xml	17 Oct 2009 05:20:30 -0000	1.63
>+++ buildAll.xml	21 Nov 2009 20:20:40 -0000
>@@ -278,7 +278,12 @@
> 			">
> 			<sequential>
> 				<if>
>-					<isset property="@{arg}" />
>+					<and>
>+						<not>
>+							<equals arg1="${@{arg}}" arg2="" />
>+						</not>
>+						<isset property="@{arg}" />
>+					</and>
> 					<then>
> 						<var name="args" value="${args} -D@{arg}=${@{arg}}" />
> 					</then>
>@@ -392,4 +397,6 @@
> 		</if>
> 	</target>
> 
>+	<target name="-Dincubation=" description="Hack for skipping over the case where incubation is null and build invoked via Ant instead of shell" />
>+
> </project>

Actions: View | Diff

Attachments on bug 295773: 152784 | 152785