--- a/TODO	Fri May 04 17:39:37 2007 +0200
+++ b/TODO	Sat May 05 11:45:38 2007 +0200
@@ -1,14 +1,24 @@
-* Split build recipe's into Basic (configure??; make; make install),
-  AutoTools; move Scons, Bjam recipes to gub lib.  Softcode stages,
-  move autotools patching to autogen/prepare_configure stage.
+* move and merge cross.Gcc into cross/gcc
+
+* Softcode stages.
+
+* move Scons, Bjam recipes to gub lib.
+
+* code cygwin installer as alternative build spec.
+
+* code .deb installer as alternative build spec.
+
+* look at other installer-builders -> build spec?
+
+* Split build recipes into Basic (configure??; make; make install),
+  AutoTools
+
+* move autotools patching to autogen/prepare_configure stage.
 
 * move makeflags () feature to buildspec.
 
-* Bootstrap whole toolchain from source on more platforms (freebsd)
+* Bootstrap whole toolchain from source on more platforms (freebsd)?
 
-* Install cross toolchain packages in target/local?
-
-* move and merge cross.Gcc, cross.Binutils into cross/gcc, cross/binutils.
 
 LOWER PRIORITY
 

--- a/gub/cross.py	Fri May 04 17:39:37 2007 +0200
+++ b/gub/cross.py	Sat May 05 11:45:38 2007 +0200
@@ -34,12 +34,6 @@
     def license_file (self):
         return ''
 
-#FIXME: merge fully with specs/binutils.py
-class Binutils (CrossToolSpec):
-    def install (self):
-        CrossToolSpec.install (self)
-        self.system ('rm %(install_root)s/usr/cross/lib/libiberty.a')
-    
 #FIXME: merge fully with specs/gcc
 class Gcc (CrossToolSpec):
     def get_build_dependencies (self):

--- a/gub/specs/cross/binutils.py	Fri May 04 17:39:37 2007 +0200
+++ b/gub/specs/cross/binutils.py	Sat May 05 11:45:38 2007 +0200
@@ -1,35 +1,10 @@
 from gub import cross
 from gub import mirrors
 
-class Binutils (cross.Binutils):
-    def __init__ (self, settings):
-        cross.Binutils.__init__ (self, settings)
-        self.with_tarball (mirror=mirrors.gnu, version='2.16.1', format='bz2')
-
-# FIXME: setting binutil's tooldir and/or gcc's gcc_tooldir may fix
-# -luser32 (ie -L .../w32api/) problem without having to set LDFLAGS.
-class Binutils__cygwin (Binutils):
+class Binutils (cross.CrossToolSpec):
     def __init__ (self, settings):
-        Binutils.__init__ (self, settings)
-        self.with (version='2.17', format='bz2', mirror=mirrors.gnu)
-    def makeflags (self):
-        from gub import misc
-        return misc.join_lines ('''
-tooldir="%(cross_prefix)s/%(target_architecture)s"
-''')
-    def compile_command (self):
-        return (cross.Binutils.compile_command (self)
-                + self.makeflags ())
-    def configure_command (self):
-        return ( cross.Binutils.configure_command (self)
-                 + ' --disable-werror ')
-
-class Binutils__freebsd (Binutils):
-    def configure_command (self):
-        # Add --program-prefix, otherwise we get
-        # i686-freebsd-FOO iso i686-freebsd4-FOO.
-        from gub import misc
-        return (cross.Binutils.configure_command (self)
-            + misc.join_lines ('''
---program-prefix=%(tool_prefix)s
-'''))
+        cross.CrossToolSpec.__init__ (self, settings)
+        self.with_tarball (mirror=mirrors.gnu, version='2.16.1', format='bz2')
+    def install (self):
+        cross.CrossToolSpec.install (self)
+        self.system ('rm %(install_root)s/usr/cross/lib/libiberty.a')

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/cygwin/cross/binutils.py	Sat May 05 11:45:38 2007 +0200
@@ -0,0 +1,20 @@
+from gub.specs.cross import binutils
+
+# FIXME: setting binutil's tooldir and/or gcc's gcc_tooldir may fix
+# -luser32 (ie -L .../w32api/) problem without having to set LDFLAGS.
+class Binutils (binutils.Binutils):
+    def __init__ (self, settings):
+        binutils.Binutils.__init__ (self, settings)
+        from gub import mirrors
+        self.with (version='2.17', format='bz2', mirror=mirrors.gnu)
+    def makeflags (self):
+        from gub import misc
+        return misc.join_lines ('''
+tooldir="%(cross_prefix)s/%(target_architecture)s"
+''')
+    def compile_command (self):
+        return (binutils.Binutils.compile_command (self)
+                + self.makeflags ())
+    def configure_command (self):
+        return (binutils.Binutils.configure_command (self)
+                 + ' --disable-werror ')

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/freebsd/cross/binutils.py	Sat May 05 11:45:38 2007 +0200
@@ -0,0 +1,11 @@
+from gub.specs.cross import binutils
+
+class Binutils__freebsd (binutils.Binutils):
+    def configure_command (self):
+        # Add --program-prefix, otherwise we get
+        # i686-freebsd-FOO iso i686-freebsd4-FOO.
+        from gub import misc
+        return (binutils.Binutils.configure_command (self)
+            + misc.join_lines ('''
+--program-prefix=%(tool_prefix)s
+'''))