--- a/build/properties.xml	Fri Jun 18 12:47:53 2010 +0100
+++ b/build/properties.xml	Tue Jun 22 09:54:11 2010 +0100
@@ -27,14 +27,6 @@
   <!--The environment properties -->
   <property environment="env"/>
 
-    <!-- Set internal epoc root -->
-	<condition property="epocroot"
-               value="${env.EPOCROOT}"
-               else="">
-      <isset property="env.EPOCROOT"/>
-	</condition>
-
-
   <!--The root of the source files -->
   <property name="java.src.root" location="${ant.file.Properties}/../../"/>
 
@@ -49,13 +41,24 @@
       for reason why this property is defined"/> -->
   <property name="platform.utilities.xml.file" value="utilities.fake.xml"/>
 
-  <!--The cldc/cdc class file locations -->
+  <!-- Set internal epoc root -->
+  <condition property="epocroot" value="${env.EPOCROOT}" else="">
+    <isset property="env.EPOCROOT"/>
+  </condition>
+
+  <!--The cldc/cdc class file locations, within the sources -->
+  <available file="${java.src.root}/inc/classes.cldc.zip" property="bootclasspath.cldc"
+             value="${java.src.root}/inc/classes.cldc.zip" />
+  <available file="${java.src.root}/inc/classes.cdc.zip" property="bootclasspath.cdc"
+             value="${java.src.root}/inc/classes.cdc.zip" />
+  <available file="${java.src.root}/inc/classes.fp.zip" property="bootclasspath.fp"
+             value="${java.src.root}/inc/classes.fp.zip" />
+
+  <!--The cldc/cdc class file locations, external if not found in default places -->
   <property name="bootclasspath.cldc" location="${epocroot}epoc32/jrt/classes.cldc.zip"/>
   <property name="bootclasspath.cdc"  location="${epocroot}epoc32/jrt/classes.cdc.zip"/>
   <property name="bootclasspath.fp"   location="${epocroot}epoc32/jrt/classes.fp.zip"/>
   
-  
-  
   <!--NOTE!!! Properties defined below can be used only inside a target-->