Attachment 55684 Details for Bug 165155 – Patch implementing the improvement

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

[patch] Patch implementing the improvement

165155.patch (text/plain), 4.40 KB, created by Pascal Rapicault

on 2006-12-14 11:12:05 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Rapicault

Created: 2006-12-14 11:12:05 EST

Size: 4.40 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: templates/headless-build/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/templates/headless-build/build.properties,v
>retrieving revision 1.11
>diff -u -r1.11 build.properties
>--- templates/headless-build/build.properties	26 Sep 2006 18:08:24 -0000	1.11
>+++ templates/headless-build/build.properties	14 Dec 2006 16:06:00 -0000
>@@ -167,6 +167,8 @@
> # fetchTag=HEAD
> skipFetch=true
> 
>+# Request a build failure if something fails during a build
>+failOnFetchError=false
> 
> ############# JAVA COMPILER OPTIONS ##############
> # The location of the Java jars to compile against.  Typically the rt.jar for your JDK/JRE
>Index: src/org/eclipse/pde/build/Constants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src/org/eclipse/pde/build/Constants.java,v
>retrieving revision 1.3
>diff -u -r1.3 Constants.java
>--- src/org/eclipse/pde/build/Constants.java	17 Feb 2006 23:04:42 -0000	1.3
>+++ src/org/eclipse/pde/build/Constants.java	14 Dec 2006 16:06:00 -0000
>@@ -27,4 +27,7 @@
> 	
> 	/** Constant for the string <code>META-INF/MANIFEST.MF</code> */
> 	public final static String BUNDLE_FILENAME_DESCRIPTOR = "META-INF/MANIFEST.MF"; //$NON-NLS-1$
>+
>+	/** Constant representing the property set by the user to request a build failure when something goes wrong while fetching */
>+	public final static String FAIL_ON_FETCH_ERROR = "failOnFetchError";  //$NON-NLS-1$
> }
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/META-INF/MANIFEST.MF,v
>retrieving revision 1.20
>diff -u -r1.20 MANIFEST.MF
>--- META-INF/MANIFEST.MF	6 Sep 2006 18:03:59 -0000	1.20
>+++ META-INF/MANIFEST.MF	14 Dec 2006 16:06:00 -0000
>@@ -1,7 +1,7 @@
> Manifest-Version: 1.0
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
>-Bundle-Version: 3.2.100.qualifier
>+Bundle-Version: 3.3.0.qualifier
> Bundle-SymbolicName: org.eclipse.pde.build; singleton:=true
> Bundle-Vendor: %providerName
> Bundle-ClassPath: pdebuild.jar
>Index: src/org/eclipse/pde/internal/build/fetch/COPYFetchTasksFactory.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/COPYFetchTasksFactory.java,v
>retrieving revision 1.1
>diff -u -r1.1 COPYFetchTasksFactory.java
>--- src/org/eclipse/pde/internal/build/fetch/COPYFetchTasksFactory.java	17 Feb 2006 22:27:13 -0000	1.1
>+++ src/org/eclipse/pde/internal/build/fetch/COPYFetchTasksFactory.java	14 Dec 2006 16:06:00 -0000
>@@ -15,8 +15,7 @@
> import java.util.Properties;
> import org.eclipse.core.runtime.*;
> import org.eclipse.osgi.util.NLS;
>-import org.eclipse.pde.build.IAntScript;
>-import org.eclipse.pde.build.IFetchFactory;
>+import org.eclipse.pde.build.*;
> import org.eclipse.pde.internal.build.*;
> 
> /**
>@@ -115,7 +114,7 @@
> 		script.printAttribute("todir", todir, false); //$NON-NLS-1$
> 		script.printAttribute("failonerror", failOnError ? "true" : "false", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 		script.printAttribute("overwrite", overwrite ? "true" : "false", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>-
>+		script.printAttribute("failonerror", Utils.getPropertyFormat(Constants.FAIL_ON_FETCH_ERROR), false); //$NON-NLS-1$
> 		if (dirs == null)
> 			script.println("/>"); //$NON-NLS-1$
> 		else {
>Index: src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java,v
>retrieving revision 1.3
>diff -u -r1.3 CVSFetchTaskFactory.java
>--- src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java	16 Feb 2006 20:57:11 -0000	1.3
>+++ src/org/eclipse/pde/internal/build/fetch/CVSFetchTaskFactory.java	14 Dec 2006 16:06:00 -0000
>@@ -147,6 +147,7 @@
> 		script.printAttribute("quiet", quiet, false); //$NON-NLS-1$
> 		script.printAttribute("passfile", passFile, false); //$NON-NLS-1$
> 		script.printAttribute("taskname", taskname, false); //$NON-NLS-1$
>+		script.printAttribute("failonerror", Utils.getPropertyFormat(Constants.FAIL_ON_FETCH_ERROR), false); //$NON-NLS-1$
> 		script.println("/>"); //$NON-NLS-1$
> 	}
>

Actions: View | Diff

Attachments on bug 165155: 55684