Temporary solution for the case where the user has two different JDKs: one in java.home, and the other configured in the project.

In this case, we used to take the java.home one first and ignore project settings, because the classpath was shared between the module script compilation and the module compilation.
2012-03-02 16:14:10 +04:00
parent aa7b8cb7df
commit 3664a3b2fc
1 changed files with 7 additions and 6 deletions
@@ -167,20 +167,21 @@ public class CompileEnvironment {
        return null;
    }

-    public boolean compileModuleScript(String moduleFile, @Nullable String jarPath, @Nullable String outputDir, boolean jarRuntime) {
-        List<Module> modules = loadModuleScript(moduleFile);
+    public boolean compileModuleScript(String moduleScriptFile, @Nullable String jarPath, @Nullable String outputDir, boolean jarRuntime) {
+        List<Module> modules = loadModuleScript(moduleScriptFile);

        if (modules == null) {
-            throw new CompileEnvironmentException("Module script " + moduleFile + " compilation failed");
+            throw new CompileEnvironmentException("Module script " + moduleScriptFile + " compilation failed");
        }

        if (modules.isEmpty()) {
-            throw new CompileEnvironmentException("No modules where defined by " + moduleFile);
+            throw new CompileEnvironmentException("No modules where defined by " + moduleScriptFile);
        }

-        final String directory = new File(moduleFile).getParent();
+        final String directory = new File(moduleScriptFile).getParent();
        for (Module moduleBuilder : modules) {
-            ClassFileFactory moduleFactory = compileModule(moduleBuilder, directory);
+            CompileEnvironment compileEnvironment = new CompileEnvironment(myFileNameTransformer, myMessageRenderer);
+            ClassFileFactory moduleFactory = compileEnvironment.compileModule(moduleBuilder, directory);
            if (moduleFactory == null) {
                return false;
            }