From a78509432e82a46eafc859eb7d6f2d8059a0d0cf Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 24 Mar 2014 15:54:26 +0400
Subject: [PATCH] Don't build j2k on 'ant dist'

It was only used in kotlin-web-demo some time ago
---
 build.xml                     | 29 ++---------------------------
 resources/manifest.properties |  2 --
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/build.xml b/build.xml
index d1a436fe0ca..ead08ac7288 100644
--- a/build.xml
+++ b/build.xml
@@ -611,38 +611,13 @@
         </jar>
     </target>
 
-    <target name="j2kConverter">
-        <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${dependencies.dir}/ant-contrib.jar"/>
-
-        <cleandir dir="${output}/classes/j2k"/>
-
-        <kotlinc output="${output}/classes/j2k">
-            <src path="${basedir}/j2k/src"/>
-            <classpath path="${kotlin-home}/lib/kotlin-compiler.jar"/>
-        </kotlinc>
-
-        <jar jarfile="${kotlin-home}/lib/tools/j2k.jar">
-            <fileset dir="${output}/classes/j2k" includes="org/jetbrains/jet/j2k/**"/>
-
-            <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.java2kotlin.converter}"/>
-                <attribute name="Implementation-Version" value="${build.number}"/>
-
-                <attribute name="Main-Class" value="org.jetbrains.jet.j2k.JavaToKotlinTranslator"/>
-            </manifest>
-        </jar>
-    </target>
-
     <!-- builds redistributables from sources -->
     <target name="dist"
-            depends="clean,init,prepareDist,preloader,builtins,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/>
+            depends="clean,init,prepareDist,preloader,builtins,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib"/>
 
     <!-- builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc -->
     <target name="dist_quick"
-            depends="clean,init,prepareDist,preloader,builtins,compiler_quick,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/>
+            depends="clean,init,prepareDist,preloader,builtins,compiler_quick,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib"/>
 
     <!-- builds compiler jar from project out dir -->
     <target name="dist_quick_compiler_only"
diff --git a/resources/manifest.properties b/resources/manifest.properties
index 017d2277a64..74c716e59ec 100644
--- a/resources/manifest.properties
+++ b/resources/manifest.properties
@@ -11,5 +11,3 @@ manifest.impl.title.kotlin.runtime.and.stdlib.sources=Kotlin Compiler Runtime +
 manifest.impl.title.kotlin.javascript.stdlib=Kotlin JavaScript StdLib
 
 manifest.impl.title.kotlin.preloader=Kotlin Preloader
-
-manifest.impl.title.java2kotlin.converter=Java to Kotlin Converter