# HG changeset patch
# User tahirm@symbian.org
# Date 1254493406 -3600
# Node ID 596ad2384e7782bcd706a81b4edfd61ddfe5e210
# Parent  7479697010f7e7a7dce4fd9f7c8a05c250bf5972# Parent  649f1815827031fdd7965e2208d0c15de8a42e54
merging updates for sf_fcl_packages.txt

diff -r 7479697010f7 -r 596ad2384e77 williamr/convert_to_epl.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/williamr/convert_to_epl.pl	Fri Oct 02 15:23:26 2009 +0100
@@ -0,0 +1,163 @@
+#!/usr/bin/perl
+
+# 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:
+# Map the SFL license to the EPL license, keeping a copy of the original file
+# in a parallel tree 
+
+use strict;
+use File::Copy;
+use File::Path;
+
+if (scalar @ARGV != 2)
+  {
+	print <<'EOF';
+Incorrect number of arguments
+
+Usage: perl convert_to_epl.pl workdir savedir
+
+Recursively processes workdir to examine all of the text files and convert
+all perfectly formed instances of the SFL copyright notice into EPL notices.
+
+If a file is modified, the original is first copied to the corresponding place
+under savedir. 
+
+It is safe to rerun this script if it stopped for any reason, as no converted 
+SFL notice will ever match on the second run through.
+EOF
+  exit 1;
+  }
+
+my $work_root = $ARGV[0];
+my $saved_root = $ARGV[1];
+
+$work_root =~ s/\\/\//g;    # convert to Unix separators please
+$saved_root =~ s/\\/\//g;
+
+print "* Processing $work_root, leaving the original of any modified file in $saved_root\n";
+
+my $debug = 0;
+
+my @oldtext = (
+  'terms of the License "Symbian Foundation License v1.0"',
+  'the URL "http://www.symbianfoundation.org/legal/sfl-v10.html"'
+);
+my @newtext = (
+  'terms of the License "Eclipse Public License v1.0"',
+  'the URL "http://www.eclipse.org/legal/epl-v10.html"'
+);
+
+my @errorfiles = ();
+my @multinoticefiles = ();
+
+sub map_epl($$$)
+  {
+  my ($file,$shadowdir,$name) = @_;
+  
+  open FILE, "<$file" or print "ERROR: Cannot open $file: $!\n" and return "Cannot open";
+  my @lines = <FILE>;
+  close FILE;
+  
+  my $updated = 0;
+  my @newlines = ();
+  while (my $line = shift @lines)
+    { 
+    # under the terms of the License "Symbian Foundation License v1.0"
+    # which accompanies this distribution, and is available
+    # at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+    my $pos1 = index $line, $oldtext[0];
+    if ($pos1 >= 0)
+      {
+      # be careful - oldtext is a prefix of newtext!
+      if (index($line, $newtext[0]) >= 0)
+        {
+        # line already converted - nothing to do
+        push @newlines, $line;
+        next;
+        }
+      my $midline = shift @lines;
+      my $urlline = shift @lines;
+      my $pos2 = index $urlline, $oldtext[1];
+      if ($pos2 >= 0)
+        {
+        # Found it - assume that there's only one instance
+        substr $line, $pos1, length($oldtext[0]), $newtext[0];
+        substr $urlline, $pos2, length($oldtext[1]), $newtext[1];
+        push @newlines, $line, $midline, $urlline;
+        $updated += 1;
+        next;
+        }
+      else
+        {
+        if(!$updated)
+          {
+          my $lineno = 1 + (scalar @newlines);
+          print STDERR "Problem in $file at $lineno: incorrectly formatted >\n$line$midline$urlline\n";
+          push @errorfiles, $file;
+          }	
+        last;
+        }
+      }
+    push @newlines, $line;
+    }
+
+  return if (!$updated);
+  
+  if ($updated > 1)
+    {
+    push @multinoticefiles, $file;
+    print "! found $updated SFL notices in $file\n";
+    }
+ 
+  mkpath($shadowdir, {verbose=>0});
+  move($file, "$shadowdir/$name") or die("Cannot move $file to $shadowdir/$name: $!\n");
+  open NEWFILE, ">$file" or die("Cannot overwrite $file: $!\n");
+  print NEWFILE @newlines, @lines;
+  close NEWFILE or die("Failed to update $file: $!\n");
+  print "* updated $file\n";
+  }
+
+# Process tree
+
+sub scan_directory($$)
+  {
+  my ($path, $shadow) = @_;
+  
+  opendir DIR, $path;
+  my @files = grep !/^\.\.?$/, readdir DIR;
+  closedir DIR;
+  
+  foreach my $file (@files)
+    {
+    my $newpath = "$path/$file";
+    my $newshadow = "$shadow/$file";
+    
+    if (-d $newpath)
+      {
+      scan_directory($newpath, $newshadow);
+      next;
+      }
+    next if (-B $newpath);  # ignore binary files
+    
+    map_epl($newpath, $shadow, $file);
+    }
+  }
+
+scan_directory($work_root, $saved_root);
+
+printf "%d problem files\n", scalar @errorfiles;
+print "\t", join("\n\t", @errorfiles), "\n";
+
+printf "%d files with multiple notices\n", scalar @multinoticefiles;
+print "\t", join("\n\t", @multinoticefiles), "\n";
+
diff -r 7479697010f7 -r 596ad2384e77 williamr/convert_to_eula.pl
--- a/williamr/convert_to_eula.pl	Fri Oct 02 15:21:19 2009 +0100
+++ b/williamr/convert_to_eula.pl	Fri Oct 02 15:23:26 2009 +0100
@@ -31,6 +31,7 @@
 );
 
 my @errorfiles = ();
+my @multinoticefiles = ();
 
 sub map_eula($$$)
   {
@@ -42,25 +43,23 @@
   
   my $updated = 0;
   my @newlines = ();
-  my $index = 1;
   while (my $line = shift @lines)
     { 
-	if (index($line,$newtext[0]) >= 0)
-    {
-      # file already converted - nothing to do
-	  push @newlines, $line;
-	  next;
-	  #last;
-    }
     # under the terms of the License "Symbian Foundation License v1.0"
     # which accompanies this distribution, and is available
     # at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
     my $pos1 = index $line, $oldtext[0];
     if ($pos1 >= 0)
       {
+      # be careful - oldtext is a prefix of newtext!
+      if (index($line, $newtext[0]) >= 0)
+        {
+        # line already converted - nothing to do
+        push @newlines, $line;
+        next;
+        }
       my $midline = shift @lines;
       my $urlline = shift @lines;
-	  $index+=2;
       my $pos2 = index $urlline, $oldtext[1];
       if ($pos2 >= 0)
         {
@@ -68,25 +67,30 @@
         substr $line, $pos1, length($oldtext[0]), $newtext[0];
         substr $urlline, $pos2, length($oldtext[1]), $newtext[1];
         push @newlines, $line, $midline, $urlline;
-        $updated = 1;
+        $updated += 1;
         next;
-        #last;
         }
       else
         {
-			if(!$updated)
-			{
-				print STDERR "Problem in $file at $index: incorrectly formatted >\n$line$midline$urlline\n";
-				push @errorfiles, $file;
-			}	
+        if(!$updated)
+          {
+          my $lineno = 1 + (scalar @newlines);
+          print STDERR "Problem in $file at $lineno: incorrectly formatted >\n$line$midline$urlline\n";
+          push @errorfiles, $file;
+          }	
         last;
         }
       }
     push @newlines, $line;
-	$index+=1;
     }
 
   return if (!$updated);
+  
+  if ($updated > 1)
+    {
+    push @multinoticefiles, $file;
+    print "! found $updated SFL notices in $file\n";
+    }
  
   mkpath($shadowdir, {verbose=>0});
   move($file, "$shadowdir/$name") or die("Cannot move $file to $shadowdir/$name: $!\n");
@@ -127,3 +131,6 @@
 printf "%d problem files\n", scalar @errorfiles;
 print "\t", join("\n\t", @errorfiles), "\n";
 
+printf "%d files with multiple notices\n", scalar @multinoticefiles;
+print "\t", join("\n\t", @multinoticefiles), "\n";
+