# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1243353772 -3600
# Node ID 6c981bc63baba7d0a88bafce303c25afe94c260a
# Parent  d33d43677cdfcb8b66f7982eabc9d09108274e04# Parent  cb16ca6483d9b12605a4eb521370018d71d4031f
Merge changes to default branch

diff -r cb16ca6483d9 -r 6c981bc63bab common/templates/zip.cfg.xml.ftl.template
--- a/common/templates/zip.cfg.xml.ftl.template	Tue May 26 17:00:51 2009 +0100
+++ b/common/templates/zip.cfg.xml.ftl.template	Tue May 26 17:02:52 2009 +0100
@@ -23,6 +23,9 @@
 		<config name="src" abstract="true">
 			<!-- Options that apply to all src configs -->
 			<set name="exclude" value="**/.hg/**"/>
+			<set name="exclude" value="**/.hgtags"/>
+			<set name="exclude" value="**/.hgignore"/>
+			<set name="exclude" value="**/.hg_archival.txt"/>
 			
 			<!-- These configs will be populated with tags for the source -->
 			<config name="sfl" abstract="true">
diff -r cb16ca6483d9 -r 6c981bc63bab common/tools/ats/ats3_testdrop.pl
--- a/common/tools/ats/ats3_testdrop.pl	Tue May 26 17:00:51 2009 +0100
+++ b/common/tools/ats/ats3_testdrop.pl	Tue May 26 17:02:52 2009 +0100
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-#curl "http://sym-build01:8080/ats3/XTestRunExecute.do?username=admin&password=admin&testrunpath=D:\smoketests\test_drops\9.zip
 use strict;
 use Getopt::Long;
 use File::Copy;
@@ -109,7 +108,7 @@
             "  --help                        Display this help and exit\n" .
             "  --host=HOSTAME                HOSTNAME is ATS3 server\n" .
             "  --local-test-pkg=PKGFILE      PKGFILE is the test package.\n" .
-            "                                If PKGFILE begins "..." a filename in LOCALPATH is assumed\n" .
+            "                                If PKGFILE begins \"...\" a filename in LOCALPATH is assumed\n" .
             "  --local-drop-path=LOCALPATH   Path to local directory where PKGFILE will be dropped\n" .            
             "  --host-drop-path=HOSTPATH     Host directory that is mapped to LOCALPATH.\n" .
             "                                Must agree with the properties of the registered device that the test package nominates\n" .
diff -r cb16ca6483d9 -r 6c981bc63bab common/tools/difflist.pl
--- a/common/tools/difflist.pl	Tue May 26 17:00:51 2009 +0100
+++ b/common/tools/difflist.pl	Tue May 26 17:02:52 2009 +0100
@@ -1,4 +1,18 @@
 #! perl -w
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+# 
+# Contributors:
+#
+# Description:
+# Compares two files
+
 use strict;
 
 my $element;
diff -r cb16ca6483d9 -r 6c981bc63bab common/tools/listdir.pl
--- a/common/tools/listdir.pl	Tue May 26 17:00:51 2009 +0100
+++ b/common/tools/listdir.pl	Tue May 26 17:02:52 2009 +0100
@@ -1,4 +1,18 @@
 #!perl -w
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+# 
+# Contributors:
+#
+# Description:
+# Recursive listing of a directory, outputting lower-cased relative paths with unix dir separators
+
 use strict;
 
 my $dir      = shift or die "Usage: $0 <dir> \n";   #  provided dir to traverse
diff -r cb16ca6483d9 -r 6c981bc63bab common/tools/mergeepoc32.pl
--- a/common/tools/mergeepoc32.pl	Tue May 26 17:00:51 2009 +0100
+++ b/common/tools/mergeepoc32.pl	Tue May 26 17:02:52 2009 +0100
@@ -1,4 +1,18 @@
 #!perl -w
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+# 
+# Contributors:
+#
+# Description:
+# Merges binaries from RnD repositories into the epoc32 tree used for the build
+
 use strict;
 
 # Assume that all rnd repositories are delivered onto the build machine in \rnd\category\name\epoc32\...
diff -r cb16ca6483d9 -r 6c981bc63bab common/tools/populateziptemplate.pl
--- a/common/tools/populateziptemplate.pl	Tue May 26 17:00:51 2009 +0100
+++ b/common/tools/populateziptemplate.pl	Tue May 26 17:02:52 2009 +0100
@@ -1,5 +1,19 @@
+#!perl -w
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+# 
+# Contributors:
+#
+# Description:
+# Populates the template for packaging src and binaries in the build
+
 use strict;
-use warnings;
 
 use FindBin;
 use lib "$FindBin::Bin/lib";