diff -r d7b0b2d8854c -r 6eb074f0dae9 plugger.py --- a/plugger.py Mon Jan 19 13:11:20 2009 +0100 +++ b/plugger.py Mon Jan 19 17:08:17 2009 +0100 @@ -276,7 +276,8 @@ def STLibraryFactory(self): if self.LibraryControler is not None: - return self.LibraryControler.GenerateProgram() + program, errors, warnings = self.LibraryControler.GenerateProgram() + return program return "" def IterChilds(self): @@ -896,10 +897,14 @@ self.logger.write("Generating SoftPLC IEC-61131 ST/IL/SFC code...\n") buildpath = self._getBuildPath() # ask PLCOpenEditor controller to write ST/IL/SFC code file - result = self.GenerateProgram(self._getIECgeneratedcodepath()) - if result is not None: + program, errors, warnings = self.GenerateProgram(self._getIECgeneratedcodepath()) + if len(warnings) > 0: + self.logger.write_warning("Warnings in ST/IL/SFC code generator :\n") + for warning in warnings: + self.logger.write_warning("%s\n"%warning) + if len(errors) > 0: # Failed ! - self.logger.write_error("Error in ST/IL/SFC code generator :\n%s\n"%result) + self.logger.write_error("Error in ST/IL/SFC code generator :\n%s\n"%errors[0]) return False plc_file = open(self._getIECcodepath(), "w") if getattr(self, "PluggedChilds", None) is not None: