Browse Source

Tidy up properties build file

Change-Id: I82bf2ea9980c8b409a7d33efc787cb3b6d64d766
Reviewed-on: http://gerrit.dmdirc.com/3058
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.8rc1
Greg Holmes 10 years ago
parent
commit
f9a80a74dc
1 changed files with 1 additions and 28 deletions
  1. 1
    28
      build-properties.xml

+ 1
- 28
build-properties.xml View File

@@ -6,39 +6,12 @@
6 6
         <available file="nbproject/private/private.properties"/>
7 7
     </condition>
8 8
 
9
-    <target name="-init-properties">
10
-        <taskdef resource="net/sf/fikin/ant/ant.properties" classpathref="build-classpath"/>
11
-        <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="build-classpath"/>
12
-    </target>
13
-
14 9
     <target name="-create-private-properties" unless="private.properties.exists">
15 10
         <mkdir dir="nbproject/private"/>
16 11
         <echo file="nbproject/private/private.properties"/>
17 12
     </target>
18 13
 
19
-    <target name="-check-private-classpath">
20
-        <loadfile property="private.properties.old" srcFile="nbproject/private/private.properties"/>
21
-        <condition property="private.properties.needs.javac">
22
-            <not>
23
-                <matches string="${private.properties.old}" pattern="^javac.classpath=(.*)$" multiline="true" casesensitive="true"/>
24
-            </not>
25
-        </condition>
26
-        <condition property="private.properties.needs.javac.test">
27
-            <not>
28
-                <matches string="${private.properties.old}" pattern="^javac.test.classpath=(.*)$" multiline="true" casesensitive="true"/>
29
-            </not>
30
-        </condition>
31
-    </target>
32
-
33
-    <target name="-create-private-classpath" if="private.properties.needs.javac">
34
-        <echo append="true" file="nbproject/private/private.properties">${line.separator}javac.classpath=${line.separator}</echo>
35
-    </target>
36
-
37
-    <target name="-create-private-test-classpath" if="private.properties.needs.javac.test">
38
-        <echo append="true" file="nbproject/private/private.properties">${line.separator}javac.test.classpath=${line.separator}</echo>
39
-    </target>
40
-
41
-    <target name="-init-private-properties" depends="-init-properties,-create-private-properties,-check-private-classpath,-create-private-classpath,-create-private-test-classpath">
14
+    <target name="-init-private-properties" depends="-create-private-properties">
42 15
         <path id="main-libs">
43 16
             <fileset dir="lib/main" includes="*.jar"/>
44 17
             <fileset dir="modules" includes="*/lib/*.jar"/>

Loading…
Cancel
Save