Remove duplicate copyright file, use license/LICENSE.txt instead

This commit is contained in:
Alexander Udalov
2015-01-13 12:48:13 +03:00
parent 348d9dfce4
commit edf054ddf3
7 changed files with 6 additions and 23 deletions
@@ -92,7 +92,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
StringBuilder out = new StringBuilder();
Printer p = new Printer(out);
p.print(FileUtil.loadFile(new File("generators/injector-generator/copyright.txt")));
p.print(FileUtil.loadFile(new File("license/LICENSE.txt")));
p.println("package " + testClassPackage + ";");
p.println();
p.println("import ", baseTestClassPackage, ".", baseTestClassName, ";");
@@ -1,15 +0,0 @@
/*
* Copyright 2010-2015 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.
*/
@@ -130,9 +130,7 @@ public class DependencyInjectorGenerator {
}
private static void generatePreamble(String injectorPackageName, Printer p) throws IOException {
String copyright = "generators/injector-generator/copyright.txt";
p.println(FileUtil.loadFile(new File(copyright)));
p.println(FileUtil.loadFile(new File("license/LICENSE.txt")));
p.println("package " + injectorPackageName + ";");
p.println();
}
@@ -40,7 +40,7 @@ abstract class BuiltInsSourceGenerator(val out: PrintWriter) {
protected open fun getPackage(): String = "kotlin"
final fun generate() {
out.println(File("generators/injector-generator/copyright.txt").readText())
out.println(File("license/LICENSE.txt").readText())
// Don't include generator class name in the message: these are built-in sources,
// and we don't want to scare users with any internal information about our project
out.println("// Auto-generated file. DO NOT EDIT!")
@@ -36,7 +36,7 @@ fun main(args: Array<String>) {
fun generate(): String {
val sb = StringBuilder()
val p = Printer(sb)
p.println(FileUtil.loadFile(File("generators/injector-generator/copyright.txt")))
p.println(File("license/LICENSE.txt").readText())
p.println("package org.jetbrains.kotlin.resolve.constants.evaluate")
p.println()
p.println("import java.math.BigInteger")
@@ -38,7 +38,7 @@ public class GenerateKeywordStrings {
StringBuilder sb = new StringBuilder();
Printer p = new Printer(sb);
p.println(FileUtil.loadFile(new File("generators/injector-generator/copyright.txt")));
p.println(FileUtil.loadFile(new File("license/LICENSE.txt")));
p.println("package org.jetbrains.kotlin.renderer;");
p.println();
p.println("import java.util.Arrays;");
@@ -77,7 +77,7 @@ public class TestGenerator {
StringBuilder out = new StringBuilder();
Printer p = new Printer(out);
p.println(FileUtil.loadFile(new File("generators/injector-generator/copyright.txt")));
p.println(FileUtil.loadFile(new File("license/LICENSE.txt")));
p.println("package ", suiteClassPackage, ";");
p.println();
p.println("import com.intellij.testFramework.TestDataPath;");