Update of /cvsroot/csp/APPLICATIONS/SimData/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv12171/SimData
Modified Files:
Tag: b0_4_0
Compile.py Parse.py
Log Message:
Index: Compile.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Compile.py,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** Compile.py 11 Apr 2003 18:06:37 -0000 1.2
--- Compile.py 17 Oct 2003 21:33:55 -0000 1.2.2.1
***************
*** 144,150 ****
print "%d warnings (severity=%d)." % (warnings, level)
if level > 0:
! print "Please fix these warnings and recompile."
! print "Compiled data archive NOT written!"
! sys.exit(1)
paths = master.getPaths()
DEBUG(1,"Compiling all objects")
--- 144,153 ----
print "%d warnings (severity=%d)." % (warnings, level)
if level > 0:
! if level > getWarningLevel():
! print "Run with '--warn=%d' to see all warnings." % level
! if not self.force:
! print "Please fix these warnings and recompile."
! print "Compiled data archive NOT written!"
! sys.exit(1)
paths = master.getPaths()
DEBUG(1,"Compiling all objects")
***************
*** 188,191 ****
--- 191,195 ----
print >>out, " --debug=level show debug messages (< level)"
print >>out, " --rebuild rebuild entire archive"
+ print >>out, " --force ignore warnings"
print >>out, " --help help message"
***************
*** 224,227 ****
--- 228,233 ----
elif arg == '--rebuild':
self.rebuild = 1
+ elif arg == '--force':
+ self.force = 1
elif arg in ("--help", "-h", "-help"):
self.usage()
***************
*** 241,244 ****
--- 247,251 ----
setWarningLevel(1)
self.rebuild = 0
+ self.force = 0
self.infile = None
self.outfile = None
Index: Parse.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Parse.py,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** Parse.py 20 Aug 2003 02:47:10 -0000 1.12
--- Parse.py 17 Oct 2003 21:33:55 -0000 1.12.2.1
***************
*** 504,507 ****
--- 504,508 ----
def __init__(self, id, base, name, attrs):
SimpleHandler.__init__(self, id, base, name, attrs)
+ WARN(1, "<Curve> is deprecated, use Table1 instead.")
for member in CurveHandler.members:
setattr(self, "_"+member, None)
***************
*** 553,556 ****
--- 554,558 ----
def __init__(self, id, base, name, attrs):
SimpleHandler.__init__(self, id, base, name, attrs)
+ WARN(1, "<Curve> is deprecated, use Table2 instead.")
self._keys = {}
***************
*** 733,738 ****
self._req_variables = self._interface.getRequiredNames()
! static = attrs.get("static", "0").upper() in ("1", "TRUE")
! self._object.setStatic(static)
def endChild(self):
--- 735,740 ----
self._req_variables = self._interface.getRequiredNames()
! if attrs.has_key("static"):
! WARN(1, "'static' attribute of <Object> is deprecated.")
def endChild(self):
|
