equal
deleted
inserted
replaced
385 Extras=[] |
385 Extras=[] |
386 for lib in self.Libraries: |
386 for lib in self.Libraries: |
387 res=lib.Generate_C(buildpath,self._VariablesList,LibIECCflags) |
387 res=lib.Generate_C(buildpath,self._VariablesList,LibIECCflags) |
388 LocatedCCodeAndFlags.append(res[:2]) |
388 LocatedCCodeAndFlags.append(res[:2]) |
389 if len(res)>2: |
389 if len(res)>2: |
390 Extras.append(res[2:]) |
390 Extras.extend(res[2:]) |
391 return map(list,zip(*LocatedCCodeAndFlags))+[tuple(*Extras)] |
391 return map(list,zip(*LocatedCCodeAndFlags))+[tuple(Extras)] |
392 |
392 |
393 # Update PLCOpenEditor ConfNode Block types from loaded confnodes |
393 # Update PLCOpenEditor ConfNode Block types from loaded confnodes |
394 def RefreshConfNodesBlockLists(self): |
394 def RefreshConfNodesBlockLists(self): |
395 if getattr(self, "Children", None) is not None: |
395 if getattr(self, "Children", None) is not None: |
396 self.ClearConfNodeTypes() |
396 self.ClearConfNodeTypes() |
859 return False |
859 return False |
860 |
860 |
861 self.LocationCFilesAndCFLAGS = CTNLocationCFilesAndCFLAGS + LibCFilesAndCFLAGS |
861 self.LocationCFilesAndCFLAGS = CTNLocationCFilesAndCFLAGS + LibCFilesAndCFLAGS |
862 self.LDFLAGS = CTNLDFLAGS + LibLDFLAGS |
862 self.LDFLAGS = CTNLDFLAGS + LibLDFLAGS |
863 ExtraFiles = CTNExtraFiles + LibExtraFiles |
863 ExtraFiles = CTNExtraFiles + LibExtraFiles |
864 |
864 |
865 # Get temporary directory path |
865 # Get temporary directory path |
866 extrafilespath = self._getExtraFilesPath() |
866 extrafilespath = self._getExtraFilesPath() |
867 # Remove old directory |
867 # Remove old directory |
868 if os.path.exists(extrafilespath): |
868 if os.path.exists(extrafilespath): |
869 shutil.rmtree(extrafilespath) |
869 shutil.rmtree(extrafilespath) |