# HG changeset patch
# User tahirm@symbian.org
# Date 1254480900 -3600
# Node ID 421d5a95c85abdc9214a7622729bf16f405dfe59
# Parent  c51536d9ce130a7180970ada47dc9fcd502653d5# Parent  59ba21437bf0f63a90859f046da03b0aa4399b6d
merge recent changes

diff -r c51536d9ce13 -r 421d5a95c85a clone_packages/sftools_mcl_packages.txt
--- a/clone_packages/sftools_mcl_packages.txt	Fri Oct 02 11:53:21 2009 +0100
+++ b/clone_packages/sftools_mcl_packages.txt	Fri Oct 02 11:55:00 2009 +0100
@@ -28,4 +28,4 @@
 https://developer.symbian.org/oss/MCL/sftools/dev/hostenv/javatoolsplat
 https://developer.symbian.org/oss/MCL/sftools/dev/hostenv/makeng
 https://developer.symbian.org/oss/MCL/sftools/dev/hostenv/pythontoolsplat
-https://developer.symbian.org/oss/MCL/sftools/dev/ide/carbidecpp
\ No newline at end of file
+https://developer.symbian.org/oss/MCL/sftools/dev/ide/carbidecpp
diff -r c51536d9ce13 -r 421d5a95c85a tdroadmap_merger/gettd.pl
--- a/tdroadmap_merger/gettd.pl	Fri Oct 02 11:53:21 2009 +0100
+++ b/tdroadmap_merger/gettd.pl	Fri Oct 02 11:55:00 2009 +0100
@@ -13,6 +13,7 @@
 
 my $ispackage;
 my $summaryheader="ID\tPackage\tFeatures\tFormat\tHttp\n" ;
+my $newtdformat = 0;
 
 sub getpage
 {
@@ -54,6 +55,14 @@
 
 	($release,$package,$features,$myfile,$domain)=@_;
 	
+  $release =~ s/\\//sg;	
+	
+ if ($newtdformat) {
+  $package =~ s/backlog//sgi;
+  print $myfile " $release, $domain, $package, $myfeat\n";
+  
+ } else {
+		
 	$features = $features."<dt";
 
 	
@@ -76,13 +85,13 @@
 	$mysubfeat =~ s/\n//sg;
 	$mysubfeat =~ s/\<.*?\>//sg;
 	
-	$release =~ s/\\//sg;	
+
 	print $myfile " $release, $domain, $package, $myfeat, $mysubfeat\n";
 	
 	$mysubfeat = "";	
 	}
 		
-
+ }
 }
 	
 sub loadfile
@@ -110,11 +119,34 @@
 	open ( outputfile, ">>".$outfile);
 
 
+  if ($newtdformat) {
+       print "Processing new TD roadmap format\n";
+         if ($roadmap =~ m /Contents\<\/h2\>.*?\<\/table/sg) { $roadmap =$';}
+         foreach (@releases) {
+          $exp=$_." Roadmap";
+		         
+           if ($roadmap =~ m /($exp)/sg) { 
+			     print "PASS - Found entry for $_ \n";
+			     $relroad =$';	
+			
+			     if ($roadmap =~ m /table\>(.*?)\<\/table/sg) { $relroad =$1;}
+			           
+           while ($relroad =~ m/title\=\"(.*?)\"\>(.*)/g) {
+                 $package=$1;
+                 $myfeat=$2;
+                 $myfeat=~ s/\<\/td\>\<td\>/-/sg;   #TODO change - to , when the old format is dead
+                 $myfeat=~ s/\<.*?\>//sg;
+                 prntfeatures($_,$package,$myfeat,outputfile,$domain);
+                
+                 }  		     
+         }
+        }
+  } else {
 
-	foreach (@releases) {
+	 foreach (@releases) {
 		
-		$exp="\\<h2\\>.*?\\>".$_;
-		
+	 	$exp="\\<h2\\>.*?\\>".$_;
+		  
 		if ($roadmap =~ m /($exp)/sg) { 
 			print "PASS - Found entry for $_ \n";
 			$relroad =$';	
@@ -138,7 +170,7 @@
 			@pname ="";
 			undef ($features);
 		}
-			 	
+	}		 	
 
 	}
 	
@@ -189,8 +221,9 @@
 		$pagename = $1;
 		print "INFO -Processing Package $pagename \n";
 		$i=0;
+		if ($mypkg =~m/class\=\"bugzilla sortable\"/sg ) { $headerformat="autobug_format"; }
 		
-		while ($mypkg =~ m/\<tr.*?\>(.*?)\<\/tr/sg) {
+		while ($mypkg =~ m/\<tr.*?\>(.*?)\<\/tr/sg) { 
 			$myheader= $&;
       if ($myheader =~ m/style=\"background-color\:/sg) {
         if ($myheader =~ m/Bug ID/sg) { $headerformat="bugzilla_format";}
@@ -228,13 +261,13 @@
 sub printhelp
 {
 
-	print "\n\n version 0.5
-	\ngettd.pl -t=url -d=domain \n\nrequired parameters:\n\t -t url containing the technology domain roadmap\n\t -d the technology domain name
-	\n\nOptional parameters\n\t-o filename ,the output is logged into the output.csv file by default\n\t-h for help
-	\n\t-a setup authorisation by cookie follow instructions \n\tin http://developer.symbian.org/wiki/index.php/Roadmap_merger_script#Cookies
-	\n\t -p adds support for package backlog analysis. just run gettd.pl -p
-	\n\t -compare [f1] [f2] compares two package summary files for changes ignores order
-  \n\t recommend to run under cygwin environment\n";
+	print "\n\n version 0.6
+	\ngettd.pl -t=url -d=domain \n\nRequired parameters for Technology Roadmaps:\n\t -t url containing the technology domain roadmap\n\t -d the technology domain name
+	\n\nOptional Parmeters for Technology Roadmaps\n\t-new if the roadmap has the new wiki format
+  \n\nRequired Parameters for Package backlogs\n\t-p for package backlog analysis. just run gettd.pl -p
+  \n\nOptional Pararmeters for Package backlogs\n\t -compare [f1] [f2] compares two package summary files for changes ignores order
+  \n\nCommonOptional parameters\n\t-o filename ,the output is logged into the output.csv file by default\n\t-h for help
+	\n\t recommend to run under cygwin environment and perl version v5.10.0 \n";
 	exit;
 }
 
@@ -274,7 +307,7 @@
 
 
   GetOptions('h' => \$help,'t=s'=> \$target_url, 'd=s' => \$tdomain , 'o=s' => \$csvfile, 
-	'a' => \$authon , 'p' => \$ispackage, 'compare=s{2}' =>\@compare);
+	'a' => \$authon , 'p' => \$ispackage, 'compare=s{2}' =>\@compare, 'new' => \$isnewformat);
 
   if (@compare) {
 	compare_bklogs @compare;
@@ -292,7 +325,10 @@
 	$target_url = "http://developer.symbian.org/wiki/index.php/Category:Package_Backlog";
 	
  }  
+ if ($isnewformat){
+    $newtdformat = 1;
  
+ }
 
  if ( not $target_url) {
 
diff -r c51536d9ce13 -r 421d5a95c85a tdroadmap_merger/runtd
--- a/tdroadmap_merger/runtd	Fri Oct 02 11:53:21 2009 +0100
+++ b/tdroadmap_merger/runtd	Fri Oct 02 11:55:00 2009 +0100
@@ -6,7 +6,7 @@
 perl gettd.pl -t=http://developer.symbian.org/wiki/index.php/Roadmap_for_Location -d=Location
 perl gettd.pl -t=http://developer.symbian.org/wiki/index.php/Roadmap_for_Multimedia -d=Multimedia
 perl gettd.pl -t=http://developer.symbian.org/wiki/index.php/Roadmap_for_Multimedia_Apps -d=Multimedia_Apps
-perl gettd.pl -t=http://developer.symbian.org/wiki/index.php/Roadmap_for_Personal_Communications -d=Personal_Communications
+perl gettd.pl -t=http://developer.symbian.org/wiki/index.php/Roadmap_and_Strategy_for_Personal_Communications -d=Personal_Communications -new
 perl gettd.pl -t=http://developer.symbian.org/wiki/index.php/Roadmap_for_Productivity -d=Productivity
 perl gettd.pl -t=http://developer.symbian.org/wiki/index.php/Roadmap_for_Runtimes -d=Runtimes
 perl gettd.pl -t=http://developer.symbian.org/wiki/index.php/Roadmap_for_UI -d=UI
diff -r c51536d9ce13 -r 421d5a95c85a williamr/convert_to_eula.pl
--- a/williamr/convert_to_eula.pl	Fri Oct 02 11:53:21 2009 +0100
+++ b/williamr/convert_to_eula.pl	Fri Oct 02 11:55:00 2009 +0100
@@ -42,13 +42,16 @@
   
   my $updated = 0;
   my @newlines = ();
+  my $index = 1;
   while (my $line = shift @lines)
     { 
-    if (index($line,$newtext[0]) >= 0)
-      {
+	if (index($line,$newtext[0]) >= 0)
+    {
       # file already converted - nothing to do
-      last;
-      }
+	  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".
@@ -57,6 +60,7 @@
       {
       my $midline = shift @lines;
       my $urlline = shift @lines;
+	  $index+=2;
       my $pos2 = index $urlline, $oldtext[1];
       if ($pos2 >= 0)
         {
@@ -65,16 +69,21 @@
         substr $urlline, $pos2, length($oldtext[1]), $newtext[1];
         push @newlines, $line, $midline, $urlline;
         $updated = 1;
-        last;
+        next;
+        #last;
         }
       else
         {
-        print STDERR "Problem in $file: incorrectly formatted >\n$line$midline$urlline\n";
-        push @errorfiles, $file;
+			if(!$updated)
+			{
+				print STDERR "Problem in $file at $index: incorrectly formatted >\n$line$midline$urlline\n";
+				push @errorfiles, $file;
+			}	
         last;
         }
       }
     push @newlines, $line;
+	$index+=1;
     }
 
   return if (!$updated);