Ver código fonte

Fix some classpath stupidity.

Don't include all libs on the CP when running.

Put the main libraries first, rather than letting plugins trash the classpath.

Change-Id: I0b048a603ba4c854370807c6ae89c5a400423686
Reviewed-on: http://gerrit.dmdirc.com/2953
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
tags/0.8rc1
Chris Smith 10 anos atrás
pai
commit
d196e7a254
2 arquivos alterados com 1 adições e 2 exclusões
  1. 1
    1
      build-properties.xml
  2. 0
    1
      nbproject/build-impl.xml

+ 1
- 1
build-properties.xml Ver arquivo

@@ -40,9 +40,9 @@
40 40
 
41 41
     <target name="-init-private-properties" depends="-init-properties,-create-private-properties,-check-private-classpath,-create-private-classpath,-create-private-test-classpath">
42 42
         <path id="main-libs">
43
+            <fileset dir="lib/main" includes="*.jar"/>
43 44
             <fileset dir="modules" includes="*/lib/*.jar"/>
44 45
             <fileset dir="modules" includes="*/lib/main/*.jar"/>
45
-            <fileset dir="lib/main" includes="*.jar"/>
46 46
         </path>
47 47
         <pathconvert property="main-libs" refid="main-libs">
48 48
             <map from="${basedir}/" to=""/>

+ 0
- 1
nbproject/build-impl.xml Ver arquivo

@@ -310,7 +310,6 @@ is divided into following sections:
310 310
             <element name="customize" optional="true"/>
311 311
             <sequential>
312 312
                 <java classname="@{classname}" dir="${work.dir}" fork="true">
313
-                    <classpath refid="all.libs"/>
314 313
                     <jvmarg line="${run.jvmargs}"/>
315 314
                     <classpath>
316 315
                         <path path="${run.classpath}"/>

Carregando…
Cancelar
Salvar