some fixes in update_dependencies.xml

2012-07-11 19:08:09 +04:00
parent de3f5d0e2d
commit 6e1dffb29c
2 changed files with 36 additions and 21 deletions
@@ -1,11 +1,11 @@
 <component name="libraryTable">
  <library name="jline">
    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/jline-2.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/jline.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/jline-2.6-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/dependencies/jline-sources.jar!/" />
    </SOURCES>
  </library>
 </component>
@@ -14,11 +14,12 @@
    </target>

    <target name="fetch-third-party">
-        <mkdir dir="dependencies" />
-        <mkdir dir="dependencies/download" />
+        <mkdir dir="dependencies"/>
+        <mkdir dir="dependencies/download"/>

        <!-- ProGuard -->
-        <get src="http://heanet.dl.sourceforge.net/project/proguard/proguard%20beta/4.8beta/proguard4.8beta1.zip" dest="dependencies/download/proguard4.8beta1.zip" usetimestamp="true"/>
+        <get src="http://heanet.dl.sourceforge.net/project/proguard/proguard%20beta/4.8beta/proguard4.8beta1.zip"
+             dest="dependencies/download/proguard4.8beta1.zip" usetimestamp="true"/>

        <delete file="dependencies/proguard.jar" failonerror="false"/>
        <unzip src="dependencies/download/proguard4.8beta1.zip" dest="dependencies">
@@ -29,7 +30,8 @@
        </unzip>

        <!-- ant contrib -->
-        <get src="http://heanet.dl.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip" dest="dependencies/download/ant-contrib-1.0b3-bin.zip" usetimestamp="true"/>
+        <get src="http://heanet.dl.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip"
+             dest="dependencies/download/ant-contrib-1.0b3-bin.zip" usetimestamp="true"/>

        <delete file="dependencies/ant-contrib.jar" failonerror="false"/>
        <unzip src="dependencies/download/ant-contrib-1.0b3-bin.zip" dest="dependencies">
@@ -41,16 +43,16 @@

        <!-- JarJar -->
        <get src="http://jarjar.googlecode.com/files/jarjar-1.2.jar" dest="dependencies/download/jarjar-1.2.jar" usetimestamp="true"/>
-        <copy file="dependencies/download/jarjar-1.2.jar" tofile="dependencies/jarjar.jar" overwrite="true" />
+        <copy file="dependencies/download/jarjar-1.2.jar" tofile="dependencies/jarjar.jar" overwrite="true"/>

        <!-- PluginVerifier -->
        <get src="http://teamcity.jetbrains.com/guestAuth/repository/download/bt351/.lastPinned/plugin-verifier-1.0-SNAPSHOT.jar"
             dest="dependencies/download/plugin-verifier-1.0-SNAPSHOT.jar" usetimestamp="true"/>
-        <copy file="dependencies/download/plugin-verifier-1.0-SNAPSHOT.jar" tofile="dependencies/plugin-verifier.jar" overwrite="true" />
+        <copy file="dependencies/download/plugin-verifier-1.0-SNAPSHOT.jar" tofile="dependencies/plugin-verifier.jar" overwrite="true"/>

        <!-- ant 1.7.0 -->
        <get src="http://archive.apache.org/dist/ant/binaries/apache-ant-1.7.0-bin.tar.gz"
-             dest="dependencies/download/apache-ant-1.7.0-bin.tar.gz" usetimestamp="true" />
+             dest="dependencies/download/apache-ant-1.7.0-bin.tar.gz" usetimestamp="true"/>

        <delete file="dependencies/ant.jar" failonerror="false"/>
        <untar src="dependencies/download/apache-ant-1.7.0-bin.tar.gz" dest="dependencies" compression="gzip">
@@ -61,22 +63,35 @@
        </untar>

        <delete dir="dependencies/ant" failonerror="false"/>
-        <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" />
+        <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"/>

        <!-- dx.jar -->
-        <get src="http://search.maven.org/remotecontent?filepath=com/google/android/tools/dx/1.7/dx-1.7.jar" dest="dependencies/dx.jar"/>
-        <get src="http://search.maven.org/remotecontent?filepath=com/google/android/tools/dx/1.7/dx-1.7-sources.jar" dest="dependencies/dx-sources.jar"/>
+        <get src="http://repository.jetbrains.com/remote-repos/com/google/android/tools/dx/1.7/dx-1.7.jar"
+             dest="dependencies/download/dx-1.7.jar" usetimestamp="true"/>
+        <copy file="dependencies/download/dx-1.7.jar" tofile="dependencies/dx.jar" overwrite="true"/>

-        <get src="http://repo1.maven.org/maven2/jline/jline/2.6/jline-2.6.jar"
-            dest="dependencies/jline-2.6.jar"/>
-        <get src="http://repo1.maven.org/maven2/jline/jline/2.6/jline-2.6-sources.jar"
-            dest="dependencies/jline-2.6-sources.jar"/>
+        <get src="http://repository.jetbrains.com/remote-repos/com/google/android/tools/dx/1.7/dx-1.7-sources.jar"
+             dest="dependencies/download/dx-1.7-sources.jar" usetimestamp="true"/>
+        <copy file="dependencies/download/dx-1.7-sources.jar" tofile="dependencies/dx-sources.jar" overwrite="true"/>

-        <get src="http://repo1.maven.org/maven2/org/fusesource/jansi/jansi/1.9/jansi-1.9.jar"
-            dest="dependencies/jansi-1.9.jar"/>
-        <get src="http://repo1.maven.org/maven2/org/fusesource/jansi/jansi/1.9/jansi-1.9-sources.jar"
-            dest="dependencies/jansi-1.9-sources.jar"/>
+        <!-- jline -->
+        <get src="http://repository.jetbrains.com/remote-repos/jline/jline/2.6/jline-2.6.jar"
+             dest="dependencies/download/jline-2.6.jar" usetimestamp="true"/>
+        <copy file="dependencies/download/jline-2.6.jar" tofile="dependencies/jline.jar" overwrite="true"/>
+
+        <get src="http://repository.jetbrains.com/remote-repos/jline/jline/2.6/jline-2.6-sources.jar"
+             dest="dependencies/download/jline-2.6-sources.jar" usetimestamp="true"/>
+        <copy file="dependencies/download/jline-2.6-sources.jar" tofile="dependencies/jline-sources.jar" overwrite="true"/>
+
+        <!-- jansi -->
+        <get src="http://repository.jetbrains.com/remote-repos/org/fusesource/jansi/jansi/1.9/jansi-1.9.jar"
+             dest="dependencies/download/jansi-1.9.jar" usetimestamp="true"/>
+        <copy file="dependencies/download/jansi-1.9.jar" tofile="dependencies/jansi.jar" overwrite="true"/>
+
+        <get src="http://repository.jetbrains.com/remote-repos/org/fusesource/jansi/jansi/1.9/jansi-1.9-sources.jar"
+             dest="dependencies/download/jansi-1.9-sources.jar" usetimestamp="true"/>
+        <copy file="dependencies/download/jansi-1.9-sources.jar" tofile="dependencies/jansi-sources.jar" overwrite="true"/>
    </target>

    <macrodef name="execute_update">