--- a/targets/Linux/__init__.py Fri Nov 18 23:54:03 2011 +0100
+++ b/targets/Linux/__init__.py Sat Nov 19 21:52:34 2011 +0100
@@ -1,4 +1,4 @@
-from .. import toolchain_gcc
+from ..toolchain_gcc import toolchain_gcc
class Linux_target(toolchain_gcc):
extension = ".so"
--- a/targets/Rtai/XSD Fri Nov 18 23:54:03 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-
- <xsd:element name="Rtai">
- <xsd:complexType>
- %(toolchain_gcc)s
- <xsd:attribute name="rtai_config" type="xsd:string" use="optional" default="/usr/realtime/"/>
- </xsd:complexType>
- </xsd:element>
\ No newline at end of file
--- a/targets/Rtai/__init__.py Fri Nov 18 23:54:03 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-from target_rtai import *
\ No newline at end of file
--- a/targets/Rtai/target_rtai.py Fri Nov 18 23:54:03 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-class rtai_target(targets.target_gcc):
- extensionexe = "exe"
- extensiondll = "dll"
--- a/targets/Win32/__init__.py Fri Nov 18 23:54:03 2011 +0100
+++ b/targets/Win32/__init__.py Sat Nov 19 21:52:34 2011 +0100
@@ -1,4 +1,4 @@
-from .. import toolchain_gcc
+from ..toolchain_gcc import toolchain_gcc
class Win32_target(toolchain_gcc):
extension = ".dll"
--- a/targets/Xenomai/__init__.py Fri Nov 18 23:54:03 2011 +0100
+++ b/targets/Xenomai/__init__.py Sat Nov 19 21:52:34 2011 +0100
@@ -1,5 +1,4 @@
-from .. import toolchain_gcc
-from wxPopen import ProcessLogger
+from ..toolchain_gcc import toolchain_gcc
class Xenomai_target(toolchain_gcc):
extension = ".so"
@@ -7,6 +6,7 @@
""" Get xeno-config from target parameters """
xeno_config=self.PluginsRootInstance.GetTarget().getcontent()["value"].getXenoConfig()
if xeno_config:
+ from wxPopen import ProcessLogger
status, result, err_result = ProcessLogger(self.PluginsRootInstance.logger,
xeno_config + " --skin=native --"+flagsname,
no_stdout=True).spin()
--- a/targets/__init__.py Fri Nov 18 23:54:03 2011 +0100
+++ b/targets/__init__.py Sat Nov 19 21:52:34 2011 +0100
@@ -34,8 +34,14 @@
_base_path = path.split(__file__)[0]
-targets = [name for name in listdir(_base_path) if path.isdir(path.join(_base_path, name)) and name.upper() != "CVS" and not name.startswith("__")]
-toolchains = [name for name in listdir(_base_path) if not path.isdir(path.join(_base_path, name)) and name.upper() != "CVS" and name.endswith(".py") and not name.startswith("__") and not name.endswith(".pyc")]
+targets = [name for name in listdir(_base_path)
+ if path.isdir(path.join(_base_path, name))
+ and not name.startswith("__")]
+toolchains = [name for name in listdir(_base_path)
+ if not path.isdir(path.join(_base_path, name))
+ and name.endswith(".py")
+ and not name.startswith("__")
+ and not name.endswith(".pyc")]
DictXSD_toolchain = {}
DictXSD_target = {}
@@ -74,5 +80,3 @@
filename = path.join(path.split(__file__)[0],name + ".c")
return open(filename).read()
-from toolchain_gcc import toolchain_gcc
-from toolchain_makefile import toolchain_makefile
\ No newline at end of file