Inline some properties from kotlinManifest.properties that were used …

…only once
sprigogin · May 5, 2017 · 2f7ab1c · 2f7ab1c
1 parent 96c36fb
commit 2f7ab1c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/build.xml b/build.xml
@@ -283,7 +283,7 @@
             <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.preloader}"/>
+                <attribute name="Implementation-Title" value="Kotlin Preloader"/>
                 <attribute name="Implementation-Version" value="${build.number}"/>
                 <attribute name="Main-Class" value="org.jetbrains.kotlin.preloading.Preloader"/>
             </manifest>
@@ -307,7 +307,7 @@
             <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.runner}"/>
+                <attribute name="Implementation-Title" value="Kotlin Runner"/>
                 <attribute name="Implementation-Version" value="${build.number}"/>
                 <attribute name="Main-Class" value="org.jetbrains.kotlin.runner.Main"/>
                 <attribute name="Class-Path" value="${runtime.jar}"/>
@@ -551,7 +551,7 @@
             <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.common}"/>
+                <attribute name="Implementation-Title" value="Kotlin Build Common"/>
                 <attribute name="Implementation-Version" value="${build.number}"/>
             </manifest>
         </jarjar>
@@ -579,7 +579,7 @@
                 <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.daemon.client}"/>
+                <attribute name="Implementation-Title" value="Kotlin Compile Daemon Client"/>
                 <attribute name="Implementation-Version" value="${build.number}"/>
             </manifest>
         </jar>
@@ -612,7 +612,7 @@
             <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.compiler.client.embeddable}"/>
+                <attribute name="Implementation-Title" value="Kotlin Compiler Client Embeddable"/>
                 <attribute name="Implementation-Version" value="${build.number}"/>
                 <attribute name="Class-Path" value="kotlin-stdlib.jar"/>
             </manifest>
@@ -795,7 +795,7 @@
                 <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.compiler.ant.task}"/>
+                <attribute name="Implementation-Title" value="Kotlin Compiler Ant Tasks"/>
                 <attribute name="Implementation-Version" value="${build.number}"/>
 
                 <attribute name="Class-Path" value="${compiler.manifest.class.path} kotlin-preloader.jar"/>

diff --git a/resources/kotlinManifest.properties b/resources/kotlinManifest.properties
@@ -9,17 +9,4 @@ manifest.impl.value.kotlin.runtime.component.main=Main
 manifest.impl.title.kotlin.compiler=Kotlin Compiler
 manifest.impl.title.kotlin.compiler.sources=Kotlin Compiler Sources
 
-manifest.impl.title.kotlin.compiler.ant.task=Kotlin Compiler Ant Tasks
-
-manifest.impl.title.kotlin.javascript.stdlib=Kotlin JavaScript StdLib
-
-manifest.impl.title.kotlin.preloader=Kotlin Preloader
-
-manifest.impl.title.kotlin.runner=Kotlin Runner
-
-
-manifest.impl.title.kotlin.daemon.client=Kotlin Compile Daemon Client
-
-manifest.impl.title.kotlin.build.common=Kotlin Build Common
-
-manifest.impl.title.kotlin.compiler.client.embeddable=Kotlin Compiler Client Embeddable
+manifest.impl.title.kotlin.javascript.stdlib=Kotlin JavaScript StdLib