Rename module "build" -> "build-common"

andy9775 · Jan 26, 2016 · aebf681 · aebf681
1 parent 8ec63bd
commit aebf681
Show file tree

Hide file tree

Showing 29 changed files with 21 additions and 23 deletions.
diff --git a/.idea/artifacts/KotlinJpsPlugin.xml b/.idea/artifacts/KotlinJpsPlugin.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/build/build.iml → build-common/build-common.iml b/build/build.iml → build-common/build-common.iml
@@ -4,8 +4,6 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/testData" type="java-test-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -16,4 +14,4 @@
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
   </component>
-</module>
+</module>
diff --git a/...g/jetbrains/kotlin/build/JvmSourceRoot.kt → ...g/jetbrains/kotlin/build/JvmSourceRoot.kt b/...g/jetbrains/kotlin/build/JvmSourceRoot.kt → ...g/jetbrains/kotlin/build/JvmSourceRoot.kt
diff --git a/.../jetbrains/kotlin/build/generatedFiles.kt → .../jetbrains/kotlin/build/generatedFiles.kt b/.../jetbrains/kotlin/build/generatedFiles.kt → .../jetbrains/kotlin/build/generatedFiles.kt
diff --git a/.../compilerRunner/OutputItemsCollector.java → .../compilerRunner/OutputItemsCollector.java b/.../compilerRunner/OutputItemsCollector.java → .../compilerRunner/OutputItemsCollector.java
diff --git a/...pilerRunner/OutputItemsCollectorImpl.java → ...pilerRunner/OutputItemsCollectorImpl.java b/...pilerRunner/OutputItemsCollectorImpl.java → ...pilerRunner/OutputItemsCollectorImpl.java
diff --git a/...tlin/compilerRunner/SimpleOutputItem.java → ...tlin/compilerRunner/SimpleOutputItem.java b/...tlin/compilerRunner/SimpleOutputItem.java → ...tlin/compilerRunner/SimpleOutputItem.java
diff --git a/...brains/kotlin/incremental/CacheVersion.kt → ...brains/kotlin/incremental/CacheVersion.kt b/...brains/kotlin/incremental/CacheVersion.kt → ...brains/kotlin/incremental/CacheVersion.kt
diff --git a/...otlin/incremental/IncrementalCacheImpl.kt → ...otlin/incremental/IncrementalCacheImpl.kt b/...otlin/incremental/IncrementalCacheImpl.kt → ...otlin/incremental/IncrementalCacheImpl.kt
diff --git a/...l/IncrementalCompilationComponentsImpl.kt → ...l/IncrementalCompilationComponentsImpl.kt b/...l/IncrementalCompilationComponentsImpl.kt → ...l/IncrementalCompilationComponentsImpl.kt
diff --git a/...otlin/incremental/LocalFileKotlinClass.kt → ...otlin/incremental/LocalFileKotlinClass.kt b/...otlin/incremental/LocalFileKotlinClass.kt → ...otlin/incremental/LocalFileKotlinClass.kt
diff --git a/...rains/kotlin/incremental/LookupStorage.kt → ...rains/kotlin/incremental/LookupStorage.kt b/...rains/kotlin/incremental/LookupStorage.kt → ...rains/kotlin/incremental/LookupStorage.kt
diff --git a/...tlin/incremental/ProtoCompareGenerated.kt → ...tlin/incremental/ProtoCompareGenerated.kt b/...tlin/incremental/ProtoCompareGenerated.kt → ...tlin/incremental/ProtoCompareGenerated.kt
diff --git a/...otlin/incremental/protoDifferenceUtils.kt → ...otlin/incremental/protoDifferenceUtils.kt b/...otlin/incremental/protoDifferenceUtils.kt → ...otlin/incremental/protoDifferenceUtils.kt
diff --git a/...ns/kotlin/incremental/storage/BasicMap.kt → ...ns/kotlin/incremental/storage/BasicMap.kt b/...ns/kotlin/incremental/storage/BasicMap.kt → ...ns/kotlin/incremental/storage/BasicMap.kt
diff --git a/...lin/incremental/storage/BasicMapsOwner.kt → ...lin/incremental/storage/BasicMapsOwner.kt b/...lin/incremental/storage/BasicMapsOwner.kt → ...lin/incremental/storage/BasicMapsOwner.kt
diff --git a/.../incremental/storage/ClassOneToManyMap.kt → .../incremental/storage/ClassOneToManyMap.kt b/.../incremental/storage/ClassOneToManyMap.kt → .../incremental/storage/ClassOneToManyMap.kt
diff --git a/...kotlin/incremental/storage/FileToIdMap.kt → ...kotlin/incremental/storage/FileToIdMap.kt b/...kotlin/incremental/storage/FileToIdMap.kt → ...kotlin/incremental/storage/FileToIdMap.kt
diff --git a/...kotlin/incremental/storage/IdToFileMap.kt → ...kotlin/incremental/storage/IdToFileMap.kt b/...kotlin/incremental/storage/IdToFileMap.kt → ...kotlin/incremental/storage/IdToFileMap.kt
diff --git a/...kotlin/incremental/storage/LazyStorage.kt → ...kotlin/incremental/storage/LazyStorage.kt b/...kotlin/incremental/storage/LazyStorage.kt → ...kotlin/incremental/storage/LazyStorage.kt
diff --git a/...s/kotlin/incremental/storage/LookupMap.kt → ...s/kotlin/incremental/storage/LookupMap.kt b/...s/kotlin/incremental/storage/LookupMap.kt → ...s/kotlin/incremental/storage/LookupMap.kt
diff --git a/...tlin/incremental/storage/externalizers.kt → ...tlin/incremental/storage/externalizers.kt b/...tlin/incremental/storage/externalizers.kt → ...tlin/incremental/storage/externalizers.kt
diff --git a/...ains/kotlin/incremental/storage/values.kt → ...ains/kotlin/incremental/storage/values.kt b/...ains/kotlin/incremental/storage/values.kt → ...ains/kotlin/incremental/storage/values.kt
diff --git a/.../kotlin/modules/KotlinModuleXmlBuilder.kt → .../kotlin/modules/KotlinModuleXmlBuilder.kt b/.../kotlin/modules/KotlinModuleXmlBuilder.kt → .../kotlin/modules/KotlinModuleXmlBuilder.kt
diff --git a/build.xml b/build.xml
@@ -603,15 +603,15 @@
         </jar>
     </target>
 
-    <target name="kotlin-build">
-        <cleandir dir="${output}/classes/kotlin-build"/>
+    <target name="kotlin-build-common">
+        <cleandir dir="${output}/classes/kotlin-build-common"/>
 
-        <javac2 destdir="${output}/classes/kotlin-build" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
+        <javac2 destdir="${output}/classes/kotlin-build-common" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
                 source="${java.target}" target="${java.target}">
-            <withKotlin modulename="kotlin-build"/>
+            <withKotlin modulename="kotlin-build-common"/>
             <skip pattern="kotlin/jvm/internal/.*"/>
             <src>
-                <pathelement path="build/src"/>
+                <pathelement path="build-common/src"/>
             </src>
             <classpath>
                 <pathelement path="${bootstrap.runtime}"/>
@@ -621,28 +621,28 @@
             </classpath>
         </javac2>
 
-        <jar destfile="${kotlin-home}/lib/kotlin-build.jar">
-            <fileset dir="${output}/classes/kotlin-build"/>
+        <jar destfile="${kotlin-home}/lib/kotlin-build-common.jar">
+            <fileset dir="${output}/classes/kotlin-build-common"/>
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
 
             <manifest>
                 <attribute name="Built-By" value="${manifest.impl.vendor}"/>
 
                 <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build.common}"/>
                 <attribute name="Implementation-Version" value="${build.number}"/>
             </manifest>
         </jar>
 
-        <jar jarfile="${output}/kotlin-build-sources.jar">
-            <fileset dir="build/src"/>
+        <jar jarfile="${output}/kotlin-build-common-sources.jar">
+            <fileset dir="build-common/src"/>
             <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
 
             <manifest>
                 <attribute name="Built-By" value="${manifest.impl.vendor}"/>
 
                 <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
-                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build.sources}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build.common.sources}"/>
                 <attribute name="Implementation-Version" value="${build.number}"/>
             </manifest>
         </jar>
@@ -1054,7 +1054,7 @@
             depends="builtins,stdlib,kotlin-test,core,reflection,pack-runtime,pack-runtime-sources,mock-runtime-for-test"/>
 
     <target name="dist"
-            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,kotlin-build,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin,daemon-client"
+            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,kotlin-build-common,ant-tools,jdk-annotations,android-sdk-annotations,runtime,kotlin-js-stdlib,android-compiler-plugin,daemon-client"
             description="Builds redistributables from sources"/>
 
     <target name="dist-quick"

diff --git a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
@@ -27,7 +27,7 @@ import java.util.*
 
 class GenerateProtoBufCompare {
     companion object {
-        val DEST_FILE: File = File("build/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt")
+        val DEST_FILE: File = File("build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt")
 
         @JvmStatic
         fun main(args: Array<String>) {

diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
@@ -10,7 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="idea-jps-common" />
     <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="build" />
+    <orderEntry type="module" module-name="build-common" />
     <orderEntry type="library" name="jps" level="project" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
@@ -25,4 +25,4 @@
     <orderEntry type="module" module-name="daemon-common" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
   </component>
-</module>
+</module>
diff --git a/resources/kotlinManifest.properties b/resources/kotlinManifest.properties
@@ -25,5 +25,5 @@ manifest.impl.title.kotlin.android.sdk.annotations=Kotlin Compiler Android SDK A
 
 manifest.impl.title.kotlin.daemon-client=Kotlin Compile Daemon Client
 
-manifest.impl.title.kotlin.build=Kotlin Builder
-manifest.impl.title.kotlin.build.sources=Kotlin Builder Sources
+manifest.impl.title.kotlin.build.common=Kotlin Build Common
+manifest.impl.title.kotlin.build.common.sources=Kotlin Build Common Sources