X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..0342cac8cbf7d74cf6efa11b33abd8cb6d87cc3c:/tools/simgrid_update_xml.pl

diff --git a/tools/simgrid_update_xml.pl b/tools/simgrid_update_xml.pl
index e9c639058b..006c1d7758 100755
--- a/tools/simgrid_update_xml.pl
+++ b/tools/simgrid_update_xml.pl
@@ -71,7 +71,7 @@ Several tags were renamed:
 
 =item
 
-The AS tag were introduced. Every plaform should now contain an englobing AS
+The AS tag were introduced. Every platform should now contain an englobing AS
 tag.
 
 =item 
@@ -87,7 +87,7 @@ Several tags were renamed (for sake of XML sanity):
 
 =back
 
-=item B<Version 4:> Introduced in SimGrid 3.13 (this is the current version)
+=item B<Version 4:> Introduced in SimGrid 3.13
 
 =over 4
 
@@ -123,6 +123,21 @@ Units are now mandatory in attributes. USE THE SCRIPT sg_xml_unit_converter.py T
 
 =back
 
+=item B<Version 4.1:> Introduced in SimGrid 3.16 (this is the current version)
+
+=over 4
+
+=item
+
+Rename a few tags, but in a backward-compatible manner: the old names are still accepted.
+
+  AS            -> zone
+  ASroute       -> zoneRoute
+  bypassAsRoute -> bypassZoneRoute
+  process       -> actor
+
+=back
+
 =back
 
 =head1 AUTHORS
@@ -142,7 +157,7 @@ under the terms of GNU LGPL (v2.1) license.
 use strict;
 
 my $fromversion=-1;
-my $toversion=4;
+my $toversion=4.1;
 
 my $filename = $ARGV[0] or die "Usage: simgrid_update_xml.pl file_to_convert.xml\nPlease provide an XML to convert as a parameter.\n";
 open INPUT, "$filename" or die "Cannot open input file $filename: $!\n";
@@ -164,10 +179,10 @@ while (defined($line = <INPUT>)) {
 	$fromversion = 0;
 	print "$filename was using version 0\n";
 	next if !$line =~ /\S/;
-    } elsif ($line =~ s/<platform.*version=["']*([0-9.])["']*>//) {
+    } elsif ($line =~ s/<platform.*version=["']*([0-9.]*)["']*>//) {
 	$fromversion = $1;
 	if ($fromversion == $toversion) {
-	    die "Input platform file $filename is already conformant to version $fromversion. This should be a no-op.\n";
+	    warn "Input platform file $filename is already conformant to version $fromversion. This should be a no-op.\n";
 	}
 	if ($fromversion > $toversion) {
 	    die "Input platform file $filename is more recent than this script (file version: $fromversion; script version: $toversion)\n";
@@ -225,6 +240,12 @@ while (defined($line = <INPUT>)) {
 	$line =~ s/\bpower\b/speed/g;	
 	$line =~ s/\bkind="POWER"/kind="SPEED"/g;
     }
+    if ($fromversion < 4.1) {
+	$line =~ s/\bAS\b/zone/g;
+	$line =~ s/\bASroute\b/zoneRoute/g;
+	$line =~ s/\bbypassAsRoute\b/bypassZoneRoute/g;
+	$line =~ s/\bprocess\b/actor/g;
+    }
 	
     $output_string .= "$line\n";
 }