diff -r f1baeb3f075f -r 779cc88ed845 common/build.xml
--- a/common/build.xml	Wed Jul 22 10:58:34 2009 +0100
+++ b/common/build.xml	Mon Jul 27 14:25:36 2009 +0100
@@ -483,7 +483,7 @@
         </if>
     </target>
 
-    <target name="sf-build-noprep" depends="sf-truclean,sf-compile,sf-postbuild">
+    <target name="sf-build-noprep" depends="sf-truclean,sf-model-from-project,sf-compile,sf-postbuild">
         <echo>[SF-BUILD-NOPREP]</echo>
     </target>
     
@@ -520,6 +520,17 @@
       </else>
     </if>
   </target>
+  
+  <target name="sf-model-from-project">
+    <if>
+      <isset property="sf.spec.systemdefinition.source"/>
+      <then>
+        <echo message="Using ${sf.spec.systemdefinition.source} as model file"/>
+        <echo message="Copying to ${build.drive}/definition.xml"/>
+        <copy file="${sf.project.location}/${sf.spec.systemdefinition.source}" tofile="${build.drive}/definition.xml"/>
+      </then>
+    </if>
+  </target>
     
     <target name="sf-compile">
         <!-- TODO: add here assigments to raptor-related ant references -->