Mercurial Mercurial > beremiz / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Changes merged
author'Laurent Bessard <laurent.bessard@lolitech.fr>'
Mon, 21 Sep 2009 12:12:08 +0200
changeset 398 31d08063b5d6
parent 397 6a7ff66a811d (current diff)
parent 391 9b1801ef99b5 (diff)
child 399 77e23bf04c33
Changes merged
runtime/PLCObject.py file | annotate | diff | comparison | revisions 
--- a/runtime/PLCObject.py	Mon Sep 21 12:00:52 2009 +0200
+++ b/runtime/PLCObject.py	Mon Sep 21 12:12:08 2009 +0200
@@ -187,7 +187,7 @@
         
         for filename in os.listdir(self.workingdir):
             name, ext = os.path.splitext(filename)
-            if name.startswith("runtime") and ext == ".py":
+            if name.upper().startswith("RUNTIME") and ext.upper() == ".PY":
                 try:
                     # TODO handle exceptions in runtime.py
                     # pyfile may redefine _runtime_cleanup
--- a/targets/Win32/XSD	Mon Sep 21 12:00:52 2009 +0200
+++ b/targets/Win32/XSD	Mon Sep 21 12:12:08 2009 +0200
@@ -1,7 +1,10 @@
 
                   <xsd:element name="Win32">
                     <xsd:complexType>
-                      %(toolchain_gcc)s
+                      <xsd:attribute name="Compiler" type="xsd:string" use="optional" default="mingw32-gcc-sjlj"/>
+                      <xsd:attribute name="CFLAGS" type="xsd:string" use="required"/>
+                      <xsd:attribute name="Linker" type="xsd:string" use="optional" default="mingw32-g++-sjlj"/>
+                      <xsd:attribute name="LDFLAGS" type="xsd:string" use="required"/>
                     </xsd:complexType>
                   </xsd:element>
beremiz