--- a/common/build.xml	Tue Apr 21 17:47:19 2009 +0100
+++ b/common/build.xml	Wed Apr 22 12:18:10 2009 +0100
@@ -38,10 +38,7 @@
     				<import file="${sf.common.config.dir}/generated/source-spec.ant.xml"/>
     		</then>
     </if>
-    
-    <!--
-    ** TARGET DEFINITIONS
-    -->   
+     
     
     <target name="sf-prep" depends="sf-generate-source-spec,prep-drive,init-build-area,check-tool-dependencies,create-bom,log-build-env">
         <echo>[SF-PREP]</echo>

--- a/sf-platform/build.xml	Tue Apr 21 17:47:19 2009 +0100
+++ b/sf-platform/build.xml	Wed Apr 22 12:18:10 2009 +0100
@@ -25,7 +25,7 @@
             <then><echo message="Skipping OS sysdef creation"/></then>
        <else>
             <!-- TODO use better method to export or wait for GenXML fix?-->
-            <copy file="${build.output.dir}\build\input\*_system_model_os.xml"
+            <copy file="${build.output.dir}\build\input\0000000000000001_system_model_os.xml"
             tofile="${canonical.sysdef.file}" failonerror="false" verbose="true"/>
        </else>
        </if>
@@ -34,12 +34,12 @@
             <then><echo message="Skipping S60 sysdef creation"/></then>
        <else>
             <!-- TODO use better method to export or wait for GenXML fix?-->
-            <copy file="${build.output.dir}\build\input\*_system_model_s60.xml"
+            <copy file="${build.output.dir}\build\input\0000000000000001_system_model_s60.xml"
             tofile="${canonical.sysdef.file}" failonerror="false" verbose="true"/>
 	   </else>
 	   </if>
 	   </then>
-	</if>
+	
 	<else>
 	    <!-- TODO use better method to export or wait for GenXML fix?-->
         <copy file="${build.output.dir}\build\input\*_system_model_os.xml"
@@ -48,7 +48,7 @@
 	    <!-- TODO targets for single sysdef build -->
 	    <runtarget target="sf-os-compile"/>
 	</else>
-
+        </if>
 
   </target>