# HG changeset patch # User Laurent Bessard # Date 1351187808 -7200 # Node ID abf90a44c2650ed47255a6ba9caae35745d471b2 # Parent 7e5da4962bea2ca44eb89f3eca94eeb808b53669 Fix bug when more than one block library add extra python file diff -r 7e5da4962bea -r abf90a44c265 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