Browse Source

Re-evaluate clover.installed after grabbing the license

Change-Id: I343272df0d5d0b770ed88219a9656a7bdefe9c57
Reviewed-on: http://gerrit.dmdirc.com/2379
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
tags/0.6.7rc1
Chris Smith 12 years ago
parent
commit
7751284c41
1 changed files with 11 additions and 0 deletions
  1. 11
    0
      build.xml

+ 11
- 0
build.xml View File

@@ -13,13 +13,24 @@
13 13
     <target name="init-private">
14 14
         <echo>Downloading private files, if this fails please pass username and</echo>
15 15
         <echo>password to ant using -Dusername=... -Dpassword=...</echo>
16
+
16 17
         <get src="http://www.dmdirc.com/private/clover.license" dest="lib/clover.license" username="${username}" password="${password}"/>
18
+
17 19
         <get dest="installer/signing/" username="${username}" password="${password}">
18 20
             <url url="http://www.dmdirc.com/private/DMDirc.cer"/>
19 21
             <url url="http://www.dmdirc.com/private/DMDirc.pvk"/>
20 22
             <url url="http://www.dmdirc.com/private/DMDirc.spc"/>
21 23
         </get>
24
+
22 25
 	<get dest="addons.api.key" username="${username}" password="${password}" src="http://www.dmdirc.com/private/addons.api.key"/>
26
+
27
+        <!-- Re-evaluate as the license is probably here now -->
28
+        <condition property="clover.installed">
29
+            <and>
30
+                <available classname="com.cenqua.clover.CloverInstr"/>
31
+                <available file="lib/clover.license"/>
32
+            </and>
33
+        </condition>
23 34
     </target>
24 35
 
25 36
     <target name="-post-clean">

Loading…
Cancel
Save