Procházet zdrojové kódy

Fix path for generating private.properties.

Not really sure when or how this broke!

Change-Id: I7a1717c1b5ecc0102b60a7ff2fafdfaf1bed2da2
Reviewed-on: http://gerrit.dmdirc.com/2423
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
tags/0.7rc1
Chris Smith před 12 roky
rodič
revize
9bb71ff3ef
1 změnil soubory, kde provedl 9 přidání a 4 odebrání
  1. 9
    4
      build-properties.xml

+ 9
- 4
build-properties.xml Zobrazit soubor

14
         <taskdef resource="net/sf/fikin/ant/ant.properties" classpathref="libclasspath"/>
14
         <taskdef resource="net/sf/fikin/ant/ant.properties" classpathref="libclasspath"/>
15
         <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="libclasspath"/>
15
         <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="libclasspath"/>
16
     </target>
16
     </target>
17
-    
17
+
18
     <target name="-create-private-properties" unless="private.properties.exists">
18
     <target name="-create-private-properties" unless="private.properties.exists">
19
         <mkdir dir="nbproject/private"/>
19
         <mkdir dir="nbproject/private"/>
20
         <echo file="nbproject/private/private.properties"/>
20
         <echo file="nbproject/private/private.properties"/>
21
     </target>
21
     </target>
22
-    
22
+
23
     <target name="-check-private-classpath">
23
     <target name="-check-private-classpath">
24
         <loadfile property="private.properties.old" srcFile="nbproject/private/private.properties"/>
24
         <loadfile property="private.properties.old" srcFile="nbproject/private/private.properties"/>
25
         <condition property="private.properties.needsinsert">
25
         <condition property="private.properties.needsinsert">
28
             </not>
28
             </not>
29
         </condition>
29
         </condition>
30
     </target>
30
     </target>
31
-    
31
+
32
     <target name="-create-private-classpath" if="private.properties.needsinsert">
32
     <target name="-create-private-classpath" if="private.properties.needsinsert">
33
         <echo append="true" file="nbproject/private/private.properties">${line.separator}private.classpath=${line.separator}</echo>
33
         <echo append="true" file="nbproject/private/private.properties">${line.separator}private.classpath=${line.separator}</echo>
34
     </target>
34
     </target>
35
 
35
 
36
     <target name="-init-private-properties" depends="-init-properties,-create-private-properties,-check-private-classpath,-create-private-classpath">
36
     <target name="-init-private-properties" depends="-init-properties,-create-private-properties,-check-private-classpath,-create-private-classpath">
37
+        <path id="all.libs">
38
+            <fileset dir="modules" includes="*/lib/*.jar"/>
39
+            <fileset dir="lib" includes="*.jar"/>
40
+        </path>
41
+
37
         <propertyregex property="private.classpath.value" input="${toString:all.libs}" regexp="\\" replace="/" global="true" defaultValue="${toString:all.libs}"/>
42
         <propertyregex property="private.classpath.value" input="${toString:all.libs}" regexp="\\" replace="/" global="true" defaultValue="${toString:all.libs}"/>
38
         <replaceregexp file="nbproject/private/private.properties" match="^private.classpath=(.*)$" flags="im" replace="private.classpath=${private.classpath.value}"/>
43
         <replaceregexp file="nbproject/private/private.properties" match="^private.classpath=(.*)$" flags="im" replace="private.classpath=${private.classpath.value}"/>
39
     </target>
44
     </target>
40
-    
45
+
41
 </project>
46
 </project>

Načítá se…
Zrušit
Uložit