# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1255609531 -3600
# Node ID 6e80d1c1b9d9fd85ae24c60eb2cdd0b2629840a7
# Parent  3772513ee79613d92ae641e353b5961fd51664b3
Bug 479: RnD package zips contain content not releaseable to public

Updated packaging tools to separate binaries and source in RnD repos.

diff -r 3772513ee796 -r 6e80d1c1b9d9 common/tools/populateziptemplate.pl
--- a/common/tools/populateziptemplate.pl	Thu Oct 15 13:48:54 2009 +0100
+++ b/common/tools/populateziptemplate.pl	Thu Oct 15 13:25:31 2009 +0100
@@ -123,12 +123,13 @@
 	{
 		# RnD repository
 		my $licenseType = $1;
-		my $name="bin_$1_$2";
+		my $binName="bin_$1_$2";
+		my $srcName="src_$1_$2";
 		my $postbuildName = "binaries_$2";
 		my $config = "rnd";
 		if ($licenseType eq "internal")
 		{
-			$name = "binaries_$2_prebuild";
+			$binName = "binaries_$2_prebuild";
 			$config = "rnd-internal";
 		}
 		
@@ -143,11 +144,15 @@
 				},
 				{
 					name => "name",
-					value=> "$name",
+					value=> "$binName",
 				},
 				{
 					name => "include",
-					value=> "/**",
+					value=> "epoc32/**",
+				},
+				{
+					name => "include",
+					value=> "*.txt",
 				},
 			]
 		};
@@ -156,10 +161,48 @@
 		my @files = `dir /b/s/a-d $dosCompatibleDst 2> nul:`;
 		next unless @files;
 		# Add the files to the global list of items to be excluded in the binary zips
-		@files = grep {
+		foreach (@files)
+		{
 			chomp;
 			s{\\}{/}g;
 			s!^[A-Z]:/$package->{dst}/!!i;
+		}
+		my @srcFiles = grep { !m{^epoc32/} and !m{^[^/]+\.txt$}i and !m{^\.hg} } @files;
+		if (@srcFiles)
+		{
+			# Create a zip object for the source
+			push @{$zipConfig->{config}->{config}->{$config}->{config}},
+			{
+				set =>
+				[
+					{
+						name => "root.dir",
+						value=> "\${build.drive}/$package->{dst}",
+					},
+					{
+						name => "name",
+						value=> "$srcName",
+					},
+					{
+						name => "include",
+						value=> "**",
+					},
+					{
+						name => "exclude",
+						value=> "epoc32/**",
+					},
+					{
+						name => "exclude",
+						value=> ".hg/**",
+					},
+					{
+						name => "exclude",
+						value=> ".hg_archival.txt",
+					},
+				]
+			};
+		}
+		@files = grep {
 			m{^epoc32/}i;
 		} @files;
 		push @allRndFiles, @files;