View | Details | Raw Unified | Return to bug 188656 | Differences between
and this patch

Collapse All | Expand All

(-)batch/org/eclipse/jdt/internal/compiler/batch/Main.java (-5 / +6 lines)
Lines 2156-2166 Link Here
2156
		return;
2156
		return;
2157
	}
2157
	}
2158
2158
2159
	// enable annotation processing by default in batch mode: 185768
2160
	this.options.put(
2161
		CompilerOptions.OPTION_Process_Annotations,
2162
		CompilerOptions.ENABLED);
2163
2164
	final int INSIDE_CLASSPATH_start = 1;
2159
	final int INSIDE_CLASSPATH_start = 1;
2165
	final int INSIDE_DESTINATION_PATH = 3;
2160
	final int INSIDE_DESTINATION_PATH = 3;
2166
	final int INSIDE_TARGET = 4;
2161
	final int INSIDE_TARGET = 4;
Lines 3864-3869 Link Here
3864
		throw new InvalidInputException(this.bind("configure.incompatibleComplianceForSource", (String)this.options.get(CompilerOptions.OPTION_Compliance), CompilerOptions.VERSION_1_4)); //$NON-NLS-1$
3859
		throw new InvalidInputException(this.bind("configure.incompatibleComplianceForSource", (String)this.options.get(CompilerOptions.OPTION_Compliance), CompilerOptions.VERSION_1_4)); //$NON-NLS-1$
3865
	}
3860
	}
3866
3861
3862
	// Enable annotation processing by default in batch mode when compliance is at least 1.6
3863
	// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=185768
3864
	if (CompilerOptions.versionToJdkLevel(compliance) >= ClassFileConstants.JDK1_6) {
3865
		this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED);
3866
	}
3867
3867
	// check and set compliance/source/target compatibilities
3868
	// check and set compliance/source/target compatibilities
3868
	if (this.didSpecifyTarget) {
3869
	if (this.didSpecifyTarget) {
3869
		final Object targetVersion = this.options.get(CompilerOptions.OPTION_TargetPlatform);
3870
		final Object targetVersion = this.options.get(CompilerOptions.OPTION_TargetPlatform);

Return to bug 188656