Browse Source

Don't hard code which libs are used, just use any libs in modules/plugins/lib

Change-Id: I4ec0f02f52dd0d81c7f89e3bf76e47a555619119
Reviewed-on: http://gerrit.dmdirc.com/242
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
597431c81d
2 changed files with 12 additions and 25 deletions
  1. 10
    7
      nbproject/build-impl.xml
  2. 2
    18
      nbproject/project.properties

+ 10
- 7
nbproject/build-impl.xml View File

@@ -26,6 +26,9 @@ is divided into following sections:
26 26
                 INITIALIZATION SECTION
27 27
                 ======================
28 28
             -->
29
+    <path id="plugins.libs">
30
+        <fileset dir="modules/plugins/lib" includes="*.jar"/>
31
+    </path>
29 32
     <target name="-pre-init">
30 33
         <!-- Empty placeholder for easier customization. -->
31 34
         <!-- You can override this target in the ../build.xml file. -->
@@ -145,7 +148,7 @@ is divided into following sections:
145 148
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
146 149
             <attribute default="${plugins.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
147 150
             <attribute default="${build.classes.dir}" name="destdir"/>
148
-            <attribute default="${javac.classpath}" name="classpath"/>
151
+            <attribute default="${toString:plugins.libs}:${javac.classpath}" name="classpath"/>
149 152
             <attribute default="${includes}" name="includes"/>
150 153
             <attribute default="${excludes}" name="excludes"/>
151 154
             <attribute default="${javac.debug}" name="debug"/>
@@ -165,7 +168,7 @@ is divided into following sections:
165 168
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
166 169
             <attribute default="${plugins.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
167 170
             <attribute default="${build.classes.dir}" name="destdir"/>
168
-            <attribute default="${javac.classpath}" name="classpath"/>
171
+            <attribute default="${toString:plugins.libs}:${javac.classpath}" name="classpath"/>
169 172
             <sequential>
170 173
                 <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
171 174
                     <classpath>
@@ -530,7 +533,7 @@ is divided into following sections:
530 533
         <mkdir dir="${dist.javadoc.dir}"/>
531 534
         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="${javadoc.encoding.used}" destdir="${dist.javadoc.dir}" docencoding="${javadoc.encoding.used}" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
532 535
             <classpath>
533
-                <path path="${javac.classpath}"/>
536
+                <path path="${toString:plugins.libs}:${javac.classpath}"/>
534 537
             </classpath>
535 538
             <fileset dir="${main.src.dir}" excludes="${excludes}" includes="${includes}">
536 539
                 <filename name="**/*.java"/>
@@ -558,7 +561,7 @@ is divided into following sections:
558 561
         <mkdir dir="${doccheck.dir}"/>
559 562
         <javadoc additionalparam="-doclet com.sun.tools.doclets.doccheck.DocCheck -docletpath ${doccheck.path} -skipPkg net.miginfocom.*" author="${javadoc.author}" destdir="${doccheck.dir}" failonerror="true" private="${javadoc.private}" source="${javac.source}" sourcepath="${main.src.dir}:${parser.src.dir}:${plugins.src.dir}" useexternalfile="true" version="${javadoc.version}">
560 563
             <classpath>
561
-                <path path="${javac.classpath}"/>
564
+                <path path="${toString:plugins.libs}:${javac.classpath}"/>
562 565
             </classpath>
563 566
         </javadoc>
564 567
     </target>
@@ -591,10 +594,10 @@ is divided into following sections:
591 594
         <!-- You can override this target in the ../build.xml file. -->
592 595
     </target>
593 596
     <target if="do.depend.true" name="-compile-test-depend">
594
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
597
+        <j2seproject3:depend classpath="${toString:plugins.libs}:${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
595 598
     </target>
596 599
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
597
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
600
+        <j2seproject3:javac classpath="${toString:plugins.libs}:${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
598 601
         <copy todir="${build.test.classes.dir}">
599 602
             <fileset dir="${main.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
600 603
             <fileset dir="${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -613,7 +616,7 @@ is divided into following sections:
613 616
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
614 617
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
615 618
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
616
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
619
+        <j2seproject3:javac classpath="${toString:plugins.libs}:${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
617 620
         <copy todir="${build.test.classes.dir}">
618 621
             <fileset dir="${main.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
619 622
             <fileset dir="${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>

+ 2
- 18
nbproject/project.properties View File

@@ -3,15 +3,7 @@ project.license=dmdirc
3 3
 application.title=DMDirc
4 4
 application.vendor=chris
5 5
 build.generated.sources.dir=${build.dir}/generated-sources
6
-file.reference.fest-assert-1.0a1.jar=modules/plugins/lib/fest-assert-1.0a1.jar
7
-file.reference.fest-reflect-0.4.jar=modules/plugins/lib/fest-reflect-0.4.jar
8
-file.reference.fest-swing-1.0b1.jar=modules/plugins/lib/fest-swing-1.0b1.jar
9
-file.reference.fest-swing-junit-1.0b1.jar=modules/plugins/lib/fest-swing-junit-1.0b1.jar
10
-file.reference.fest-util-0.4.jar=modules/plugins/lib/fest-util-0.4.jar
11
-file.reference.jxlayer.jar=modules/plugins/lib/jxlayer.jar
12
-file.reference.miglayout.jar=modules/plugins/lib/miglayout-3.7.2-swing.jar
13 6
 file.reference.junit-4.jar=lib/junit-4.1.jar
14
-file.reference.mockito-all-1.6.jar=modules/plugins/lib/mockito-all-1.6.jar
15 7
 
16 8
 doccheck.path=doccheck.jar
17 9
 doccheck.dir=reports/doccheck/
@@ -38,9 +30,7 @@ dist.jar.excludes=com/dmdirc/addons/**
38 30
 excludes=
39 31
 includes=**
40 32
 jar.compress=false
41
-javac.classpath=\
42
-    ${file.reference.miglayout.jar}:\
43
-    ${file.reference.jxlayer.jar}
33
+javac.classpath=
44 34
 # Space-separated list of extra javac options
45 35
 javac.compilerargs=-Xlint:all -Xmaxerrs 1000
46 36
 javac.deprecation=true
@@ -49,13 +39,7 @@ javac.target=1.6
49 39
 javac.test.classpath=\
50 40
     ${javac.classpath}:\
51 41
     ${build.classes.dir}:\
52
-    ${file.reference.junit-4.jar}:\
53
-    ${file.reference.fest-swing-junit-1.0b1.jar}:\
54
-    ${file.reference.fest-swing-1.0b1.jar}:\
55
-    ${file.reference.fest-assert-1.0a1.jar}:\
56
-    ${file.reference.fest-reflect-0.4.jar}:\
57
-    ${file.reference.fest-util-0.4.jar}:\
58
-    ${file.reference.mockito-all-1.6.jar}
42
+    ${file.reference.junit-4.jar}
59 43
 javadoc.additionalparam=-overview ${main.src.dir}/overview.html
60 44
 javadoc.author=false
61 45
 javadoc.encoding=

Loading…
Cancel
Save