Merge remote branch 'origin/master'

2011-12-30 15:10:45 +02:00
parent f2b1a16a1c 5897e90911
commit d140cbbea9
1 changed files with 5 additions and 5 deletions
@@ -168,17 +168,17 @@ public class CompileEnvironment {
    }

    public void compileModuleScript(String moduleFile, String jarPath, boolean jarRuntime) {
-        final IModuleSetBuilder moduleSetBuilder = loadModuleScript(moduleFile);
-        if (moduleSetBuilder == null) {
-            return;
-        }
-
        try {
            System.out.println("module file text: " + FileUtil.loadFile(new File(moduleFile)));
        } catch (Exception e) {
            e.printStackTrace();
        }

+        final IModuleSetBuilder moduleSetBuilder = loadModuleScript(moduleFile);
+        if (moduleSetBuilder == null) {
+            return;
+        }
+
        final String directory = new File(moduleFile).getParent();
        for (IModuleBuilder moduleBuilder : moduleSetBuilder.getModules()) {
            ClassFileFactory moduleFactory = compileModule(moduleBuilder, directory);