build.xml
changeset 7894 10a6e520f525
parent 7709 effc222a5857
child 7903 b788095e7704
--- a/build.xml	Mon Jul 19 09:31:43 2010 +0200
+++ b/build.xml	Mon Jul 19 18:25:56 2010 +0200
@@ -190,6 +190,10 @@
   </condition>
  
   <path id="project.class.path">
+    <dirset dir="${base.modules}">
+      <include name="*/build/classes/" />
+    </dirset>
+    <pathelement path="${basedir}/../../src-util/modulescript/build/classes/" />
     <pathelement path="${build}" />
     <pathelement path="${base.src}" />
     <fileset dir="${base.lib}">
@@ -213,14 +217,14 @@
     <fileset dir="${base.modules}">
       <include name="*/lib/**" />
     </fileset>
+  </path>
+
+  <!-- This classpath is needed only for the compile.apply.module task-->
+  <path id="apply.module.compile.classpath">
     <dirset dir="${base.modules}">
       <include name="*/build/classes/" />
     </dirset>
     <pathelement path="${basedir}/../../src-util/modulescript/build/classes/" />
-  </path>
-
-  <!-- This classpath is needed only for the compile.apply.module task-->
-  <path id="apply.module.compile.classpath">
     <pathelement path="${build.apply.module}" />
     <pathelement path="${base.src}" />
     <fileset dir="${base.lib}">
@@ -244,14 +248,14 @@
     <fileset dir="${base.modules}">
       <include name="*/lib/**" />
     </fileset>
+  </path>
+  
+  <!-- This classpath is needed only for the apply.module task-->
+  <path id="apply.module.runtime.classpath">
     <dirset dir="${base.modules}">
       <include name="*/build/classes/" />
     </dirset>
     <pathelement path="${basedir}/../../src-util/modulescript/build/classes/" />
-  </path>
-  
-  <!-- This classpath is needed only for the apply.module task-->
-  <path id="apply.module.runtime.classpath">
     <pathelement path="${build.apply.module}" />
     <pathelement path="${build}" />
     <pathelement path="${base.src}" />
@@ -276,10 +280,6 @@
     <fileset dir="${base.modules}">
       <include name="*/lib/**" />
     </fileset>
-    <dirset dir="${base.modules}">
-      <include name="*/build/classes/" />
-    </dirset>
-    <pathelement path="${basedir}/../../src-util/modulescript/build/classes/" />
   </path>
   
   <macrodef name="updatesystemstatus">