Ask for version 1. Default is version 0.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2323 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/surf/surfxml.h b/include/surf/surfxml.h
index 757bca0..dbc2f88 100644 (file)
--- a/include/surf/surfxml.h
+++ b/include/surf/surfxml.h
@@ -1,5 +1,5 @@
 /* XML processor/application API for ../../src/surf/surfxml.dtd.
 /* XML processor/application API for ../../src/surf/surfxml.dtd.

- * Generated 2006/05/29 21:38:10.
+ * Generated 2006/05/29 23:03:04.

  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright © 1999-2005 Kristoffer Rose.  All rights reserved.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright © 1999-2005 Kristoffer Rose.  All rights reserved.

diff --git a/src/surf/surfxml.c b/src/surf/surfxml.c
index a26796b..fb270e8 100644 (file)
--- a/src/surf/surfxml.c
+++ b/src/surf/surfxml.c
@@ -1759,7 +1759,7 @@ int surf_parse__flex_debug = 0;
 char *surf_parse_text;
 #line 1 "surf/surfxml.l"
 /* Validating XML processor for surfxml.dtd.
 char *surf_parse_text;
 #line 1 "surf/surfxml.l"
 /* Validating XML processor for surfxml.dtd.

- * Generated 2006/05/29 21:38:10.
+ * Generated 2006/05/29 23:03:05.

  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright © 1999-2005 Kristoffer Rose.  All rights reserved.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright © 1999-2005 Kristoffer Rose.  All rights reserved.


@@ -2471,7 +2471,7 @@ case 23:
 YY_RULE_SETUP
 #line 346 "surf/surfxml.l"
 {
 YY_RULE_SETUP
 #line 346 "surf/surfxml.l"
 {

-  A_surfxml_platform_description_version = "1.0";
+  A_surfxml_platform_description_version = "0.0";

   ENTER(AL_surfxml_platform_description);
   }
        YY_BREAK
   ENTER(AL_surfxml_platform_description);
   }
        YY_BREAK

diff --git a/src/surf/surfxml.dtd b/src/surf/surfxml.dtd
index 8a1d153..be3e5ef 100644 (file)
--- a/src/surf/surfxml.dtd
+++ b/src/surf/surfxml.dtd
@@ -1,6 +1,6 @@
 <!-- Small DTD for SURF based tools. -->
 <!ELEMENT platform_description ((include|cpu|network_link|route|process)*)>
 <!-- Small DTD for SURF based tools. -->
 <!ELEMENT platform_description ((include|cpu|network_link|route|process)*)>

-<!ATTLIST platform_description version CDATA "1.0">
+<!ATTLIST platform_description version CDATA "0.0">

 
 <!ELEMENT include ((include|cpu|network_link|route|process)*)>
 <!ATTLIST include file CDATA #REQUIRED>
 
 <!ELEMENT include ((include|cpu|network_link|route|process)*)>
 <!ATTLIST include file CDATA #REQUIRED>

diff --git a/src/surf/surfxml.l b/src/surf/surfxml.l
index abc0d79..c9f1a1e 100644 (file)
--- a/src/surf/surfxml.l
+++ b/src/surf/surfxml.l
@@ -1,5 +1,5 @@
 /* Validating XML processor for surfxml.dtd.
 /* Validating XML processor for surfxml.dtd.

- * Generated 2006/05/29 21:38:10.
+ * Generated 2006/05/29 23:03:05.

  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright © 1999-2005 Kristoffer Rose.  All rights reserved.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright © 1999-2005 Kristoffer Rose.  All rights reserved.


@@ -344,7 +344,7 @@ const char* *surfxml_statenames=NULL;
  /* <!-- Small DTD for SURF based tools. -->  */
 
 <ROOT_surfxml_platform_description>"<platform_description"{s} {
  /* <!-- Small DTD for SURF based tools. -->  */
 
 <ROOT_surfxml_platform_description>"<platform_description"{s} {

-  A_surfxml_platform_description_version = "1.0";
+  A_surfxml_platform_description_version = "0.0";

   ENTER(AL_surfxml_platform_description);
   }
 
   ENTER(AL_surfxml_platform_description);
   }
 

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index bb2021a..1dcddf9 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -87,16 +87,17 @@ void STag_surfxml_platform_description(void)
 
   sscanf(A_surfxml_platform_description_version,"%lg",&version);
 
 
   sscanf(A_surfxml_platform_description_version,"%lg",&version);
 

-  xbt_assert0((version>=1.1),"******* BIG FAT WARNING *********\n "
+  xbt_assert0((version>=1.0),"******* BIG FAT WARNING *********\n "

              "You're using an old XML file. "
              "Since SimGrid 3.0.2, units are Bytes, Flops, and seconds "
              "instead of MBytes, MFlops and seconds. "
              "You're using an old XML file. "
              "Since SimGrid 3.0.2, units are Bytes, Flops, and seconds "
              "instead of MBytes, MFlops and seconds. "

-             "A script to help you convert your old platform files "
+             "A script (surfxml_update.pl )to help you convert your old "
+             "platform files "

              "is available in the contrib/platform_generation directory "
              "of the simgrid repository. Please check also out the "
              "SURF section of the ChangeLog for the 3.0.2 version. "
              "Last, do not forget to also update your values for "
              "is available in the contrib/platform_generation directory "
              "of the simgrid repository. Please check also out the "
              "SURF section of the ChangeLog for the 3.0.2 version. "
              "Last, do not forget to also update your values for "

-             "the calls to MSG_task_create.");
+             "the calls to MSG_task_create if any.");

 
   STag_surfxml_platform_description_fun();
 }
 
   STag_surfxml_platform_description_fun();
 }