Bläddra i källkod

Support for plugins building using ivy.

Change-Id: I34d7849a75cd4c7a91e04a9dad6f8073aa5a8f61
Depends-On: I65d96f91e1eb5ed7afb43dd41cd00531d809878d
Reviewed-on: http://gerrit.dmdirc.com/2735
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
tags/0.8rc1
Chris Smith 10 år sedan
förälder
incheckning
60b4da4c16
3 ändrade filer med 7 tillägg och 2 borttagningar
  1. 1
    0
      build-properties.xml
  2. 5
    1
      build.xml
  3. 1
    1
      nbproject/build-impl.xml

+ 1
- 0
build-properties.xml Visa fil

41
     <target name="-init-private-properties" depends="-init-properties,-create-private-properties,-check-private-classpath,-create-private-classpath,-create-private-test-classpath">
41
     <target name="-init-private-properties" depends="-init-properties,-create-private-properties,-check-private-classpath,-create-private-classpath,-create-private-test-classpath">
42
         <path id="main-libs">
42
         <path id="main-libs">
43
             <fileset dir="modules" includes="*/lib/*.jar"/>
43
             <fileset dir="modules" includes="*/lib/*.jar"/>
44
+            <fileset dir="modules" includes="*/lib/main/*.jar"/>
44
             <fileset dir="lib/main" includes="*.jar"/>
45
             <fileset dir="lib/main" includes="*.jar"/>
45
         </path>
46
         </path>
46
 
47
 

+ 5
- 1
build.xml Visa fil

61
         </jar>
61
         </jar>
62
     </target>
62
     </target>
63
 
63
 
64
-    <target name="-pre-init" depends="-init-dependencies,-init-private-properties"/>
64
+    <target name="-init-submodule-dependencies">
65
+        <subant buildpath="modules/plugins" target="init-dependencies"/>
66
+    </target>
67
+
68
+    <target name="-pre-init" depends="-init-dependencies,-init-submodule-dependencies,-init-private-properties"/>
65
     <target name="-post-compile" depends="-write-version, build-plugins"/>
69
     <target name="-post-compile" depends="-write-version, build-plugins"/>
66
     <target name="-post-test-run" depends="-do-test-reports"/>
70
     <target name="-post-test-run" depends="-do-test-reports"/>
67
     <target name="-post-jar" depends="-update-bundled-plugins,-bundle-slf4j,-bundle-dagger"/>
71
     <target name="-post-jar" depends="-update-bundled-plugins,-bundle-slf4j,-bundle-dagger"/>

+ 1
- 1
nbproject/build-impl.xml Visa fil

27
                 ======================
27
                 ======================
28
             -->
28
             -->
29
     <path id="all.libs">
29
     <path id="all.libs">
30
-        <fileset dir="modules/plugins/lib" includes="*.jar"/>
30
+        <fileset dir="modules/plugins/lib/main" includes="*.jar"/>
31
         <fileset dir="lib" includes="*.jar"/>
31
         <fileset dir="lib" includes="*.jar"/>
32
     </path>
32
     </path>
33
 
33
 

Laddar…
Avbryt
Spara