Browse Source

If submodule.noupdate=true is defined in private.properties, then the user is responsible for updating submodules themselves rather than having it handled automatically.

Fix ant complaining about modules/plugins/lib not existing if it hasn't been checked out yet.

Change-Id: Iba429fcdee0d4b9e546101c1a28dffb32ffbb842
Reviewed-on: http://gerrit.dmdirc.com/325
Tested-by: Shane Mc Cormack <shane@dmdirc.com>
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
tags/0.6.3b1
Shane Mc Cormack 14 years ago
parent
commit
fef1be8521
3 changed files with 7 additions and 4 deletions
  1. 1
    1
      build.xml
  2. 4
    1
      nbproject/build-impl.xml
  3. 2
    2
      nbproject/project.properties

+ 1
- 1
build.xml View File

@@ -12,7 +12,7 @@
12 12
     <import file="build-tests.xml"/>
13 13
     <import file="build-versioning.xml"/>
14 14
 
15
-    <target name="-submodules">
15
+    <target name="-submodules" unless="submodule.noupdate">
16 16
         <exec executable="git">
17 17
             <arg value="submodule"/>
18 18
             <arg value="init"/>

+ 4
- 1
nbproject/build-impl.xml View File

@@ -34,6 +34,9 @@ is divided into following sections:
34 34
         <!-- You can override this target in the ../build.xml file. -->
35 35
     </target>
36 36
     <target depends="-pre-init" name="-init-private">
37
+        <!-- Try to set this property only after -pre-init has been called. -->
38
+        <property name="plugins.libs.path" value="${toString:plugins.libs}" />
39
+
37 40
         <property file="nbproject/private/config.properties"/>
38 41
         <property file="nbproject/private/configs/${config}.properties"/>
39 42
         <property file="nbproject/private/private.properties"/>
@@ -50,7 +53,7 @@ is divided into following sections:
50 53
         <property file="nbproject/project.properties"/>
51 54
         <!-- Echo this here to make it easy for people to copy/paste into
52 55
              private.properties. -->
53
-        <echo message="Found Libraries: ${toString:plugins.libs}" />
56
+        <echo message="Found Libraries: ${plugins.libs.path}" />
54 57
     </target>
55 58
     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
56 59
         <available file="${manifest.file}" property="manifest.available"/>

+ 2
- 2
nbproject/project.properties View File

@@ -58,7 +58,7 @@ parser.test.dir=modules/parser/test
58 58
 plugins.test.dir=modules/plugins/test
59 59
 
60 60
 # Classpaths
61
-# ${toString:plugins.libs} generates at compile-time a string containing all
61
+# ${plugins.libs.path} generates at compile-time a string containing all
62 62
 # the plugin jars.
63 63
 # However netbeans fails miserably at understanding this in  the IDE, so we
64 64
 # have the private.classpath variable that can be defined by the user in
@@ -66,7 +66,7 @@ plugins.test.dir=modules/plugins/test
66 66
 # suckiness.
67 67
 # Without this parameter, everything will still compile, but netbeans won't
68 68
 # know about any files it isn't explicitly told about.
69
-javac.classpath=${private.classpath}:${toString:plugins.libs}
69
+javac.classpath=${private.classpath}:${plugins.libs.path}
70 70
 javac.test.classpath=\
71 71
     ${javac.classpath}:\
72 72
     ${build.classes.dir}:\

Loading…
Cancel
Save