MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

out-of-process build, cross-compiling: when module's sdk version is lower than the version of compiler's sdk, force lower bytecod target level to match the version of module's sdk.

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-05-11 19:03:06 +02:00
parent 13315a238d
commit 4bc1be41c0
1 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+38
View File
@@ -58,6 +58,7 @@ public class JavaBuilder extends ModuleLevelBuilder {
private static final String JAVA_EXTENSION = ".java";
private static final String FORM_EXTENSION = ".form";
public static final boolean USE_EMBEDDED_JAVAC = System.getProperty(GlobalOptions.USE_EXTERNAL_JAVAC_OPTION) == null;
private static final Key<Integer> JAVA_COMPILER_VERSION_KEY = Key.create("_java_compiler_version_");
public static final FileFilter JAVA_SOURCES_FILTER = new FileFilter() {
public boolean accept(File file) {
@@ -599,7 +600,17 @@ public class JavaBuilder extends ModuleLevelBuilder {
final BytecodeTargetConfiguration targetConfig = context.getProject().getCompilerConfiguration().getBytecodeTarget();
String bytecodeTarget = null;
int chunkSdkVersion = -1;
for (Module module : chunk.getModules()) {
final Sdk sdk = module.getSdk();
if (sdk instanceof JavaSdk) {
final JavaSdk moduleSdk = (JavaSdk)sdk;
final int moduleSdkVersion = convertToNumber(moduleSdk.getVersion());
if (moduleSdkVersion != 0 /*could determine the version*/&& (chunkSdkVersion < 0 || chunkSdkVersion > moduleSdkVersion)) {
chunkSdkVersion = moduleSdkVersion;
}
}
final String moduleTarget = getModuleTarget(targetConfig, module);
if (moduleTarget == null) {
continue;
@@ -617,10 +628,37 @@ public class JavaBuilder extends ModuleLevelBuilder {
options.add("-target");
options.add(bytecodeTarget);
}
else {
if (chunkSdkVersion > 0 && getCompilerSdkVersion(context) > chunkSdkVersion) {
// force lower bytecode target level to match the version of sdk assigned to this chunk
options.add("-target");
options.add("1." + chunkSdkVersion);
}
}
return options;
}
private static int getCompilerSdkVersion(CompileContext context) {
final Integer cached = JAVA_COMPILER_VERSION_KEY.get(context);
if (cached != null) {
return cached;
}
int javaVersion = convertToNumber(SystemProperties.getJavaVersion());
if (!USE_EMBEDDED_JAVAC) {
// in case of external javac, run compiler from the newest jdk that is used in the project
for (JavaSdk sdk : context.getProjectDescriptor().getProjectJavaSdks()) {
final String version = sdk.getVersion();
final int ver = convertToNumber(version);
if (ver > javaVersion) {
javaVersion = ver;
}
}
}
JAVA_COMPILER_VERSION_KEY.set(context, javaVersion);
return javaVersion;
}
@Nullable
private static String getModuleTarget(BytecodeTargetConfiguration config, Module module) {
final String level = config.getModulesBytecodeTarget().get(module.getName());