--- a/rakefile	Sat May 02 11:27:24 2009 +0200
+++ b/rakefile	Sun Nov 08 12:42:30 2009 +0100
@@ -112,11 +112,13 @@
     if isDebug
         dbg_str = "Debug "
     end
-    puts "#{dbg_str}Building #{libname}"
 
     resdir_abs = File.expand_path( File.join( basedir, resdir ))
     srcdir_abs = File.expand_path( File.join( basedir, srcdir ))
 
+    STDERR.puts "#{dbg_str}Building #{libname}"
+    STDERR.puts "workdir=>#{srcdir_abs.to_path}"
+
     FileUtils.mkdir_p DIR_IMP
     FileUtils.mkdir_p DIR_OBJ
     FileUtils.mkdir_p DIR_RES
@@ -312,14 +314,62 @@
 end
 
 desc "Build Equinox"
-task :equinox do
+task :default => :work
+
+desc "Build Equinox"
+task "equinox" do
     buildTree( "org.eclipse.osgi", "osgi/src"      , "res", nil, "org.eclipse.osgi.osgi" )
     buildTree( "org.eclipse.osgi", "supplement/src", "res", nil, "org.eclipse.osgi.supplement")
     buildTree( "org.eclipse.equinox.common", "src", "res" )
+
+    buildTree( "org.eclipse.osgi", "console/src", "res", nil, "org.eclipse.osgi.console")
+    buildTree( "org.eclipse.osgi", "core/adaptor", "res", nil, "org.eclipse.osgi.core.adaptor")
+    buildTree( "org.eclipse.osgi", "core/framework", "res", nil, "org.eclipse.osgi.core.framework")
+    buildTree( "org.eclipse.osgi", "defaultAdaptor/src", "res", nil, "org.eclipse.osgi.defaultadaptor")
+    buildTree( "org.eclipse.osgi", "eclipseAdaptor/src", "res", nil, "org.eclipse.osgi.eclipseadaptor")
+    buildTree( "org.eclipse.osgi", "jarverifier", "res", nil, "org.eclipse.osgi.jarverifier")
+    buildTree( "org.eclipse.osgi", "resolver/src", "res", nil, "org.eclipse.osgi.resolver")
+    buildTree( "org.eclipse.osgi", "security/src", "res", nil, "org.eclipse.osgi.security")
+    buildTree( "org.eclipse.osgi", "supplement/src", "res", nil, "org.eclipse.osgi.supplement")
+    buildTree( "org.eclipse.osgi.services", "src", "res" )
+    buildTree( "org.eclipse.equinox.app", "src", "res" )
+    buildTree( "org.eclipse.equinox.preferences", "src", "res" )
+    buildTree( "org.eclipse.equinox.registry", "src", "res" )
+    buildTree( "org.eclipse.equinox.security", "src", "res" )
 end
 
 desc "Build Current Working area"
 task :work do
+    searchdirs = ""
+    searchdirs << "-I../../supplement/src "
+    searchdirs << "-I../../osgi/src "
+    searchdirs << "-I../../core/framework "
+    searchdirs << "-I../../supplement/src "
+    searchdirs << "-I../../console/src "
+    searchdirs << "-I../../core/adaptor "
+    searchdirs << "-I../../defaultAdaptor/src "
+    searchdirs << "-I../../eclipseAdaptor/src "
+    searchdirs << "-I../../jarverifier "
+    searchdirs << "-I../../resolver/src "
+    searchdirs << "-I../../security/src "
+
+    buildTree( "org.eclipse.osgi", "supplement/src", "res", searchdirs, "org.eclipse.osgi.supplement")
+    buildTree( "org.eclipse.osgi", "osgi/src"      , "res", searchdirs, "org.eclipse.osgi.osgi" )
+    buildTree( "org.eclipse.osgi", "core/framework", "res", searchdirs, "org.eclipse.osgi.core.framework")
+    buildTree( "org.eclipse.osgi", "supplement/src", "res", nil, "org.eclipse.osgi.supplement")
+    buildTree( "org.eclipse.osgi", "console/src", "res", nil, "org.eclipse.osgi.console")
+    buildTree( "org.eclipse.osgi", "core/adaptor", "res", nil, "org.eclipse.osgi.core.adaptor")
+    buildTree( "org.eclipse.osgi", "defaultAdaptor/src", "res", nil, "org.eclipse.osgi.defaultadaptor")
+    buildTree( "org.eclipse.osgi", "eclipseAdaptor/src", "res", nil, "org.eclipse.osgi.eclipseadaptor")
+    buildTree( "org.eclipse.osgi", "jarverifier", "res", nil, "org.eclipse.osgi.jarverifier")
+    buildTree( "org.eclipse.osgi", "resolver/src", "res", nil, "org.eclipse.osgi.resolver")
+    buildTree( "org.eclipse.osgi", "security/src", "res", nil, "org.eclipse.osgi.security")
+    buildTree( "org.eclipse.osgi.services", "src", "res" )
+    buildTree( "org.eclipse.equinox.common", "src", "res" )
+    buildTree( "org.eclipse.equinox.app", "src", "res" )
+    buildTree( "org.eclipse.equinox.preferences", "src", "res" )
+    buildTree( "org.eclipse.equinox.registry", "src", "res" )
+    buildTree( "org.eclipse.equinox.security", "src", "res" )
 end
 
 desc "Build Eclipse Core"
@@ -364,10 +414,6 @@
 task :all => [ :base, :swt, :equinox, :core, :jface, :jfacetext, :uiforms,
     :draw2d, :swtsnippets, :jfacesnippets ]
 
-desc "Clean, then build ALL"
-task :default => [ :clean, :all ]
-
-
 desc "Build SWT Snippet Collection"
 task :swtsnippets, :explicit_snp do | t, args |