# HG changeset patch
# User lbessard
# Date 1237821973 -3600
# Node ID 9f07f0d429df001f4a89687e2d71f02583fa69c1
# Parent  b8ae0580565c47d0d4d627e599342fbfadfeaba0
Fix bug preventing library to re-compiled when dependant files changed.
Fix bug preventing to re-compile a file without changes even when file miscompiled.

diff -r b8ae0580565c -r 9f07f0d429df targets/toolchain_gcc.py
--- a/targets/toolchain_gcc.py	Mon Mar 23 16:20:05 2009 +0100
+++ b/targets/toolchain_gcc.py	Mon Mar 23 16:26:13 2009 +0100
@@ -10,11 +10,11 @@
     It cannot be used as this and should be inherited in a target specific
     class such as target_linux or target_win32
     """
-    def __init__(self, PuginsRootInstance):
-        self.PuginsRootInstance = PuginsRootInstance
-        self.logger = PuginsRootInstance.logger
-        self.exe = PuginsRootInstance.GetProjectName() + self.extension
-        self.buildpath = PuginsRootInstance._getBuildPath()
+    def __init__(self, PluginsRootInstance):
+        self.PluginsRootInstance = PluginsRootInstance
+        self.logger = PluginsRootInstance.logger
+        self.exe = PluginsRootInstance.GetProjectName() + self.extension
+        self.buildpath = PluginsRootInstance._getBuildPath()
         self.exe_path = os.path.join(self.buildpath, self.exe)
         self.md5key = None
         self.srcmd5 = {}
@@ -23,14 +23,14 @@
         """
         Returns list of builder specific CFLAGS
         """
-        return [self.PuginsRootInstance.BeremizRoot.getTargetType().getcontent()["value"].getCFLAGS()]
+        return [self.PluginsRootInstance.BeremizRoot.getTargetType().getcontent()["value"].getCFLAGS()]
 
     def getBuilderLDFLAGS(self):
         """
         Returns list of builder specific LDFLAGS
         """
-        return self.PuginsRootInstance.LDFLAGS + \
-               [self.PuginsRootInstance.BeremizRoot.getTargetType().getcontent()["value"].getLDFLAGS()]
+        return self.PluginsRootInstance.LDFLAGS + \
+               [self.PluginsRootInstance.BeremizRoot.getTargetType().getcontent()["value"].getLDFLAGS()]
 
     def GetBinaryCode(self):
         try:
@@ -78,7 +78,7 @@
                 
     def build(self):
         # Retrieve toolchain user parameters
-        toolchain_params = self.PuginsRootInstance.BeremizRoot.getTargetType().getcontent()["value"]
+        toolchain_params = self.PluginsRootInstance.BeremizRoot.getTargetType().getcontent()["value"]
         self.compiler = toolchain_params.getCompiler()
         self.linker = toolchain_params.getLinker()
 
@@ -87,13 +87,13 @@
         ######### GENERATE OBJECT FILES ########################################
         obns = []
         objs = []
-        for Location, CFilesAndCFLAGS, DoCalls in self.PuginsRootInstance.LocationCFilesAndCFLAGS:
+        relink = False
+        for Location, CFilesAndCFLAGS, DoCalls in self.PluginsRootInstance.LocationCFilesAndCFLAGS:
             if Location:
-                self.logger.write("Plugin : " + self.PuginsRootInstance.GetChildByIECLocation(Location).GetCurrentName() + " " + str(Location)+"\n")
+                self.logger.write("Plugin : " + self.PluginsRootInstance.GetChildByIECLocation(Location).GetCurrentName() + " " + str(Location)+"\n")
             else:
                 self.logger.write("PLC :\n")
                 
-            relink = False
             for CFile, CFLAGS in CFilesAndCFLAGS:
                 bn = os.path.basename(CFile)
                 obn = os.path.splitext(bn)[0]+".o"
@@ -115,6 +115,7 @@
                            ).spin()
 
                     if status :
+                        self.srcmd5.pop(bn)
                         self.logger.write_error("C compilation of "+ bn +" failed.\n")
                         return False