From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 29 May 2006 21:34:55 +0000 (+0000)
Subject: Ask for version 1. Default is version 0.
X-Git-Tag: v3.3~3035
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/56c92988c6bf8a4e5c1df4a5af4388310f879353?hp=0b69d6fe3f15209782ddcff38f5a260b8e26cf47

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 757bca02a8..dbc2f88b5b 100644
--- a/include/surf/surfxml.h
+++ b/include/surf/surfxml.h
@@ -1,5 +1,5 @@
 /* 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.
diff --git a/src/surf/surfxml.c b/src/surf/surfxml.c
index a26796b68b..fb270e84ae 100644
--- 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.
- * 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.
@@ -2471,7 +2471,7 @@ case 23:
 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
diff --git a/src/surf/surfxml.dtd b/src/surf/surfxml.dtd
index 8a1d153bc1..be3e5efefa 100644
--- 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)*)>
-<!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>
diff --git a/src/surf/surfxml.l b/src/surf/surfxml.l
index abc0d79569..c9f1a1ece5 100644
--- a/src/surf/surfxml.l
+++ b/src/surf/surfxml.l
@@ -1,5 +1,5 @@
 /* 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.
@@ -344,7 +344,7 @@ const char* *surfxml_statenames=NULL;
  /* <!-- 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);
   }
 
diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index bb2021aa43..1dcddf9fc2 100644
--- 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);
 
-  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. "
-	      "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 "
-	      "the calls to MSG_task_create.");
+	      "the calls to MSG_task_create if any.");
 
   STag_surfxml_platform_description_fun();
 }