# HG changeset patch
# User Brendan Donegan brendand@symbian.org
# Date 1251294058 -3600
# Node ID e7e26750f3836250f9d57f600160c7753b5ec53d
# Parent 72b4f11581d3e91c4c9a20c961ffdaf652149da2# Parent d4dac57985d974335e9d2ec286724c8a243008af
Caught up
diff -r 72b4f11581d3 -r e7e26750f383 common/build.postbuild.xml
--- a/common/build.postbuild.xml Mon Aug 24 14:41:17 2009 +0100
+++ b/common/build.postbuild.xml Wed Aug 26 14:40:58 2009 +0100
@@ -301,7 +301,7 @@
</fileset>
</path>
<sequential>
- <propertyregex override="yes" property="preprocessedlogfile" input="@{logfile}" regexp=".*[\\|\/].*\.T?\d+_+(.*)_compile\.log" replace="\1_compile_preprocessed.log"/>
+ <propertyregex override="yes" property="preprocessedlogfile" input="@{logfile}" regexp=".*[\\/](.*)_compile\.log" replace="\1_compile_preprocessed.log"/>
<echo message="Preprocessing @{logfile}..."/>
<exec executable="perl" dir="${sf.common.config.dir}/tools/raptor" failonerror="false" input="@{logfile}" output="${build.log.dir}/analysis/${preprocessedlogfile}" error="${build.log.dir}/analysis/${build.id}_preprocess.log" append="true">
<arg value="${sf.common.config.dir}/tools/raptor/preprocess_log.pl"/>
diff -r 72b4f11581d3 -r e7e26750f383 common/build.xml
--- a/common/build.xml Mon Aug 24 14:41:17 2009 +0100
+++ b/common/build.xml Wed Aug 26 14:40:58 2009 +0100
@@ -175,7 +175,7 @@
<istrue value="${sf.spec.publish.enable}"/>
<then>
<runtarget target="diamonds"/>
- <runtarget target="sf-tag-build"/>
+ <runtarget target="sf-diamonds-tag-build"/>
</then>
</if>
@@ -291,8 +291,8 @@
</if>
</target>
- <target name="sf-tag-build">
- <echo>[SF-TAG-BUILD]</echo>
+ <target name="sf-diamonds-tag-build">
+ <echo>[SF-DIAMONDS-TAG-BUILD]</echo>
<fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-tag-build.xml.ftl" outputFile="${build.drive}/output/logs/sf-tag-build.xml">
<data expandProperties="yes">
ant: antProperties()
diff -r 72b4f11581d3 -r e7e26750f383 common/common_props.ant.xml
--- a/common/common_props.ant.xml Mon Aug 24 14:41:17 2009 +0100
+++ b/common/common_props.ant.xml Wed Aug 26 14:40:58 2009 +0100
@@ -4,8 +4,6 @@
<property name="sf.drive.space.needed" value="0"/>
- <property name="sf.project.type" value="package"/>
-
<property name="sf.spec.job.name" value="myproduct"/>
<property name="sf.spec.job.codeline" value="MCL"/>
<property name="sf.spec.job.number" value="001"/> <!-- this is always overriden from the commandline -->
diff -r 72b4f11581d3 -r e7e26750f383 common/diamonds/config.xml.ftl
--- a/common/diamonds/config.xml.ftl Mon Aug 24 14:41:17 2009 +0100
+++ b/common/diamonds/config.xml.ftl Wed Aug 26 14:40:58 2009 +0100
@@ -71,7 +71,7 @@
defer="true"/>
<!-- SF specific -->
- <target name="sf-tag-build"/>
+ <target name="sf-diamonds-tag-build"/>
<target name="sf-diamondize-bom"/>
<target name="sf-run-analysis"/>
</targets>
diff -r 72b4f11581d3 -r e7e26750f383 common/tools/populateziptemplate.pl
--- a/common/tools/populateziptemplate.pl Mon Aug 24 14:41:17 2009 +0100
+++ b/common/tools/populateziptemplate.pl Wed Aug 26 14:40:58 2009 +0100
@@ -33,7 +33,7 @@
}
# Load CSV
-open my $csvText, "<", $sourcesCSV or die;
+open my $csvText, "<", $sourcesCSV or die "Unable to open sources.csv from $sourcesCSV";
my $csv = Text::CSV->new();
my @keys;
my @packages;
@@ -68,9 +68,11 @@
my $keyAttr = { config => "name", name => "set"};
# Load template
my $xml = XML::Simple->new();
-my $zipConfig = $xml->XMLin($template, KeyAttr => $keyAttr);
+my $zipConfig = $xml->XMLin($template, keyattr => $keyAttr);
my @allRndFiles;
+my $failures = 0;
+
# For each package in CSV...
foreach my $package (@packages)
{
@@ -140,7 +142,8 @@
}
else
{
- die "Cannot determine license for '$package->{source}'";
+ warn "Cannot determine license for '$package->{source}'\n";
+ $failures++;
}
}
@@ -148,9 +151,11 @@
my @excludes = map { {name => "exclude", value => "$_"} } @allRndFiles;
push @{$zipConfig->{config}->{config}->{bin}->{config}->{set}}, @excludes;
-$xml->XMLout($zipConfig, OutputFile => $ftl, XMLDecl => 1, RootName => 'build', KeyAttr => $keyAttr);
+$xml->XMLout($zipConfig, OutputFile => $ftl, XMLDecl => 1, RootName => 'build', keyattr => $keyAttr);
# Output all rnd files into exclude list for later
open my $fh, ">", $rndExcludes or die "Cannot write exlude file!";
print $fh @allRndFiles;
close $fh;
+
+exit($failures);
diff -r 72b4f11581d3 -r e7e26750f383 sf-package/package_props.ant.xml
--- a/sf-package/package_props.ant.xml Mon Aug 24 14:41:17 2009 +0100
+++ b/sf-package/package_props.ant.xml Wed Aug 26 14:40:58 2009 +0100
@@ -4,6 +4,8 @@
<property name="sf.drive.space.needed" value="10G"/>
+ <property name="sf.project.type" value="package"/>
+
<property name="sf.spec.baseline.enable" value="true"/>
<property name="sf.spec.baseline.select" value="location"/>
<property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_candidate_2.0.d_flat"/>
diff -r 72b4f11581d3 -r e7e26750f383 sf-platform/build.xml
--- a/sf-platform/build.xml Mon Aug 24 14:41:17 2009 +0100
+++ b/sf-platform/build.xml Wed Aug 26 14:40:58 2009 +0100
@@ -17,11 +17,48 @@
-->
<!-- MattD - workaround until generating a model from package definitions works-->
- <target name="sf-build-noprep" depends="sf-compile,sf-postbuild">
+ <target name="sf-build-noprep" depends="sf-platform-bootstrap,sf-compile,sf-postbuild">
<echo>[SF-BUILD-NOPREP] (platform)</echo>
<echo>[SF-BUILD-NOPREP] WARNING: Not generating model from packages</echo>
</target>
+ <target name="sf-platform-bootstrap" depends="sf-platform-bootstrap-gt,sf-platform-bootstrap-s60"/>
+
+ <target name="sf-platform-bootstrap-gt" >
+ <echo>[SF-platform-bootstrap-gt] Warning: hard-coded to tb91!</echo>
+ <!-- do initial stuff to get raptor working -->
+ <copy file="${build.drive}/sf/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS.hrh" tofile="${build.drive}/epoc32/include/variant/Symbian_OS.hrh" failonerror="true" verbose="true" />
+ <copy file="${build.drive}/sf/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vtb91sf.cfg" tofile="${build.drive}/epoc32/tools/variant/variant.cfg" failonerror="true" verbose="true" preservelastmodified="true" />
+ </target>
+
+ <target name="sf-platform-bootstrap-s60" >
+ <!-- Do touch on S60 variant.cfg to force raptor to export -->
+ <touch file="${build.drive}/${sf.spec.bldmefirst.s60.sbs.variant.cfg}" />
+ <delete file="${build.log.dir}/${build.id}_bldmefirst-s60.log"/>
+
+ <property name="sf.compile.bldmefirst.command.sbsexport" value="sbs EXPORT --ignore-os-detection --export-only"/>
+ <!-- do bldmefirst stage 1-->
+ <for list="${sf.spec.bldmefirst.s60.exports}" delimiter="," param="sf.spec.bldmefirst.s60.export">
+ <sequential>
+ <echo message="Performing bldmefirst export on @{sf.spec.bldmefirst.s60.export}"/>
+ <exec executable="cmd" dir="${build.drive}" failonerror="true" append="true" output="${build.log.dir}/${build.id}_bldmefirst-s60.log">
+ <arg value="/c"/>
+ <arg value="${sf.compile.bldmefirst.command.sbsexport}" />
+ <arg value="-b"/>
+ <arg value="${build.drive}/@{sf.spec.bldmefirst.s60.export}/bld.inf"/>
+ </exec>
+ </sequential>
+ </for>
+ <copy todir="${build.drive}/epoc32/tools/makefile_templates/s60">
+ <fileset dir="${build.drive}/sf/tools/makefile_templates">
+ <exclude name=".hg*"/>
+ <exclude name=".hg/**"/>
+ <exclude name="layers.sysdef.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+
<!-- workaround until GenXML can merge v2.0.0 fragments -->
<!--
This target is effectively a callback, called from compile-main.
diff -r 72b4f11581d3 -r e7e26750f383 sf-platform/platform_props.ant.xml
--- a/sf-platform/platform_props.ant.xml Mon Aug 24 14:41:17 2009 +0100
+++ b/sf-platform/platform_props.ant.xml Wed Aug 26 14:40:58 2009 +0100
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
<project name="SF-PLATFORM-PROPS">
+ <property name="sf.project.type" value="platform" />
+
<property name="sf.drive.space.needed" value="150G"/>
</project>