Attachment 3767 Details for Bug 33192 – This patch add support for items 1 and 3.

[patch] This patch add support for items 1 and 3.

patch.txt (text/plain), 4.58 KB, created by Rob Hughes

on 2003-02-27 23:12:38 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Hughes

Created: 2003-02-27 23:12:38 EST

Size: 4.58 KB

patch

obsolete

>diff -ur orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractBuildScriptGenerator.java work/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractBuildScriptGenerator.java
>--- orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractBuildScriptGenerator.java	2003-02-19 14:16:00.000000000 -0700
>+++ work/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractBuildScriptGenerator.java	2003-02-27 21:05:18.000000000 -0700
>@@ -611,6 +611,8 @@
> 	javac.setFailOnError(getPropertyFormat(PROPERTY_JAVAC_FAIL_ON_ERROR));
> 	javac.setDebug(getPropertyFormat(PROPERTY_JAVAC_DEBUG_INFO));
> 	javac.setVerbose(getPropertyFormat(PROPERTY_JAVAC_VERBOSE));
>+	javac.setSource(getPropertyFormat(PROPERTY_JAVAC_SOURCE));
>+	javac.setTarget(getPropertyFormat(PROPERTY_JAVAC_TARGET));
> 	javac.setIncludeAntRuntime("no"); //$NON-NLS-1$
> 	String[] sources = jar.getSource();
> 	javac.setSrcdir(sources);
>@@ -921,4 +923,4 @@
> 	buffer.replace(begin, end, newVersion);
> 	Utils.transferStreams(new ByteArrayInputStream(buffer.toString().getBytes()), new FileOutputStream(buildFile));
> }
>-}
>\ No newline at end of file
>+}
>diff -ur orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/JavacTask.java work/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/JavacTask.java
>--- orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/JavacTask.java	2002-10-25 16:34:43.000000000 -0600
>+++ work/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/JavacTask.java	2003-02-27 21:05:37.000000000 -0700
>@@ -24,6 +24,8 @@
> 	protected String includeAntRuntime;
> 	protected String fork;
> 	protected String debug;
>+	protected String source;
>+	protected String target;
> 
> /**
>  * Default constructor for the class.
 */
>@@ -123,4 +125,22 @@
> public void setDebug(String debug) {
> 	this.debug = debug;
> }
>+
>+/**
>+ * Set the javac task source attribute to be the given value. Valid values
>+ * are <code>"1.3"</code> and <code>"1.4"</code>.
>+ * 
 * @param source either <code>"1.3"</code> or <code>"1.4"</code>
 */
>+public void setSource(String source) {
>+	this.source = source;
>+}
>+
>+/**
>+ * Set the javac task target attribute to be the given value. Valid values
>+ * are <code>"1.1"</code> and <code>"1.2"</code> and
>+ * <code>"1.3"</code> and <code>"1.4"</code>.
>+ * 
 * @param source either <code>"1.1"</code> or <code>"1.2"</code> or
>+ * <code>"1.3"</code> or <code>"1.4"</code>
 */
>+public void setTarget(String target) {
>+	this.target = target;
>+}
> }
>diff -ur orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IXMLConstants.java work/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IXMLConstants.java
>--- orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IXMLConstants.java	2003-02-19 14:16:00.000000000 -0700
>+++ work/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IXMLConstants.java	2003-02-27 21:05:08.000000000 -0700
>@@ -93,7 +93,9 @@
> 	public static final String PROPERTY_JAVAC_FAIL_ON_ERROR = "javacFailOnError"; //$NON-NLS-1$ 
> 	public static final String PROPERTY_JAVAC_DEBUG_INFO = "javacDebugInfo"; //$NON-NLS-1$
> 	public static final String PROPERTY_JAVAC_VERBOSE = "javacVerbose";  //$NON-NLS-1$
>+	public static final String PROPERTY_JAVAC_SOURCE = "javacSource";  //$NON-NLS-1$
>+	public static final String PROPERTY_JAVAC_TARGET = "javacTarget";  //$NON-NLS-1$
> 	
> 	public static final String PROPERTY_OUTPUT_PREFIX = "output."; //$NON-NLS-1$
> 	public static final String PROPERTY_EXTRAPATH_PREFIX = "extra."; //$NON-NLS-1$	
>-}
>\ No newline at end of file
>+}
>diff -ur orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ModelBuildScriptGenerator.java work/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ModelBuildScriptGenerator.java
>--- orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ModelBuildScriptGenerator.java	2003-02-19 14:16:00.000000000 -0700
>+++ work/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ModelBuildScriptGenerator.java	2003-02-27 21:05:24.000000000 -0700
>@@ -316,6 +316,8 @@
> 	script.printProperty(tab, PROPERTY_JAVAC_FAIL_ON_ERROR, "false");	//$NON-NLS-1$
> 	script.printProperty(tab, PROPERTY_JAVAC_DEBUG_INFO, "on");	//$NON-NLS-1$
> 	script.printProperty(tab, PROPERTY_JAVAC_VERBOSE, "true");	//$NON-NLS-1$
>+	script.printProperty(tab, PROPERTY_JAVAC_SOURCE, "1.3");	//$NON-NLS-1$
>+	script.printProperty(tab, PROPERTY_JAVAC_TARGET, "1.1");	//$NON-NLS-1$
> 	script.println();
> 	script.printTargetDeclaration(tab++, TARGET_INIT, TARGET_PROPERTIES, null, null, null);
> 	script.printProperty(tab, getModelTypeName(), model.getId());
>@@ -394,4 +396,4 @@
> 	script.printTargetEnd(2);
> }
> 
>-}
>\ No newline at end of file
>+}

Actions: View | Diff

Attachments on bug 33192: 3767