[Jnode-svn-commits] SF.net SVN: jnode:[4335] trunk

[<cr...@us...>]

Revision: 4335
          http://jnode.svn.sourceforge.net/jnode/?rev=4335&view=rev
Author:   crawley
Date:     2008-07-23 12:33:38 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
Moving 'configure' to the Builder project

Modified Paths:
--------------
    trunk/all/build.xml
    trunk/configure.sh

Modified: trunk/all/build.xml
===================================================================
--- trunk/all/build.xml	2008-07-23 12:32:19 UTC (rev 4334)
+++ trunk/all/build.xml	2008-07-23 12:33:38 UTC (rev 4335)
@@ -62,6 +62,7 @@
     <property name="derby.jar" value="${root.dir}/distr/lib/derby.jar" />
     <property name="derbynet.jar" value="${root.dir}/distr/lib/derbynet.jar" />
     <property name="derbytools.jar" value="${root.dir}/distr/lib/derbytools.jar" />
+    <property name="nanoxml-java.jar" value="${root.dir}/builder/lib/nanoxml-2.2.3.jar" />
 
     <!-- libraries needed to run tests -->
     <property name="jmock-cglib.jar" value="${root.dir}/core/lib/jmock-cglib-1.0.1.jar"/>
@@ -882,13 +883,13 @@
         <taskdef resource="checkstyletask.properties" classpath="../core/lib/checkstyle-all-4.4.jar"/>
         <checkstyle config="jnode_checks.xml">
             <fileset dir="../builder/src/builder" includes="**/*.java"/>
+            <fileset dir="../builder/src/configure" includes="**/*.java"/>
             <fileset dir="../core/src/core" includes="**/*.java"/>
             <fileset dir="../core/src/driver" includes="**/*.java"/>
             <fileset dir="../core/src/test" includes="**/*.java"/>
             <fileset dir="../distr/src/apps" includes="**/*.java"/>
             <fileset dir="../distr/src/emu" includes="**/*.java"/>
             <fileset dir="../distr/src/install" includes="**/*.java"/>
-            <fileset dir="../distr/src/configure" includes="**/*.java"/>
             <fileset dir="../distr/src/test" includes="**/*.java"/>
             <fileset dir="../fs/src/fs" includes="**/*.java"/>
             <fileset dir="../fs/src/driver" includes="**/*.java"/>

Modified: trunk/configure.sh
===================================================================
--- trunk/configure.sh	2008-07-23 12:32:19 UTC (rev 4334)
+++ trunk/configure.sh	2008-07-23 12:33:38 UTC (rev 4335)
@@ -4,9 +4,9 @@
 
 # Belt and braces classpath to get the most recent version
 # of the 'configure' classes that we can find.
-CP=$DIR/distr/build/classes:\
+CP=$DIR/builder/build/classes:\
 $DIR/all/build/descriptors/jnode-configure.jar:\
-$DIR/distr/lib/jnode-configure-dist.jar:\
-$DIR/distr/lib/nanoxml-2.2.3.jar
+$DIR/builder/lib/jnode-configure-dist.jar:\
+$DIR/builder/lib/nanoxml-2.2.3.jar
 
 java -cp $CP org.jnode.configure.Configure "$@"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.