X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/14dbe48f4f9623cf72fc207b7c2041b9f611972a..9eab2886ffadf12a783f7a29e27c60ca5523e580:/tools/simgrid_update_xml.pl

diff --git a/tools/simgrid_update_xml.pl b/tools/simgrid_update_xml.pl
index da3df3f190..006c1d7758 100755
--- a/tools/simgrid_update_xml.pl
+++ b/tools/simgrid_update_xml.pl
@@ -5,7 +5,7 @@ eval 'exec perl -S $0 ${1+"$@"}'
 # This script updates the simgrid XML file passed as argument (modification in place)
 # It is built to do the conversion incrementally.
 
-# Copyright (c) 2006-2014. The SimGrid Team.
+# Copyright (c) 2006-2016. The SimGrid Team.
 # All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@ changes in each version.
 
 =item 
 
-The version attribute of platform were added to allow file versionning.
+The version attribute of platform were added to allow file versioning.
 
 =item
 
@@ -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,18 +157,15 @@ under the terms of GNU LGPL (v2.1) license.
 use strict;
 
 my $fromversion=-1;
-my $toversion=4;
+my $toversion=4.1;
 
-my($output_string);
-
-my $filename = $ARGV[0] or die "simgrid_update_xml.pl <platform.xml>\n";
+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";
 
-$output_string = "<?xml version='1.0'?>\n".
+my $output_string = "<?xml version='1.0'?>\n".
     "<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\n".
     "<platform version=\"$toversion\">\n";
 
-
 my($AS_opened)=0;
 
 my $line;
@@ -167,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";
@@ -228,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";
 }