From 90a7b17fd8f4298989072dc43701b75b8f1f40f9 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Thu, 5 Jul 2012 18:08:12 +0400
Subject: [PATCH] Creating empty compiler configuration in module script
 instead of default.

---
 .../jet/cli/jvm/CompilerConfigurationUtl.java | 66 -------------------
 .../jvm/compiler/CompileEnvironmentUtil.java  |  7 +-
 2 files changed, 2 insertions(+), 71 deletions(-)
 delete mode 100644 compiler/cli/src/org/jetbrains/jet/cli/jvm/CompilerConfigurationUtl.java

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/CompilerConfigurationUtl.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/CompilerConfigurationUtl.java
deleted file mode 100644
index 6c5525b0713..00000000000
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/CompilerConfigurationUtl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2010-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.cli.jvm;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.config.CompilerConfiguration;
-import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
-import org.jetbrains.jet.utils.PathUtil;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode.*;
-
-/**
- * @author Evgeny Gerashchenko
- * @since 7/4/12
- */
-public class CompilerConfigurationUtl {
-    // TODO merge with similar K2JVMCompiler method
-    public static CompilerConfiguration getDefaultConfiguration(@NotNull CompilerSpecialMode compilerSpecialMode) {
-        List<File> classpath = new ArrayList<File>();
-        if (includeJdk(compilerSpecialMode)) {
-            classpath.add(PathUtil.findRtJar());
-        }
-        if (includeKotlinRuntime(compilerSpecialMode)) {
-            classpath.add(PathUtil.getDefaultRuntimePath());
-        }
-        File[] annotationsPath = new File[0];
-        if (includeJdkAnnotations(compilerSpecialMode)) {
-            annotationsPath = new File[]{PathUtil.getJdkAnnotationsPath()};
-        }
-
-        CompilerConfiguration configuration = new CompilerConfiguration();
-        configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, classpath.toArray(new File[classpath.size()]));
-        configuration.putUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, annotationsPath);
-        return configuration;
-    }
-
-    private static boolean includeJdkAnnotations(@NotNull CompilerSpecialMode mode) {
-        return mode == REGULAR || mode == STDLIB || mode == IDEA;
-    }
-
-    public static boolean includeKotlinRuntime(@NotNull CompilerSpecialMode mode) {
-        return mode == REGULAR;
-    }
-
-    public static boolean includeJdk(@NotNull CompilerSpecialMode mode) {
-        return mode != IDEA;
-    }
-}
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
index 3649af85e5b..611947758c0 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
@@ -27,14 +27,12 @@ import jet.modules.Module;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.cli.common.messages.MessageCollector;
-import org.jetbrains.jet.cli.jvm.CompilerConfigurationUtl;
 import org.jetbrains.jet.codegen.BuiltinToJavaTypesMapping;
 import org.jetbrains.jet.codegen.ClassFileFactory;
 import org.jetbrains.jet.codegen.GeneratedClassLoader;
 import org.jetbrains.jet.codegen.GenerationState;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
-import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.utils.PathUtil;
@@ -142,9 +140,8 @@ public class CompileEnvironmentUtil {
 
             }
         };
-        CompilerConfiguration configuration = CompilerConfigurationUtl.getDefaultConfiguration(CompilerSpecialMode.REGULAR);
-        JetCoreEnvironment scriptEnvironment = JetCoreEnvironment.createCoreEnvironmentForJVM(disposable, configuration
-        );
+        CompilerConfiguration configuration = new CompilerConfiguration();
+        JetCoreEnvironment scriptEnvironment = JetCoreEnvironment.createCoreEnvironmentForJVM(disposable, configuration);
         scriptEnvironment.addSources(moduleScriptFile);
 
         GenerationState generationState = KotlinToJVMBytecodeCompiler