From edf054ddf366555394b15b172bcfbb3a5b15a2f5 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 13 Jan 2015 12:48:13 +0300 Subject: [PATCH] Remove duplicate copyright file, use license/LICENSE.txt instead --- .../tests/CodegenTestsOnAndroidGenerator.java | 2 +- generators/injector-generator/copyright.txt | 15 --------------- .../di/DependencyInjectorGenerator.java | 4 +--- .../generators/builtins/generateBuiltIns.kt | 2 +- .../generators/evaluate/GenerateOperationsMap.kt | 2 +- .../frontend/GenerateKeywordStrings.java | 2 +- .../generators/tests/generator/TestGenerator.java | 2 +- 7 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 generators/injector-generator/copyright.txt diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java index 4b20347f431..857def42ff9 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java @@ -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, ";"); diff --git a/generators/injector-generator/copyright.txt b/generators/injector-generator/copyright.txt deleted file mode 100644 index 2f232596c08..00000000000 --- a/generators/injector-generator/copyright.txt +++ /dev/null @@ -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. - */ diff --git a/generators/injector-generator/src/org/jetbrains/kotlin/generators/di/DependencyInjectorGenerator.java b/generators/injector-generator/src/org/jetbrains/kotlin/generators/di/DependencyInjectorGenerator.java index dbec1ad5a70..a9eea81ccce 100644 --- a/generators/injector-generator/src/org/jetbrains/kotlin/generators/di/DependencyInjectorGenerator.java +++ b/generators/injector-generator/src/org/jetbrains/kotlin/generators/di/DependencyInjectorGenerator.java @@ -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(); } diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt index f65468b9afd..34cd85b14e0 100644 --- a/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt +++ b/generators/src/org/jetbrains/kotlin/generators/builtins/generateBuiltIns.kt @@ -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!") diff --git a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt index 4a3dca21de5..37010da86b8 100644 --- a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt +++ b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt @@ -36,7 +36,7 @@ fun main(args: Array) { 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") diff --git a/generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java b/generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java index aefc1bf81bf..5c6051b96d4 100644 --- a/generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java +++ b/generators/src/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java @@ -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;"); diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java index 8745d3e033e..53535a20907 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java @@ -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;");