Attachment #3767 for bug #33192

View | Details | Raw Unified | Return to bug 33192
Collapse All | Expand All

Lines 611-616 Link Here

(-)orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractBuildScriptGenerator.java (-1 / +3 lines)
611	javac.setFailOnError(getPropertyFormat(PROPERTY_JAVAC_FAIL_ON_ERROR));	611	javac.setFailOnError(getPropertyFormat(PROPERTY_JAVAC_FAIL_ON_ERROR));
612	javac.setDebug(getPropertyFormat(PROPERTY_JAVAC_DEBUG_INFO));	612	javac.setDebug(getPropertyFormat(PROPERTY_JAVAC_DEBUG_INFO));
613	javac.setVerbose(getPropertyFormat(PROPERTY_JAVAC_VERBOSE));	613	javac.setVerbose(getPropertyFormat(PROPERTY_JAVAC_VERBOSE));
		614	javac.setSource(getPropertyFormat(PROPERTY_JAVAC_SOURCE));
		615	javac.setTarget(getPropertyFormat(PROPERTY_JAVAC_TARGET));
614	javac.setIncludeAntRuntime("no"); //$NON-NLS-1$	616	javac.setIncludeAntRuntime("no"); //$NON-NLS-1$
615	String[] sources = jar.getSource();	617	String[] sources = jar.getSource();
616	javac.setSrcdir(sources);	618	javac.setSrcdir(sources);
Lines 921-924 Link Here
921	buffer.replace(begin, end, newVersion);	923	buffer.replace(begin, end, newVersion);
922	Utils.transferStreams(new ByteArrayInputStream(buffer.toString().getBytes()), new FileOutputStream(buildFile));	924	Utils.transferStreams(new ByteArrayInputStream(buffer.toString().getBytes()), new FileOutputStream(buildFile));
923	}	925	}
924	}	926	}

Lines 24-29 Link Here

(-)orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ant/JavacTask.java (+20 lines)
24	protected String includeAntRuntime;	24	protected String includeAntRuntime;
25	protected String fork;	25	protected String fork;
26	protected String debug;	26	protected String debug;
		27	protected String source;
		28	protected String target;
27		29
28	/**	30	/**
29	* Default constructor for the class. */	31	* Default constructor for the class. */
Lines 123-126 Link Here
123	public void setDebug(String debug) {	125	public void setDebug(String debug) {
124	this.debug = debug;	126	this.debug = debug;
125	}	127	}
		128
		129	/**
		130	* Set the javac task source attribute to be the given value. Valid values
		131	* are <code>"1.3"</code> and <code>"1.4"</code>.
		132	* * @param source either <code>"1.3"</code> or <code>"1.4"</code> */
		133	public void setSource(String source) {
		134	this.source = source;
		135	}
		136
		137	/**
		138	* Set the javac task target attribute to be the given value. Valid values
		139	* are <code>"1.1"</code> and <code>"1.2"</code> and
		140	* <code>"1.3"</code> and <code>"1.4"</code>.
		141	* * @param source either <code>"1.1"</code> or <code>"1.2"</code> or
		142	* <code>"1.3"</code> or <code>"1.4"</code> */
		143	public void setTarget(String target) {
		144	this.target = target;
		145	}
126	}	146	}

Lines 93-99 Link Here

(-)orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/IXMLConstants.java (-1 / +3 lines)
93	public static final String PROPERTY_JAVAC_FAIL_ON_ERROR = "javacFailOnError"; //$NON-NLS-1$	93	public static final String PROPERTY_JAVAC_FAIL_ON_ERROR = "javacFailOnError"; //$NON-NLS-1$
94	public static final String PROPERTY_JAVAC_DEBUG_INFO = "javacDebugInfo"; //$NON-NLS-1$	94	public static final String PROPERTY_JAVAC_DEBUG_INFO = "javacDebugInfo"; //$NON-NLS-1$
95	public static final String PROPERTY_JAVAC_VERBOSE = "javacVerbose"; //$NON-NLS-1$	95	public static final String PROPERTY_JAVAC_VERBOSE = "javacVerbose"; //$NON-NLS-1$
		96	public static final String PROPERTY_JAVAC_SOURCE = "javacSource"; //$NON-NLS-1$
		97	public static final String PROPERTY_JAVAC_TARGET = "javacTarget"; //$NON-NLS-1$
96		98
97	public static final String PROPERTY_OUTPUT_PREFIX = "output."; //$NON-NLS-1$	99	public static final String PROPERTY_OUTPUT_PREFIX = "output."; //$NON-NLS-1$
98	public static final String PROPERTY_EXTRAPATH_PREFIX = "extra."; //$NON-NLS-1$	100	public static final String PROPERTY_EXTRAPATH_PREFIX = "extra."; //$NON-NLS-1$
99	}	101	}

Lines 316-321 Link Here

(-)orig/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ModelBuildScriptGenerator.java (-1 / +3 lines)
316	script.printProperty(tab, PROPERTY_JAVAC_FAIL_ON_ERROR, "false"); //$NON-NLS-1$	316	script.printProperty(tab, PROPERTY_JAVAC_FAIL_ON_ERROR, "false"); //$NON-NLS-1$
317	script.printProperty(tab, PROPERTY_JAVAC_DEBUG_INFO, "on"); //$NON-NLS-1$	317	script.printProperty(tab, PROPERTY_JAVAC_DEBUG_INFO, "on"); //$NON-NLS-1$
318	script.printProperty(tab, PROPERTY_JAVAC_VERBOSE, "true"); //$NON-NLS-1$	318	script.printProperty(tab, PROPERTY_JAVAC_VERBOSE, "true"); //$NON-NLS-1$
		319	script.printProperty(tab, PROPERTY_JAVAC_SOURCE, "1.3"); //$NON-NLS-1$
		320	script.printProperty(tab, PROPERTY_JAVAC_TARGET, "1.1"); //$NON-NLS-1$
319	script.println();	321	script.println();
320	script.printTargetDeclaration(tab++, TARGET_INIT, TARGET_PROPERTIES, null, null, null);	322	script.printTargetDeclaration(tab++, TARGET_INIT, TARGET_PROPERTIES, null, null, null);
321	script.printProperty(tab, getModelTypeName(), model.getId());	323	script.printProperty(tab, getModelTypeName(), model.getId());
Lines 394-397 Link Here
394	script.printTargetEnd(2);	396	script.printTargetEnd(2);
395	}	397	}
396		398
397	}	399	}

Return to bug 33192