From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sat, 9 Feb 2019 22:10:42 +0000 (+0100)
Subject: finish the rename of availability_file into speed_file
X-Git-Tag: v3_22~362
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e341af3b9940b7b7adafc12fc16d6cbd47dc0fa3

finish the rename of availability_file into speed_file
---

diff --git a/src/surf/xml/simgrid.dtd b/src/surf/xml/simgrid.dtd
index 9983c207eb..50f1fc6a0e 100644
--- a/src/surf/xml/simgrid.dtd
+++ b/src/surf/xml/simgrid.dtd
@@ -11,18 +11,14 @@ To upgrade your files, use the tool simgrid_update_xml
     - <as>, <asroute>, <bypassZoneRoute> and <process>, deprecated in DTD4.1
   - FULLDUPLEX sharing will be removed, deprecated in DTD4.2 (v3.19)
 
-* New in DTD version 4.2b (in SimGrid 3.22): backward compatible change
- (version is still announced to be 4.2 to not bother users)
-   - In <host> and <peer> availability_file is now speed_file
-
-* New in DTD version 4.2 (in SimGrid 3.19): backward compatible change (v4 files are valid v4.2 files)
-   - SPLITDUPLEX is the new spelling of the deprecated FULLDUPLEX
-
 * New in DTD version 4.1 (in SimGrid 3.16): backward compatible change (v4 files are valid v4.1 files)
    - <zone> can be used as a synonym for the now deprecated <as>
    - <zoneRoute> can be used as a synonym for the now deprecated <asroute>
    - <bypassZoneRoute> an be used as a synonym for the now deprecated <bypassAsRoute>
    - <actor> can be used as a synonym for the now deprecated <process>
+  Other backward-compatible changes for which we did not bump the DTD version.
+  - SPLITDUPLEX is the new spelling of the deprecated FULLDUPLEX (SimGrid v3.19)
+  - In <host> and <peer> availability_file is now speed_file (SimGrid v3.22)
 
 * New in DTD version 4 (in SimGrid 3.13):
    - Rename (power->speed) the attributes describing the amount of flop
diff --git a/tools/simgrid_update_xml.pl b/tools/simgrid_update_xml.pl
index 829a61c962..31dd44d414 100755
--- a/tools/simgrid_update_xml.pl
+++ b/tools/simgrid_update_xml.pl
@@ -123,7 +123,7 @@ 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)
+=item B<Version 4.1:> Introduced in SimGrid 3.16 (this is the current version).
 
 =over 4
 
@@ -146,6 +146,10 @@ Rename a few tags, but in a backward-compatible manner: the old names are still
 
 Rename the FULLDUPLEX sharing into SPLITDUPLEX.
 
+=item
+
+In <host> and <peer>, rename the 'availability_file' atribute into 'speed_file'.
+
 =back
 
 =back
@@ -257,6 +261,7 @@ while (defined($line = <INPUT>)) {
 	$line =~ s/\bprocess\b/actor/g;
     }
     $line =~ s/\bFULLDUPLEX\b/SPLITDUPLEX/g;
+    $line =~ s/\bavailability_file\b/speed_file/g;
 	
     $output_string .= "$line\n";
 }