|
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 2202-2207
Link Here
|
| 2202 |
boolean didSpecifyWarnings = false; |
2197 |
boolean didSpecifyWarnings = false; |
| 2203 |
boolean useEnableJavadoc = false; |
2198 |
boolean useEnableJavadoc = false; |
| 2204 |
boolean didSpecifyCompliance = false; |
2199 |
boolean didSpecifyCompliance = false; |
|
|
2200 |
boolean didSpecifyDisabledAnnotationProcessing = false; |
| 2205 |
|
2201 |
|
| 2206 |
String customEncoding = null; |
2202 |
String customEncoding = null; |
| 2207 |
String customDestinationPath = null; |
2203 |
String customDestinationPath = null; |
|
Lines 2705-2710
Link Here
|
| 2705 |
continue; |
2701 |
continue; |
| 2706 |
} |
2702 |
} |
| 2707 |
if (currentArg.equals("-proc:none")) { //$NON-NLS-1$ |
2703 |
if (currentArg.equals("-proc:none")) { //$NON-NLS-1$ |
|
|
2704 |
didSpecifyDisabledAnnotationProcessing = true; |
| 2708 |
this.options.put( |
2705 |
this.options.put( |
| 2709 |
CompilerOptions.OPTION_Process_Annotations, |
2706 |
CompilerOptions.OPTION_Process_Annotations, |
| 2710 |
CompilerOptions.DISABLED); |
2707 |
CompilerOptions.DISABLED); |
|
Lines 3000-3005
Link Here
|
| 3000 |
this.logger.logVersion(printVersionRequired); |
2997 |
this.logger.logVersion(printVersionRequired); |
| 3001 |
|
2998 |
|
| 3002 |
validateOptions(didSpecifyCompliance); |
2999 |
validateOptions(didSpecifyCompliance); |
|
|
3000 |
|
| 3001 |
// Enable annotation processing by default in batch mode when compliance is at least 1.6 |
| 3002 |
// see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=185768 |
| 3003 |
if (!didSpecifyDisabledAnnotationProcessing |
| 3004 |
&& CompilerOptions.versionToJdkLevel(this.options.get(CompilerOptions.OPTION_Compliance)) >= ClassFileConstants.JDK1_6) { |
| 3005 |
this.options.put(CompilerOptions.OPTION_Process_Annotations, CompilerOptions.ENABLED); |
| 3006 |
} |
| 3003 |
|
3007 |
|
| 3004 |
this.logger.logCommandLineArguments(newCommandLineArgs); |
3008 |
this.logger.logCommandLineArguments(newCommandLineArgs); |
| 3005 |
this.logger.logOptions(this.options); |
3009 |
this.logger.logOptions(this.options); |
