From 0a93cfc9c091619599b7fd89ed481449f1f53a04 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 30 Mar 2015 20:17:21 +0300
Subject: [PATCH] build.xml: drop 'generate.assertions' option

It was error-prone, not very useful (only a couple seconds saved on a 3min
build), and in fact did not work since 5194310d, because <skip> element was
failing inside the default javac
---
 build.xml | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/build.xml b/build.xml
index d4481735471..750545e0b68 100644
--- a/build.xml
+++ b/build.xml
@@ -5,8 +5,6 @@
 
     <!-- Set to false to disable proguard run on kotlin-compiler.jar. Speeds up the build -->
     <property name="shrink" value="true"/>
-    <!-- Set to false to disable compiler's @NotNull assertions. Speeds up the build -->
-    <property name="generate.assertions" value="true"/>
     <!-- Set to false to disable compiler's javadoc generation. Speeds up the build -->
     <property name="generate.javadoc" value="true"/>
 
@@ -71,23 +69,12 @@
     <typedef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${bootstrap.compiler.home}/lib/kotlin-ant.jar"/>
     <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${dependencies.dir}/ant-contrib.jar"/>
 
-    <taskdef name="javac2" classname="org.apache.tools.ant.taskdefs.Javac"/>
-    <if>
-        <istrue value="${generate.assertions}"/>
-        <then>
-            <path id="javac2.classpath">
-                <pathelement location="${idea.sdk}/lib/javac2.jar"/>
-                <pathelement location="${idea.sdk}/lib/asm-all.jar"/>
-            </path>
-            <taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="javac2.classpath" loaderref="javac2.loader"/>
-            <typedef name="skip" classname="com.intellij.ant.ClassFilterAnnotationRegexp" classpathref="javac2.classpath"
-                     loaderref="javac2.loader"/>
-            <echo message="Use javac2 from Idea lib"/>
-        </then>
-        <else>
-            <echo message="Use default javac compiler"/>
-        </else>
-    </if>
+    <path id="javac2.classpath">
+        <pathelement location="${idea.sdk}/lib/javac2.jar"/>
+        <pathelement location="${idea.sdk}/lib/asm-all.jar"/>
+    </path>
+    <taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="javac2.classpath" loaderref="javac2.loader"/>
+    <typedef name="skip" classname="com.intellij.ant.ClassFilterAnnotationRegexp" classpathref="javac2.classpath" loaderref="javac2.loader"/>
 
     <dirset id="compilerSources.dirset" dir="${basedir}/">
         <include name="core/descriptor.loader.java/src"/>