[GRASS-SVN] r43118 - grass/trunk/lib/python/ctypes/ctypesgencore/parser

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-08-14 22:29:37 +0000 (Sat, 14 Aug 2010)
New Revision: 43118

Modified:
   grass/trunk/lib/python/ctypes/ctypesgencore/parser/preprocessor.py
Log:
Windows fixes:
 strip CRs from preprocessor output
 replace \ with / in tempfile name


Modified: grass/trunk/lib/python/ctypes/ctypesgencore/parser/preprocessor.py
===================================================================
--- grass/trunk/lib/python/ctypes/ctypesgencore/parser/preprocessor.py	2010-08-14 21:32:37 UTC (rev 43117)
+++ grass/trunk/lib/python/ctypes/ctypesgencore/parser/preprocessor.py	2010-08-14 22:29:37 UTC (rev 43118)
@@ -84,7 +84,7 @@
 
 def create_token(type, value, production=None):
     '''Create a token of type and value, at the position where 'production'
-    was reduced.  Don't specify production if the token is built-in'''
+    was reduced.  Don`t specify production if the token is built-in'''
     t = lex.LexToken()
     t.type = type
     t.value = value
@@ -137,7 +137,7 @@
             cmd += " -I%s" % path 
         for define in self.defines:
             cmd += ' "-D%s"' % define
-        cmd += " " + filename
+        cmd += " " + filename.replace('\\','/')
 
         self.cparser.handle_status(cmd)
         
@@ -158,6 +158,7 @@
         define_lines = []
         
         for line in ppout.split("\n"):
+            line = line.rstrip('\r')
             line = line + "\n"
             if line.startswith("# "):
                 # Line number information has to go with both groups