From 2bd7a4ac79bfa813a0c19bdcd417c44039b38480 Mon Sep 17 00:00:00 2001
From: Sergey Mashkov <sergey.mashkov@jetbrains.com>
Date: Tue, 14 Jul 2015 17:27:47 +0300
Subject: Build fatjar by gradle and use it's output as dependency for maven
 and gradle plugins. Eliminate local repository in out dir.

---
 build.xml | 57 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index f0690aec..68d2761e 100644
--- a/build.xml
+++ b/build.xml
@@ -21,37 +21,38 @@
                 <fileset dir="lib" includes="*.jar"/>
             </classpath>
         </kotlinc>
-    </target>
 
-    <target name="fatjar" depends="build">
-        <jar jarfile="out/dokka-fat.jar">
-            <manifest>
-                <attribute name="Main-Class" value="org.jetbrains.dokka.DokkaPackage" />
-            </manifest>
+        <kotlinc src="ant/src" output="out/dokka-ant.jar" includeRuntime="false">
+            <compilerArg value="-Xrepeat"/>
+            <compilerArg value="${kotlinc.repeat}"/>
+            <classpath>
+                <fileset dir="lib" includes="*.jar"/>
+                <fileset dir="out" includes="dokka.jar" />
+            </classpath>
+        </kotlinc>
 
-            <zipgroupfileset dir="lib">
-                <include name="**/*.jar" />
-                <include name="*.jar" />
-            </zipgroupfileset>
-            <zipfileset src="out/dokka.jar">
-                <include name="**/*" />
-            </zipfileset>
+        <jar jarfile="out/dokka-ant.jar" update="true" >
+            <zipfileset dir="ant/src" includes="*.xml" prefix="org/jetbrains/dokka/ant" />
         </jar>
     </target>
 
-    <target name="install-fj" depends="fatjar">
-        <pom id="stupidpom"
-             groupid="org.jetbrains.dokka" artifactid="dokka-fatjar" version="1.0"
-             name="Dokka fatjar"
-             packaging="jar"
-        />
-
-        <writepom pomrefid="stupidpom" file="out/dokka-fat.pom" />
-        <pom id="mypom" file="out/dokka-fat.pom" />
+    <target name="fatjar" depends="build">
+        <exec executable="${basedir}/dokka-fatjar/gradlew" dir="dokka-fatjar" osfamily="unix" failonerror="true">
+            <arg value="assemble" />
+        </exec>
+        <exec executable="cmd.exe" dir="dokka-fatjar" osfamily="windows" failonerror="true">
+            <arg line="/c ${basedir}\dokka-fatjar\gradlew.bat assemble" />
+        </exec>
+    </target>
 
-        <install file="out/dokka-fat.jar" pomrefid="mypom">
-            <localrepository path="out/repo" />
-        </install>
+    <target name="install-fj" depends="fatjar">
+        <exec executable="${basedir}/dokka-fatjar/gradlew" dir="dokka-fatjar" osfamily="unix" failonerror="true">
+            <arg value="assemble" />
+            <arg value="publishToMavenLocal" />
+        </exec>
+        <exec executable="cmd.exe" dir="dokka-fatjar" osfamily="windows" failonerror="true">
+            <arg line="/c ${basedir}\dokka-fatjar\gradlew.bat assemble publishToMavenLocal" />
+        </exec>
     </target>
 
     <target name="gradle-install" depends="install-fj">
@@ -64,9 +65,13 @@
         </exec>
     </target>
 
-    <target name="build-and-install" depends="install-fj,gradle-install">
+    <target name="maven-install" depends="install-fj">
         <mvn mavenversion="3.0.5" dir="maven-plugin" pom="maven-plugin/pom.xml">
             <arg value="install" />
         </mvn>
     </target>
+
+    <target name="build-and-install" depends="gradle-install,maven-install">
+        <echo message="Done" />
+    </target>
 </project>
-- 
cgit 


From f0ea1cfaec90479243268a87b11481141fd920c5 Mon Sep 17 00:00:00 2001
From: Sergey Mashkov <sergey.mashkov@jetbrains.com>
Date: Tue, 14 Jul 2015 20:21:59 +0300
Subject: Add new module to ant clean task

---
 build.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 68d2761e..41f32d70 100644
--- a/build.xml
+++ b/build.xml
@@ -7,6 +7,8 @@
     <target name="clean">
         <delete dir="out" />
         <delete dir="maven-plugin/target" />
+        <delete dir="dokka-fatjar/build" />
+        <delete dir="dokka-fatjar/.gradle" />
         <delete dir="gradle-plugin/build" />
         <delete dir="gradle-plugin/.gradle" />
     </target>
-- 
cgit