--- a/targets/toolchain_makefile.py Sat Dec 12 20:49:07 2009 +0100
+++ b/targets/toolchain_makefile.py Sat Dec 12 20:51:56 2009 +0100
@@ -1,7 +1,6 @@
-import os, re, operator
+import os, re
from wxPopen import ProcessLogger
-import hashlib, shutil
-from toolchain_gcc import toolchain_gcc
+import hashlib
includes_re = re.compile('\s*#include\s*["<]([^">]*)[">].*')
@@ -12,12 +11,6 @@
self.buildpath = None
self.SetBuildPath(self.PluginsRootInstance._getBuildPath())
- def getTarget(self):
- target = self.PluginsRootInstance.BeremizRoot.getTargetType()
- if target.getcontent() is None:
- target = self.PluginsRootInstance.GetDefaultTarget()
- return target
-
def SetBuildPath(self, buildpath):
self.buildpath = buildpath
self.exe_path = os.path.join(self.buildpath, "ArmPLC_rom.bin")
@@ -64,7 +57,7 @@
"md5": self.md5key
}
- target = self.getTarget().getcontent()["value"]
+ target = self.PluginsRootInstance.GetTarget().getcontent()["value"]
command = target.getCommand().split(' ') +\
[target.getBuildPath()] +\
[arg % beremizcommand for arg in target.getArguments().split(' ')] +\