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

Move ant from dependencies/ant -> dependencies/ant-1.7

Browse Source
This commit is contained in:
Erokhin Stanislav
2013-10-25 19:45:22 +04:00
parent 3ee918b084
commit 35bc3cd587
5 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/ant.xml → .idea/libraries/ant_1_7.xml
Generated
+2 -2
View File
@@ -1,7 +1,7 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="ant"> <library name="ant-1.7">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/ant.jar!/" /> <root url="jar://$PROJECT_DIR$/dependencies/ant-1.7/lib/ant.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
build-tools/build-tools.iml
+1 -1
View File
@@ -13,7 +13,7 @@
<orderEntry type="module" module-name="frontend" /> <orderEntry type="module" module-name="frontend" />
<orderEntry type="module" module-name="backend" /> <orderEntry type="module" module-name="backend" />
<orderEntry type="module" module-name="util" /> <orderEntry type="module" module-name="util" />
<orderEntry type="library" name="ant" level="project" /> <orderEntry type="library" name="ant-1.7" level="project" />
</component> </component>
</module> </module>
build.xml
+1 -1
View File
@@ -443,7 +443,7 @@
<classpath> <classpath>
<fileset dir="${kotlin-home}/lib" includes="kotlin-compiler.jar"/> <fileset dir="${kotlin-home}/lib" includes="kotlin-compiler.jar"/>
<file file="${bootstrap.runtime}"/> <file file="${bootstrap.runtime}"/>
<fileset dir="${basedir}/dependencies" includes="ant.jar"/> <fileset dir="${basedir}/dependencies/ant-1.7/lib" includes="ant.jar"/>
</classpath> </classpath>
</javac2> </javac2>
compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskTest.java
+1 -1
View File
@@ -70,6 +70,6 @@ public class AntTaskTest extends KotlinIntegrationTestBase {
} }
private static String getAntHome() { private static String getAntHome() {
return getKotlinProjectHome().getAbsolutePath() + File.separator + "dependencies" + File.separator + "ant"; return getKotlinProjectHome().getAbsolutePath() + File.separator + "dependencies" + File.separator + "ant-1.7";
} }
} }
update_dependencies.xml
+2 -10
View File
@@ -128,17 +128,9 @@
<get src="http://archive.apache.org/dist/ant/source/apache-ant-1.7.0-src.zip" <get src="http://archive.apache.org/dist/ant/source/apache-ant-1.7.0-src.zip"
dest="dependencies/apache-ant-1.7.0-src.zip" usetimestamp="true"/> dest="dependencies/apache-ant-1.7.0-src.zip" usetimestamp="true"/>
<delete file="dependencies/ant.jar" failonerror="false"/> <delete dir="dependencies/ant-1.7" failonerror="false"/>
<untar src="dependencies/download/apache-ant-1.7.0-bin.tar.gz" dest="dependencies" compression="gzip">
<patternset>
<include name="apache-ant-1.7.0/lib/ant.jar"/>
</patternset>
<mapper type="flatten"/>
</untar>
<delete dir="dependencies/ant" failonerror="false"/>
<untar src="dependencies/download/apache-ant-1.7.0-bin.tar.gz" dest="dependencies" compression="gzip"/> <untar src="dependencies/download/apache-ant-1.7.0-bin.tar.gz" dest="dependencies" compression="gzip"/>
<move file="dependencies/apache-ant-1.7.0" tofile="dependencies/ant"/> <move file="dependencies/apache-ant-1.7.0" tofile="dependencies/ant-1.7"/>
<!-- dx.jar --> <!-- dx.jar -->
<get-maven-library prefix="com/google/android/tools" lib="dx" version="1.7" target.jar.name.base="dx"/> <get-maven-library prefix="com/google/android/tools" lib="dx" version="1.7" target.jar.name.base="dx"/>