azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix path duplication in "kotlin-for-upsource" in build.xml

Browse Source
This commit is contained in:
Alexander Udalov
2014-12-05 12:19:03 +03:00
parent 4d66ca88ee
commit ee8df85bfe
1 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+10 -32
View File
@@ -60,22 +60,20 @@
</if> </if>
<dirset id="compilerSources.dirset" dir="${basedir}/"> <dirset id="compilerSources.dirset" dir="${basedir}/">
<include name="compiler/frontend/src"/>
<include name="core/descriptors/src"/> <include name="core/descriptors/src"/>
<include name="core/serialization/src"/> <include name="core/serialization/src"/>
<include name="core/descriptor.loader.java/src"/> <include name="core/descriptor.loader.java/src"/>
<include name="compiler/frontend.java/src"/>
<include name="core/serialization.java/src"/> <include name="core/serialization.java/src"/>
<include name="core/util.runtime/src"/>
<include name="compiler/frontend/src"/>
<include name="compiler/frontend.java/src"/>
<include name="compiler/backend-common/src"/> <include name="compiler/backend-common/src"/>
<include name="compiler/backend/src"/> <include name="compiler/backend/src"/>
<include name="compiler/cli/src"/> <include name="compiler/cli/src"/>
<include name="compiler/cli/cli-common/src"/> <include name="compiler/cli/cli-common/src"/>
<include name="compiler/util/src"/> <include name="compiler/util/src"/>
<include name="core/util.runtime/src"/>
<!--<include name="j2k/src"/>-->
<include name="compiler/jet.as.java.psi/src"/> <include name="compiler/jet.as.java.psi/src"/>
<include name="compiler/builtins-serializer"/> <include name="compiler/builtins-serializer/src"/>
<include name="js/js.dart-ast/src"/> <include name="js/js.dart-ast/src"/>
<include name="js/js.translator/src"/> <include name="js/js.translator/src"/>
<include name="js/js.frontend/src"/> <include name="js/js.frontend/src"/>
@@ -98,7 +96,6 @@
<include name="util.runtime/**"/> <include name="util.runtime/**"/>
<include name="jet.as.java.psi/**"/> <include name="jet.as.java.psi/**"/>
<include name="builtins-serializer/**"/> <include name="builtins-serializer/**"/>
<include name="js.dart-ast/**"/> <include name="js.dart-ast/**"/>
<include name="js.translator/**"/> <include name="js.translator/**"/>
<include name="js.frontend/**"/> <include name="js.frontend/**"/>
@@ -150,18 +147,18 @@
<target name="compiler-sources"> <target name="compiler-sources">
<jar jarfile="${output}/kotlin-compiler-sources.jar"> <jar jarfile="${output}/kotlin-compiler-sources.jar">
<!-- TODO How to convert it from pathset or dirset ? --> <!-- TODO How to convert it from pathset or dirset ? -->
<fileset dir="compiler/frontend/src"/>
<fileset dir="core/descriptors/src"/> <fileset dir="core/descriptors/src"/>
<fileset dir="core/descriptor.loader.java/src"/> <fileset dir="core/descriptor.loader.java/src"/>
<fileset dir="core/serialization/src"/> <fileset dir="core/serialization/src"/>
<fileset dir="core/serialization.java/src"/> <fileset dir="core/serialization.java/src"/>
<fileset dir="core/util.runtime/src"/>
<fileset dir="compiler/frontend/src"/>
<fileset dir="compiler/frontend.java/src"/> <fileset dir="compiler/frontend.java/src"/>
<fileset dir="compiler/backend-common/src"/> <fileset dir="compiler/backend-common/src"/>
<fileset dir="compiler/backend/src"/> <fileset dir="compiler/backend/src"/>
<fileset dir="compiler/cli/src"/> <fileset dir="compiler/cli/src"/>
<fileset dir="j2k/src"/> <fileset dir="compiler/cli/cli-common/src"/>
<fileset dir="compiler/util/src"/> <fileset dir="compiler/util/src"/>
<fileset dir="core/util.runtime/src"/>
<fileset dir="compiler/jet.as.java.psi/src"/> <fileset dir="compiler/jet.as.java.psi/src"/>
<fileset dir="compiler/builtins-serializer"/> <fileset dir="compiler/builtins-serializer"/>
<fileset dir="js/js.dart-ast/src"/> <fileset dir="js/js.dart-ast/src"/>
@@ -775,9 +772,8 @@
<fileset dir="${dependencies.dir}" includes="jansi.jar"/> <fileset dir="${dependencies.dir}" includes="jansi.jar"/>
<fileset dir="${dependencies.dir}" includes="cli-parser-1.1.1.jar"/> <fileset dir="${dependencies.dir}" includes="cli-parser-1.1.1.jar"/>
<fileset dir="${basedir}/ideaSDK/jps" includes="jps-model.jar"/> <fileset dir="${basedir}/ideaSDK/jps" includes="jps-model.jar"/>
<pathelement location="${output}/classes/builtins"/> <fileset dir="${kotlin-home}/lib" includes="kotlin-runtime.jar"/>
<pathelement location="${output}/classes/compiler"/> <pathelement location="${output}/classes/compiler"/>
<pathelement location="${output}/classes/stdlib"/>
</classpath> </classpath>
</javac2> </javac2>
@@ -788,7 +784,6 @@
<jar jarfile="${output}/kotlin-for-upsource0.jar"> <jar jarfile="${output}/kotlin-for-upsource0.jar">
<fileset dir="${output}/classes/idea-analysis"/> <fileset dir="${output}/classes/idea-analysis"/>
<fileset dir="${output}/classes/compiler"/> <fileset dir="${output}/classes/compiler"/>
<fileset dir="${output}/classes/builtins"/>
<fileset dir="${output}/builtins"> <fileset dir="${output}/builtins">
<include name="kotlin/**"/> <include name="kotlin/**"/>
<exclude name="kotlin/internal/**"/> <exclude name="kotlin/internal/**"/>
@@ -797,8 +792,8 @@
<fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/> <fileset dir="${basedir}/compiler/backend/src" includes="META-INF/services/**"/>
<zipgroupfileset dir="${basedir}/lib" includes="*.jar"/> <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
<zipgroupfileset dir="${kotlin-home}/lib" includes="kotlin-runtime.jar"/>
<zipgroupfileset dir="${kotlin-home}/lib" includes="kotlin-runtime-sources.jar"/> <zipgroupfileset dir="${kotlin-home}/lib" includes="kotlin-runtime-sources.jar"/>
<fileset dir="${output}/classes/stdlib"/>
<!-- icons, etc. --> <!-- icons, etc. -->
<fileset dir="idea/resources"/> <fileset dir="idea/resources"/>
@@ -815,24 +810,7 @@
<!-- sources --> <!-- sources -->
<jar jarfile="${output}/kotlin-for-upsource-sources.jar"> <jar jarfile="${output}/kotlin-for-upsource-sources.jar">
<fileset dir="compiler/frontend/src"/> <zipfileset src="${output}/kotlin-compiler-sources.jar" includes="**/*"/>
<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"/>
<fileset dir="compiler/cli/src"/>
<fileset dir="j2k/src"/>
<fileset dir="compiler/util/src"/>
<fileset dir="core/util.runtime/src"/>
<fileset dir="compiler/jet.as.java.psi/src"/>
<fileset dir="compiler/builtins-serializer"/>
<fileset dir="js/js.dart-ast/src"/>
<fileset dir="js/js.translator/src"/>
<fileset dir="js/js.frontend/src"/>
<fileset dir="js/js.inliner/src"/>
<fileset dir="idea/idea-analysis/src"/> <fileset dir="idea/idea-analysis/src"/>
<fileset dir="idea/ide-common/src"/> <fileset dir="idea/ide-common/src"/>