# HG changeset patch
# User DarioS@UK-DarioS.symbian.int
# Date 1239810361 -3600
# Node ID 2771e394c9bdae2a59441873b308e72bfc2378bf
# Parent 6066a7d39270ed37bb6911a2671b71d0f016e01b# Parent 54444a2ae2db4332186dbf7ed5ec10083604ff98
Catchup from main repo
diff -r 6066a7d39270 -r 2771e394c9bd common/build.xml
--- a/common/build.xml Wed Apr 15 14:30:07 2009 +0100
+++ b/common/build.xml Wed Apr 15 16:46:01 2009 +0100
@@ -155,7 +155,7 @@
-
+
[SF-POSTBUILD]
@@ -177,7 +177,57 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[SF-BUILD-NOPREP]
diff -r 6066a7d39270 -r 2771e394c9bd common/common_props.ant.xml
--- a/common/common_props.ant.xml Wed Apr 15 14:30:07 2009 +0100
+++ b/common/common_props.ant.xml Wed Apr 15 16:46:01 2009 +0100
@@ -49,6 +49,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 6066a7d39270 -r 2771e394c9bd common/templates/source-spec.ant.xml.ftl
--- a/common/templates/source-spec.ant.xml.ftl Wed Apr 15 14:30:07 2009 +0100
+++ b/common/templates/source-spec.ant.xml.ftl Wed Apr 15 16:46:01 2009 +0100
@@ -2,7 +2,7 @@
<#assign fileset = "" />
-<#assign target_depends = "" />
+<#assign sync_list = "" />
<#assign dollar = "$"/>
<#assign count = 0 />
@@ -47,15 +47,9 @@
- <#assign fileset = "${fileset}" + "" />
- <#if (count == 0) >
- <#assign target_depends = "reset-bom-sources-csv," + "sf-prebuild-${count}" />
-
- <#if (count > 0) >
- <#assign target_depends ="${target_depends}," + "sf-prebuild-${count}"/>
-
-
+ <#assign fileset = "${fileset}" + "" />
+ <#assign sync_list = "${sync_list}" + "\n"/>
<#assign count = count + 1 />
@@ -65,6 +59,11 @@
${fileset}
-
+
+
+ ${sync_list}
+
+
+
\ No newline at end of file
diff -r 6066a7d39270 -r 2771e394c9bd common/tools/difflist.pl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/difflist.pl Wed Apr 15 16:46:01 2009 +0100
@@ -0,0 +1,35 @@
+#! perl -w
+use strict;
+
+my $element;
+my @union = ();
+my @intersection = ();
+my @difference = ();
+my %count = ();
+
+my $file1 = shift or die "Usage: $0 file1 file2\n";
+my $file2 = shift or die "Usage: $0 file1 file2\n";
+
+open FILE1, "<$file1" or die "ERROR: Can't read $file1";
+open FILE2, "<$file2" or die "ERROR: Can't read $file2";
+
+my @file1_content = ;
+my @file2_content = ;
+
+close FILE1;
+close FILE2;
+
+print "* Comparing $file1 and $file2\n";
+foreach $element (@file1_content, @file2_content) { $count{$element}++ }
+foreach $element (keys %count) {
+ push @union, $element;
+ push @{ $count{$element} > 1 ? \@intersection : \@difference }, $element;
+}
+
+if (@difference > 0) {
+ foreach (@difference){
+ print $_;
+ }
+} else {
+ print "* Files are identical\n";
+}
diff -r 6066a7d39270 -r 2771e394c9bd common/tools/listdir.pl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/listdir.pl Wed Apr 15 16:46:01 2009 +0100
@@ -0,0 +1,38 @@
+#!perl -w
+use strict;
+
+my $dir = shift or die "Usage: $0 \n"; # provided dir to traverse
+my $filelist = [];
+
+# fwd declaration to prevent warning
+sub recursedir($$);
+
+# run recurse and print
+recursedir ($dir, $filelist);
+print $_, "\n" for(@$filelist);
+
+sub recursedir($$) {
+
+ my $dir = shift @_;
+ my $list = shift @_;
+
+ if(opendir(DIR, "$dir")) {
+ # list dir
+ for my $file(grep { !/^\./ } readdir DIR) {
+ if(-d "$dir\\$file") {
+ # traverse subdirs
+ recursedir("$dir\\$file", $list);
+ }
+ elsif(-f "$dir\\$file") {
+ # if file then swap (any present) fwd to bkslash and add to list
+ $dir =~s/\//\\/;
+ $file =~s/\//\\/;
+ push @$list, "$dir\\$file";
+ }
+ }
+ closedir DIR;
+ }
+ else {
+ warn "Cannot open the directory '$dir' $!\n";
+ }
+}
diff -r 6066a7d39270 -r 2771e394c9bd sf-platform/build.xml
--- a/sf-platform/build.xml Wed Apr 15 14:30:07 2009 +0100
+++ b/sf-platform/build.xml Wed Apr 15 16:46:01 2009 +0100
@@ -1,22 +1,406 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 6066a7d39270 -r 2771e394c9bd sf-platform/platform.properties
--- a/sf-platform/platform.properties Wed Apr 15 14:30:07 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-base_release.getenv_options=emu
-hg.config=config/full-list.csv
-threads=1
\ No newline at end of file