From 1c628182202b220c14822f2d6a860ae73866b006 Mon Sep 17 00:00:00 2001
From: Leonid Shalupov <shalupov@diverse.org.ru>
Date: Fri, 22 Feb 2013 18:07:06 +0400
Subject: [PATCH] fix maven build if generate.javadoc is false

---
 build.xml | 58 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/build.xml b/build.xml
index 255554dd06e..d7c469c7d45 100644
--- a/build.xml
+++ b/build.xml
@@ -102,32 +102,32 @@
     </target>
 
     <target name="compilerSources">
+        <jar jarfile="${output}/kotlin-compiler-sources.jar">
+            <!-- TODO How to convert it from pathset or dirset ? -->
+            <fileset dir="compiler/frontend/src"/>
+            <fileset dir="compiler/frontend.java/src"/>
+            <fileset dir="compiler/backend/src"/>
+            <fileset dir="compiler/cli/src"/>
+            <fileset dir="j2k/src"/>
+            <fileset dir="compiler/util/src"/>
+            <fileset dir="compiler/jet.as.java.psi/src"/>
+            <fileset dir="runtime/src"/>
+            <fileset dir="js/js.translator/src"/>
+            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
+
+            <manifest>
+                <attribute name="Built-By" value="JetBrains"/>
+
+                <attribute name="Implementation-Vendor" value="JetBrains"/>
+                <attribute name="Implementation-Title" value="Kotlin Compiler Sources"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
+        </jar>
+
         <if>
             <istrue value="${generate.javadoc}"/>
 
             <then>
-                <jar jarfile="${output}/kotlin-compiler-sources.jar">
-                    <!-- TODO How to convert it from pathset or dirset ? -->
-                    <fileset dir="compiler/frontend/src"/>
-                    <fileset dir="compiler/frontend.java/src"/>
-                    <fileset dir="compiler/backend/src"/>
-                    <fileset dir="compiler/cli/src"/>
-                    <fileset dir="j2k/src"/>
-                    <fileset dir="compiler/util/src"/>
-                    <fileset dir="compiler/jet.as.java.psi/src"/>
-                    <fileset dir="runtime/src"/>
-                    <fileset dir="js/js.translator/src"/>
-                    <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
-
-                    <manifest>
-                        <attribute name="Built-By" value="JetBrains"/>
-
-                        <attribute name="Implementation-Vendor" value="JetBrains"/>
-                        <attribute name="Implementation-Title" value="Kotlin Compiler Sources"/>
-                        <attribute name="Implementation-Version" value="${build.number}"/>
-                    </manifest>
-                </jar>
-
                 <delete dir="${output}/kotlin-compiler-javadoc" failonerror="false"/>
                 <javadoc destdir="${output}/kotlin-compiler-javadoc"
                          sourcepathref="compilerSources.path"
@@ -147,6 +147,18 @@
                     </manifest>
                 </jar>
             </then>
+
+            <else>
+                <jar jarfile="${output}/kotlin-compiler-javadoc.jar">
+                    <manifest>
+                        <attribute name="Built-By" value="JetBrains"/>
+
+                        <attribute name="Implementation-Vendor" value="JetBrains"/>
+                        <attribute name="Implementation-Title" value="Kotlin Compiler Javadoc"/>
+                        <attribute name="Implementation-Version" value="${build.number}"/>
+                    </manifest>
+                </jar>
+            </else>
         </if>
     </target>
 
@@ -449,4 +461,4 @@
     </target>
 </project>
 
-<!-- vim: set ts=4 sw=4 et nowrap: -->
+    <!-- vim: set ts=4 sw=4 et nowrap: -->