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

Rename module build-tools -> ant

Browse Source
This commit is contained in:
Alexander Udalov
2014-12-10 15:12:11 +03:00
parent 06984328e2
commit f08c9d9815
9 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+1 -1
View File
@@ -5,10 +5,10 @@
<module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.iml" /> <module fileurl="file://$PROJECT_DIR$/Kotlin.iml" filepath="$PROJECT_DIR$/Kotlin.iml" />
<module fileurl="file://$PROJECT_DIR$/android-studio/android-studio.iml" filepath="$PROJECT_DIR$/android-studio/android-studio.iml" group="ide" /> <module fileurl="file://$PROJECT_DIR$/android-studio/android-studio.iml" filepath="$PROJECT_DIR$/android-studio/android-studio.iml" group="ide" />
<module fileurl="file://$PROJECT_DIR$/compiler/android-tests/android-tests.iml" filepath="$PROJECT_DIR$/compiler/android-tests/android-tests.iml" group="compiler" /> <module fileurl="file://$PROJECT_DIR$/compiler/android-tests/android-tests.iml" filepath="$PROJECT_DIR$/compiler/android-tests/android-tests.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/ant/ant.iml" filepath="$PROJECT_DIR$/ant/ant.iml" />
<module fileurl="file://$PROJECT_DIR$/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/compiler/backend/backend.iml" group="compiler/java" /> <module fileurl="file://$PROJECT_DIR$/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/compiler/backend/backend.iml" group="compiler/java" />
<module fileurl="file://$PROJECT_DIR$/compiler/backend-common/backend-common.iml" filepath="$PROJECT_DIR$/compiler/backend-common/backend-common.iml" group="compiler" /> <module fileurl="file://$PROJECT_DIR$/compiler/backend-common/backend-common.iml" filepath="$PROJECT_DIR$/compiler/backend-common/backend-common.iml" group="compiler" />
<module fileurl="file://$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" group="ide/jps" /> <module fileurl="file://$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" group="ide/jps" />
<module fileurl="file://$PROJECT_DIR$/build-tools/build-tools.iml" filepath="$PROJECT_DIR$/build-tools/build-tools.iml" />
<module fileurl="file://$PROJECT_DIR$/core/builtins/builtins.iml" filepath="$PROJECT_DIR$/core/builtins/builtins.iml" group="core" /> <module fileurl="file://$PROJECT_DIR$/core/builtins/builtins.iml" filepath="$PROJECT_DIR$/core/builtins/builtins.iml" group="core" />
<module fileurl="file://$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" filepath="$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" group="compiler/cli" /> <module fileurl="file://$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" filepath="$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" group="compiler/cli" />
<module fileurl="file://$PROJECT_DIR$/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/compiler/cli/cli.iml" group="compiler/cli" /> <module fileurl="file://$PROJECT_DIR$/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/compiler/cli/cli.iml" group="compiler/cli" />
build-tools/build-tools.iml → ant/ant.iml
+1 -3
View File
@@ -3,8 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/core/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/ant/src" isTestSource="false" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
@@ -16,4 +15,3 @@
<orderEntry type="library" name="ant-1.7" level="project" /> <orderEntry type="library" name="ant-1.7" level="project" />
</component> </component>
</module> </module>
build-tools/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt → ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JsTask.kt
View File
build-tools/ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt → ant/src/org/jetbrains/jet/buildtools/ant/Kotlin2JvmTask.kt
View File
build-tools/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerAdapter.java → ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerAdapter.java
View File
build-tools/ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerBaseTask.kt → ant/src/org/jetbrains/jet/buildtools/ant/KotlinCompilerBaseTask.kt
View File
build-tools/ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml → ant/src/org/jetbrains/jet/buildtools/ant/antlib.xml
View File
build.xml
+6 -7
View File
@@ -560,14 +560,13 @@
</target> </target>
<target name="ant-tools"> <target name="ant-tools">
<cleandir dir="${output}/classes/buildTools"/> <cleandir dir="${output}/classes/ant"/>
<javac2 destdir="${output}/classes/buildTools" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" <javac2 destdir="${output}/classes/ant" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
source="${java.target}" target="${java.target}"> source="${java.target}" target="${java.target}">
<withKotlin externalannotations="${external.annotations.path}"/> <withKotlin externalannotations="${external.annotations.path}"/>
<src> <src>
<dirset dir="${basedir}/build-tools"> <dirset dir="${basedir}/ant">
<include name="core/src"/> <include name="src"/>
<include name="ant/src"/>
</dirset> </dirset>
</src> </src>
<compilerarg value="-Xlint:all"/> <compilerarg value="-Xlint:all"/>
@@ -579,8 +578,8 @@
</javac2> </javac2>
<jar destfile="${kotlin-home}/lib/kotlin-ant.jar"> <jar destfile="${kotlin-home}/lib/kotlin-ant.jar">
<fileset dir="${output}/classes/buildTools"/> <fileset dir="${output}/classes/ant"/>
<fileset dir="${basedir}/build-tools/ant/src" includes="**/*.xml"/> <fileset dir="${basedir}/ant/src" includes="**/*.xml"/>
<zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/> <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
<manifest> <manifest>
docs/confluence.jetbrains.com/Kotlin/0_Welcome.confluence
+1 -1
View File
@@ -34,7 +34,7 @@ The IDE plugin requires the latest EAP build of [IntelliJ IDEA 11.1|http://eap.j
h3. Kontributions h3. Kontributions
* [stdlib|https://github.com/JetBrains/kotlin/tree/master/stdlib] by James Strachan * [stdlib|https://github.com/JetBrains/kotlin/tree/master/stdlib] by James Strachan
* [Ant, Maven etc integration|https://github.com/JetBrains/kotlin/tree/master/build-tools] by Evgeny Goldin * [Ant, Maven etc integration|https://github.com/JetBrains/kotlin/tree/master/ant] by Evgeny Goldin
* [Aztec|https://github.com/kondratovich/aztec] by Andrew Kondratovich * [Aztec|https://github.com/kondratovich/aztec] by Andrew Kondratovich
* [Be the next Kontributor!|http://blog.jetbrains.com/kotlin/2012/03/contributing-to-kotlin/] * [Be the next Kontributor!|http://blog.jetbrains.com/kotlin/2012/03/contributing-to-kotlin/]
{column} {column}