Fix bug when more than one block library add extra python file
authorLaurent Bessard
Thu, 25 Oct 2012 19:56:48 +0200
changeset 869 abf90a44c265
parent 868 7e5da4962bea
child 870 61b32521442e
Fix bug when more than one block library add extra python file
ProjectController.py
--- a/ProjectController.py	Thu Oct 25 10:52:46 2012 +0200
+++ b/ProjectController.py	Thu Oct 25 19:56:48 2012 +0200
@@ -387,8 +387,8 @@
             res=lib.Generate_C(buildpath,self._VariablesList,LibIECCflags)  
             LocatedCCodeAndFlags.append(res[:2])
             if len(res)>2:
-                Extras.append(res[2:])
-        return map(list,zip(*LocatedCCodeAndFlags))+[tuple(*Extras)]
+                Extras.extend(res[2:])
+        return map(list,zip(*LocatedCCodeAndFlags))+[tuple(Extras)]
     
     # Update PLCOpenEditor ConfNode Block types from loaded confnodes
     def RefreshConfNodesBlockLists(self):
@@ -861,7 +861,7 @@
         self.LocationCFilesAndCFLAGS =  CTNLocationCFilesAndCFLAGS + LibCFilesAndCFLAGS
         self.LDFLAGS = CTNLDFLAGS + LibLDFLAGS
         ExtraFiles = CTNExtraFiles + LibExtraFiles
-
+        
         # Get temporary directory path
         extrafilespath = self._getExtraFilesPath()
         # Remove old directory