# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1249402979 -3600
# Node ID f7c6fc4239acd4b24c77c6ed49ea403a1a49f4bf
# Parent  f2e8947e085a6ad82ddab392ee47e1afc3136495
Fixed paths and drives for executing script.

diff -r f2e8947e085a -r f7c6fc4239ac common/build.xml
--- a/common/build.xml	Tue Aug 04 12:20:40 2009 +0100
+++ b/common/build.xml	Tue Aug 04 17:22:59 2009 +0100
@@ -531,9 +531,10 @@
       </then>
       <else>
         <!-- Collate the system definition from the packages listed in sources.csv -->
-        <exec executable="perl" output="${build.drive}${sf.spec.systemdefinition.location}" logError="true">
+        <exec executable="perl" dir="${build.drive}/" output="${build.drive}${sf.spec.systemdefinition.location}" logError="true">
           <arg value="${sf.common.config.dir}/tools/csvToSysDef.pl"/>
           <arg value="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
+          <arg value="${sf.config.dir}/../build/config/3k"/>
         </exec>
       </else>
     </if>
diff -r f2e8947e085a -r f7c6fc4239ac common/tools/csvToSysDef.pl
--- a/common/tools/csvToSysDef.pl	Tue Aug 04 12:20:40 2009 +0100
+++ b/common/tools/csvToSysDef.pl	Tue Aug 04 17:22:59 2009 +0100
@@ -2,12 +2,16 @@
 
 use strict;
 
+use FindBin;
+use lib "$FindBin::Bin/lib";
+
 use XML::Parser;
 use Data::Dumper;
 use Text::CSV;
 
 my $sourcesCSV = shift or die "First arg must be source csv file";
-shift and die "No more than one argument please";
+my $backupBaseDir = shift or die "Second arg must be path to tree of package_definitions to use if not found in the source packages";
+shift and die "No more than two arguments please";
 
 # Load CSV
 open my $csvText, "<", $sourcesCSV or die;
@@ -55,7 +59,7 @@
 		$pkgDef =~ s{^/sf/}{};
 		$pkgDef =~ s{/[^/]*$}{};
 		# TODO: Where will this be on the build machine?
-		$pkgDef = "../../packages/3k/$pkgDef/package_definition.xml";
+		$pkgDef = "$backupBaseDir/$pkgDef/package_definition.xml";
 	}
 	die unless -f $pkgDef;
 
diff -r f2e8947e085a -r f7c6fc4239ac sf-package/package_props.ant.xml
--- a/sf-package/package_props.ant.xml	Tue Aug 04 12:20:40 2009 +0100
+++ b/sf-package/package_props.ant.xml	Tue Aug 04 17:22:59 2009 +0100
@@ -13,7 +13,7 @@
   
   <property name="sf.spec.systemdefinition.assemble" value="false"/>
   <!-- if this is defined then the model is taken from this location (relative to the project dir) and copied to BUILDDRIVE\definition.xml -->
-  <property name="sf.spec.systemdefinition.source" value="package_definition.xml"/>
+<!--  <property name="sf.spec.systemdefinition.source" value="package_definition.xml"/> -->
   <!-- location of the model (related to the build drive) -->
   <property name="sf.spec.systemdefinition.location" value="\definition.xml"/>
   <property name="sf.spec.sysdef.configurations.list" value="SF"/>