Build jar for upsource

build.xml

@@ -148,6 +148,8 @@
             <fileset dir="compiler/frontend/src"/>
             <fileset dir="core/descriptors/src"/>
             <fileset dir="core/descriptor.loader.java/src"/>
+            <fileset dir="core/serialization/src"/>
+            <fileset dir="core/serialization.java/src"/>
             <fileset dir="compiler/frontend.java/src"/>
             <fileset dir="compiler/backend-common/src"/>
             <fileset dir="compiler/backend/src"/>
@@ -624,7 +626,7 @@
 
     <!-- builds redistributables from sources -->
     <target name="dist"
-            depends="clean,init,prepareDist,preloader,builtins,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib"/>
+            depends="clean,init,prepareDist,preloader,builtins,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,kotlin-for-upsource"/>
 
     <!-- builds everything, but classes are reused from project out dir, doesn't run proguard and javadoc -->
     <target name="dist_quick"
@@ -642,4 +644,33 @@
         </zip>
         <echo message="##teamcity[publishArtifacts '${output.relative}/${output.name}.zip']"/>
     </target>
+
+    <target name="kotlin-for-upsource">
+        <jar jarfile="${output}/kotlin-for-upsource0.jar">
+            <fileset dir="${output}/classes/compiler"/>
+            <fileset dir="${output}/classes/runtime"/>
+            <fileset dir="${output}/builtins">
+                <include name="kotlin/**"/>
+                <exclude name="kotlin/internal/**"/>
+            </fileset>
+            <fileset dir="${basedir}/compiler/frontend.java/src" includes="META-INF/services/**"/>
+            <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
+
+            <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
+            <fileset dir="${output}/classes/stdlib"/>
+
+            <!-- icons, etc. -->
+            <fileset dir="idea/resources"/>
+        </jar>
+        <sleep seconds="1"/>
+        <jar jarfile="${output}/kotlin-for-upsource.jar">
+            <zipfileset src="${output}/kotlin-for-upsource0.jar">
+                <exclude name="javax/**/*.java"/>
+            </zipfileset>
+        </jar>
+        <delete file="${output}/kotlin-for-upsource0.jar"/>
+
+        <echo message="##teamcity[publishArtifacts '${output.relative}/kotlin-for-upsource.jar']"/>
+    </target>
+
 </project>