Browse Source

Create lib dir before trying to use it

Convert CRLF to LF in build-ivy

Change-Id: I596ff1b068151b9c3b5009e7b6e3ea6ad5c85486
Reviewed-on: http://gerrit.dmdirc.com/2391
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
tags/0.6.7rc1
Chris Smith 12 years ago
parent
commit
1051c2d09e
2 changed files with 38 additions and 35 deletions
  1. 33
    34
      build-ivy.xml
  2. 5
    1
      build.xml

+ 33
- 34
build-ivy.xml View File

@@ -1,34 +1,33 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project name="DMDirc-ivy" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
3
-    <description>Ivy utilities for DMDirc</description>
4
-    
5
-    <property name="ivy.install.version" value="2.2.0"/>
6
-    <property name="ivy.cache.ttl.default" value="7d"/>
7
-    
8
-    <target name="-init-ivy">
9
-        <mkdir dir="lib"/>
10
-        <path id="ivy.classpath">
11
-           <fileset dir="lib" includes="*.jar"/>
12
-        </path>
13
-
14
-        <available classname="org.apache.ivy.ant.IvyConfigure" 
15
-              property="ivy.available" classpathref="ivy.classpath" />
16
-    </target>
17
-          
18
-    <target name="-download-ivy" depends="-init-ivy" unless="ivy.available">
19
-        <echo message="Retrieving Ivy"/>
20
-        <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
21
-             dest="lib/ivy-${ivy.install.version}.jar"/>
22
-    </target>
23
-    
24
-    <target name="-init-dependencies" depends="-download-ivy">
25
-        <!-- Regenerate the classpath as we may have just downloaded Ivy -->
26
-        <path id="ivy.classpath">
27
-            <fileset dir="lib" includes="*.jar"/>
28
-        </path>
29
-        
30
-        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.classpath"/>
31
-        <ivy:settings file="etc/ivy/ivysettings.xml"/>
32
-        <ivy:retrieve symlink="true" pattern="lib/[artifact]-[revision].[ext]" />
33
-    </target>
34
-</project>
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project name="DMDirc-ivy" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
3
+    <description>Ivy utilities for DMDirc</description>
4
+
5
+    <property name="ivy.install.version" value="2.2.0"/>
6
+    <property name="ivy.cache.ttl.default" value="7d"/>
7
+
8
+    <target name="-init-ivy" depends="-init-lib-directory">
9
+        <path id="ivy.classpath">
10
+           <fileset dir="lib" includes="*.jar"/>
11
+        </path>
12
+
13
+        <available classname="org.apache.ivy.ant.IvyConfigure"
14
+              property="ivy.available" classpathref="ivy.classpath" />
15
+    </target>
16
+
17
+    <target name="-download-ivy" depends="-init-ivy" unless="ivy.available">
18
+        <echo message="Retrieving Ivy"/>
19
+        <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
20
+             dest="lib/ivy-${ivy.install.version}.jar"/>
21
+    </target>
22
+
23
+    <target name="-init-dependencies" depends="-download-ivy">
24
+        <!-- Regenerate the classpath as we may have just downloaded Ivy -->
25
+        <path id="ivy.classpath">
26
+            <fileset dir="lib" includes="*.jar"/>
27
+        </path>
28
+
29
+        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.classpath"/>
30
+        <ivy:settings file="etc/ivy/ivysettings.xml"/>
31
+        <ivy:retrieve symlink="true" pattern="lib/[artifact]-[revision].[ext]" />
32
+    </target>
33
+</project>

+ 5
- 1
build.xml View File

@@ -11,7 +11,11 @@
11 11
     <import file="build-properties.xml"/>
12 12
     <import file="build-ivy.xml"/>
13 13
 
14
-    <target name="init-private">
14
+    <target name="-init-lib-directory">
15
+        <mkdir dir="lib"/>
16
+    </target>
17
+
18
+    <target name="init-private" depends="-init-lib-directory">
15 19
         <echo>Downloading private files, if this fails please pass username and</echo>
16 20
         <echo>password to ant using -Dusername=... -Dpassword=...</echo>
17 21
 

Loading…
Cancel
Save