rakish 0.9.01.beta → 0.9.11.beta

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: a76add697656e40d4a07ed495c25dc8e89015582873066c66b86904e18c8c46b
+  data.tar.gz: 1f3077d8a0246a0ed4ac0bac085443fa05ccb0b93b1cab753ea58fdf16674995
+SHA512:
+  metadata.gz: fc547a117eaa7e5935ce84498c9bd5bddc73b55002cbba772995386c58f46cfd2d6a81f815396fbdd72d5f7b689edb52c88a0d50ed0f52e42d8c542acc34dbc9
+  data.tar.gz: 77b12ea0587eac95bc51c7562d6b1fa82a20ab4c00be7023b0140608c99360f459ee4347fdd46e7491d13d1965e1ffc3df7cade5072dd3afc240bc786def4850

data/doc/ChangeLog.txt

@@ -0,0 +1,50 @@
+
+
+0.9.10.beta
+
+-   definiteitely some bugfixes in the heat of getting projects to build.
+
+-   Some cleanup on the CppProjects module
+
+-   Added RaspberiPiCppTools for building C,C++ code on the Raspberi Pi.
+
+-   Added rakish Rakish::SearchPath to facilitate finding executables in the current PATH or items in the classpath
+    or other paths.
+
+-   Added BuildConfig#findInPath to Rakish::ProjectConfig
+
+-   Added experimental "createArgs" to Rake::Task to allow setting named values in a Task at "define_task" time.
+    Since the added args can not be the same as the task name, using a prefix on the keys of '@' or '$' is a good way
+    of preventing conflicts as these are not typically used as task names. This feature requires ruby 1.9.x+ to work.
+
+    examples:
+
+    task :withCreateArgs, :arg0=>'val0', :arg1=>val1 ... do   end
+    task :withCreateArgs=>[ :deps ], :arg0=>'val0', :arg1=>val1 ... do   end
+    task :withCreateArgs,  [ :commandLineArg, ... ], :arg0=>'val0', :arg1=>val1 ... do   end
+    task :withCreateArgs,  [ :commandLineArg, ... ]=>[ :deps ], :arg0=>'val0', :arg1=>val1 ... do   end
+
+    removed the "Task#data" method as the "Task#createArgs" now substitutes and this was only used in one place in the
+    windows C compiler tools manifest builder task.
+
+-   Added Rakish::FileSetTask to check timestamps on a collection of files specified with wildcards but not have them
+    added as prerequisites.  The wildcards are evaluated the first time the timestamp is checked which is when a task with
+    a dependency on it checks it's dependencies.  The wildcards are specified at instantiation time.
+
+    This to handle executing a task if any of the files found have been touched.
+
+-   Added fileset_task convenience method ro Rakish::Utils
+
+0.9.11.beta
+
+-   Buyers remorse on createArgs it now uses only one named argument :$@
+    This makes life a lot simpler and more future proof in case later versions of rake use
+    additional named aruments
+
+    examples:
+
+    task :withCreateArgs, :$@=>{ :arg0=>'val0', :arg1=>val1 ...}  do   end
+    task :withCreateArgs=>[ :deps ], :$@=>{ :arg0=>'val0', :arg1=>val1 ...}  do   end
+    task :withCreateArgs,  [ :commandLineArg, ... ], :$@=>{ :arg0=>'val0', :arg1=>val1 ...}  do   end
+    task :withCreateArgs,  [ :commandLineArg, ... ]=>[ :deps ], :$@=>{ :arg0=>'val0', :arg1=>val1 ...}  do   end
+

data/lib/rakish/ArchiveBuilder.rb

@@ -100,7 +100,7 @@ module Rakish
         def addZipContents(archivePath,*filters)
 
             if(filters.length < 1)
-               filters=['*'];
+               filters=['**/*'];
             end
             entry = {};
             entry[:destDir]=('.');
@@ -111,7 +111,6 @@ module Rakish
 
         def loadTempDir(dir) # :nodoc: TODO "the "####" and '#' flag thing is messy maybe :type in entry ??
 
-
             archiveContents_.each do |entry|
 
                 # copy or extract all the files for the jar to a temporary folder
@@ -131,7 +130,6 @@ module Rakish
                     #                   but not "a/foo" or "a/b/foo"
 
                     cmd = "\"#{unzipPath}\" -q \"#{spl[0]}\" \"#{entry[:files].join("\" \"")}\" -x \"META-INF/*\" -d \"#{dir}\"";
-
                     execLogged(cmd, :verbose=>verbose?);
 
                 else

data/lib/rakish/BuildConfig.rb

@@ -71,8 +71,8 @@ module BuildConfigModule
     # pointing to the actual libraries if not there ( windows DLL libs )
 	attr_property 	:nativeLibDir
 
-    # folder to output native object and intermediate files to
-	attr_property 	:nativeObjDir
+    # folder to output native object and intermediate files to for this module
+	attr_property 	:moduleObjDir
 
     # folder to output native binary dll and so files to
 	attr_property 	:binDir
@@ -92,10 +92,10 @@ module BuildConfigModule
 	end
 
     # folder to output native executable and dll files to.
-    # defaults to (buildDir)/bin
+    # defaults to (buildDir)/bin/(nativeConfigName)
 	def binDir
-        @binDir||=getAnyAbove(:binDir)||"#{buildDir()}/bin";
-	end
+        @binDir||=getAnyAbove(:binDir)||"#{buildDir()}/bin/#{nativeConfigName}";
+    end
 
     # folder to output native library files and link references to.
     # defaults to (buildDir)/lib
@@ -106,8 +106,8 @@ module BuildConfigModule
     # folder to output native intermedite and object files to.
     # config defaults to (buildDir)/obj
     # in a project module defaults to the value set in th (configValue)/(moduleName)
-	def nativeObjDir
-		@nativeObjDir||=getAnyAbove(:nativeObjDir)||"#{buildDir()}/obj";
+	def moduleObjDir
+		@moduleObjDir||=getAnyAbove(:moduleObjDir)||"#{buildDir()}/obj";
 	end
 
     # suffix to add to native output files
@@ -116,6 +116,13 @@ module BuildConfigModule
 		@nativeOutputSuffix||=nativeConfigName();
 	end
 
+    # temporary include directory built for compiling
+    # where generated include files or links to the project sources
+    # are created
+	def buildIncludeDir
+        @buildIncludeDir ||= getInherited(:buildIncludeDir)||"#{@buildDir}/include"
+	end
+
 	attr_accessor 	:verbose
 
 	def verbose?
@@ -200,12 +207,11 @@ class GlobalConfig < BuildConfig
 
 			# set defaults if not set above
 			@nativeLibDir ||= "#{@buildDir}/lib"
-			@binDir ||= "#{@buildDir}/bin"
-			@INCDIR ||= "#{@buildDir}/include"
 
 			# get config from command line
 			cfg.nativeConfigName ||= ENV['nativeConfigName'];
 			cfg.nativeConfigName ||= defaultConfig
+			binDir();
 
 		end
 

data/lib/rakish/CppProjects.rb

@@ -1,6 +1,8 @@
 myPath = File.dirname(File.expand_path(__FILE__));
 require "#{myPath}/RakishProject.rb"
 
+include Rake::DSL
+
 module Rakish
 
     # :nodoc: legacy only looked at in the
@@ -14,54 +16,36 @@ module CTools
 	include Rakish::Logger
 	include Rakish::Util
 
-	VALID_PLATFORMS = { 
-		:Win32 => {
-			:module => "#{Rakish::MAKEDIR}/WindowsCppTools.rb",
-		},
-		:Win64 => {
-			:module => "#{Rakish::MAKEDIR}/WindowsCppTools.rb",
-		},
-		:iOS => {
-			:module => "#{Rakish::MAKEDIR}/IOSCTools.rb",
-		},
-		:Linux32 => {
-			:module => "#{Rakish::MAKEDIR}/GCCCTools.rb",
-		},
-		:Linux64 => {
-			:module => "#{Rakish::MAKEDIR}/GCCCTools.rb",
-		},
-	};
-
 	# parses and validates an unknown string configuration name 
 	# of the format [TargetPlatform]-[Compiler]-(items specific to compiler type)
 	# and loads if possible an instance of a set of configured "CTools" 
 	# for the specified "nativeConfigName" configuration.
-	def self.loadConfiguredTools(strCfg)
-		
-		splitcfgs = strCfg.split('-');
-		platform  = VALID_PLATFORMS[splitcfgs[0].to_sym];
-			
-		unless platform
-			raise InvalidConfigError.new(strCfg, "unrecognized platform \"#{splitcfgs[0]}\"");
-		end
-		factory = LoadableModule.load(platform[:module]);
-		factory.getConfiguredTools(splitcfgs,strCfg);
 
+	def self.loadToolchain(moduleName,configName,args={})
+        begin
+            require moduleName;
+            moduleName = moduleName.pathmap('%n');
+            mod = Rakish.const_get(moduleName.to_s);
+            mod.getConfiguredTools(configName,args);
+        rescue
+            log.debug("unrecognized toolchain module \"#{moduleName}\"");
+        end
 	end
 
-	def writeLinkref(cfg,baseName,targetName)
-					
+	def writeLinkref(cfg,baseName,targetName)					
 		defpath = "#{cfg.nativeLibDir}/#{baseName}-#{cfg.nativeConfigName}.linkref"
-		reltarget = getRelativePath(targetName,cfg.nativeLibDir);
+        reltarget = getRelativePath(targetName,cfg.nativeLibDir);
 		File.open(defpath,'w') do |f|
 			f.puts("libs = [\'#{reltarget}\']")
 		end
 	end
 
 	# real bodge for now need to clean this up somehow.
-	def loadLinkref(libdir,cfg,baseName)
-		cd libdir, :verbose=>false do
-			libdef = File.expand_path("#{baseName}-#{cfg}.linkref");
+	def loadLinkref(libdir,config,cfgName,baseName)
+        # log.debug("load linkref for #{baseName} from #{libdir} there ? #{File.directory?(libdir)}");
+
+        cd libdir, :verbose=>false do
+			libdef = File.expand_path("#{baseName}-#{cfgName}.linkref");
 			begin
 				libpaths=nil
 				libs=nil
@@ -78,7 +62,7 @@ module CTools
 				end
 				return({libpaths: libpaths, libs: libs});
 			rescue => e
-				log.debug("failed to load #{libdef} #{e}");
+				log.debug("#{config.projectFile},failed to load #{libdef} #{e}");
 			end
 			{}
 		end
@@ -106,16 +90,18 @@ module CTools
 		end
 				
         # only touch file if new file differs from old one
-		if(textFilesDiffer(outName,tempfile)) 
+
+		if(!File.exists?(outName) || textFilesDiffer(outName,tempfile))
             # @#$#@$#@ messed up. set time of new file ahead by one second.
             # seems rake time resolution is low enough that the comparison often says 
             # times are equal between depends files and depends.rb.
-            mv(tempfile, outName, :force=>true);
+            FileUtils.mv(tempfile, outName, :force=>true);
             time = Time.at(Time.new.to_f + 1.0);
             File.utime(time,time,outName);
+            task.config.dependencyFilesUpdated = true;
 		else
-			rm(tempfile, :force=>true);
-		end	
+			FileUtils.rm(tempfile, :force=>true);
+		end
 	end
 
 
@@ -163,7 +149,7 @@ module CTools
     def createCompileTasks(files,cfg)                
         # format object files name
 	                                 
-        mapstr = "#{cfg.nativeObjectPath()}/%n#{OBJEXT()}";
+        mapstr = "#{cfg.moduleConfiguredObjDir()}/%n#{objExt()}";
 
         objs=FileList[];
         files.each do |source|
@@ -175,33 +161,34 @@ module CTools
     end
 	
 	def initCompileTask(cfg)
-		cfg.project.addCleanFiles("#{cfg.nativeObjectPath()}/*#{OBJEXT()}");
+		cfg.project.addCleanFiles("#{cfg.moduleConfiguredObjDir()}/*#{objExt()}");
 		Rake::Task.define_task :compile => [:includes,
-											cfg.nativeObjectPath(),
+											cfg.moduleConfiguredObjDir(),
 											:depends]
 	end	
 
-	def initDependsTask(cfg) # :nodoc:		
+ 	def initDependsTask(cfg) # :nodoc:
                
 		# create dependencies file by concatenating all .raked files				
-		tsk = file "#{cfg.nativeObjectPath()}/depends.rb" => [ :includes, cfg.nativeObjectPath() ] do |t|
-			cd(cfg.nativeObjectPath(),:verbose=>false) do
+		tsk = file "#{cfg.moduleConfiguredObjDir()}/depends.rb" => [ :includes, cfg.moduleConfiguredObjDir() ] do |t|
+			cd(cfg.moduleConfiguredObjDir(),:verbose=>false) do
 				File.open('depends.rb','w') do |out|
 					out.puts("# puts \"loading #{t.name}\"");
 				end
 				t.prerequisites.each do |dep|
 					next unless (dep.pathmap('%x') == '.raked')
-					system "cat \'#{dep}\' >> depends.rb"
+					next unless (File.exists?(dep))
+ 					system "cat \'#{dep}\' >> depends.rb"
 				end
 			end
 		end
 		# build and import the consolidated dependencies file
-		task :depends => [ "#{cfg.nativeObjectPath()}/depends.rb" ] do |t|
-			load("#{cfg.nativeObjectPath()}/depends.rb")
+		task :depends => [ "#{cfg.moduleConfiguredObjDir()}/depends.rb" ] do |t|
+			load("#{cfg.moduleConfiguredObjDir()}/depends.rb")
 		end		
 		task :cleandepends do
-			depname = "#{cfg.nativeObjectPath()}/depends.rb";
-			deleteFiles("#{cfg.nativeObjectPath()}/*.raked");
+			depname = "#{cfg.moduleConfiguredObjDir()}/depends.rb";
+			deleteFiles("#{cfg.moduleConfiguredObjDir()}/*.raked");
 
 			# if there is no task defined for the 'raked' file then create a dummy
 			# that dos nothing so the prerequisites resolve - this is the case where the
@@ -237,6 +224,10 @@ module CppProjectConfig
 	attr_reader :targetType
 	attr_reader :thirdPartyLibs
 
+	def cpp
+	    self
+	end
+
 #	attr_reader	:cflags  had this in old one for added VC flags.
 
  	addInitBlock do |pnt,opts|
@@ -251,12 +242,34 @@ module CppProjectConfig
 		end
  	end
 
+   # set toolchain for a cpp configuration
+   # if ther is only one non hash argument and it is a module the module is used as a pre-loaded toolchain
+   # otherwise the first argument is considered a module name of the tools module to load
+   # the second argument is the configuration name assigned to it, and subsequent hash argument are the 
+   # initialization arguments for creating the toolchain instance.
+   #
+    def setToolchain(ctools,*args)
+        if(ctools.is_a?(CTools)) 
+		@ctools = ctools;
+	else	
+		configName = args[0];
+		hash = args.last;		
+		hash = {} unless hash.is_a?(Hash)
+		@ctools = CTools.loadToolchain(ctools,configName,hash);
+	end
+    end
+
+    # temporary include directory built for compiling
+    # where generated include files or links to the project sources
+    # are created
 	def INCDIR
 		@INCDIR||=getAnyAbove(:INCDIR)||"#{buildDir()}/include";
 	end
+
 	def binDir
-		@binDir||=getAnyAbove(:binDir)||"#{buildDir()}/bin";
+		@binDir||=(getAnyAbove(:binDir)||"#{buildDir()}/bin/#{nativeConfigName}");
 	end
+
 	def nativeLibDir
 		@nativeLibDir||=getAnyAbove(:nativeLibDir)||"#{buildDir()}/lib";
 	end
@@ -348,6 +361,7 @@ module CppProjectConfig
 
 end
 
+
 module CppProjectModule
     include CppProjectConfig
 
@@ -358,6 +372,15 @@ module CppProjectModule
         @cppCompileTaskInitialized = false;
     end
 
+    def addCFlags(flags)
+        @cflags||=[];
+        @cflags << flags;
+    end
+
+    def cflags
+        @cflags||[];
+    end
+
 	VCProjBuildAction_ = lambda do |t|
         require "#{Rakish::MAKEDIR}/VcprojBuilder.rb"
         VcprojBuilder.onVcprojTask(t.config);
@@ -370,9 +393,9 @@ module CppProjectModule
 
 	LinkIncludeAction_ = lambda do |t|
 		config = t.config;
-		# if(config.verbose?)
+	    if(config.verbose?)
 			puts "generating #{t.name} from #{t.source}"
-		# end
+        end
 
 		destfile = t.name;
 		srcpath = config.getRelativePath(t.source,File.dirname(t.name));
@@ -383,23 +406,47 @@ module CppProjectModule
 		end
 	end
 
+	def outputsNativeLibrary
+		true
+	end
+	
 	# called after initializers on all projects and before rake
 	# starts executing tasks
 
 	def doCppPreBuild()
-        addIncludePaths( [ nativeObjectPath(),INCDIR() ] );
-        @cppBuildConfig = resolveConfiguration(nativeConfigName());
-        resolveConfiguredTasks();
-        if(@projectId)
-            ensureDirectoryTask(vcprojDir);
-            tsk = task :vcproj=>[vcprojDir], &VCProjBuildAction_;
-            tsk.config = self;
-            export(:vcproj);
-
-            tsk = task :vcprojclean, &VCProjCleanAction_;
-            tsk.config = self;
-            export(:vcprojclean);
-        end
+		addIncludePaths( [ moduleConfiguredObjDir(),buildIncludeDir() ] );
+		@cppBuildConfig = resolveConfiguration(nativeConfigName());
+		resolveConfiguredTasks();
+		if(@projectId)
+			ensureDirectoryTask(vcprojDir);
+			tsk = task :vcproj=>[vcprojDir], &VCProjBuildAction_;
+			tsk.config = self;
+			export(:vcproj);
+			tsk = task :vcprojclean, &VCProjCleanAction_;
+			tsk.config = self;
+			export(:vcprojclean);
+		end
+	end
+
+	def self.doUpdateDepends(t)
+		cfg = t.config;
+		tools = cfg.ctools
+		objs = t.sources;
+		cd(cfg.moduleConfiguredObjDir(),:verbose=>false) do
+			File.open('depends.rb','w') do |out|
+				out.puts("# puts \"loading #{t.name}\"");
+			end
+			objs.each do |obj|
+			 	raked = obj.pathmap('%n.raked');
+				if(File.exists?(raked))
+					system "cat \'#{raked}\' >> depends.rb"
+			    	end
+			end
+		end
+	end
+
+	UpdateDependsAction_ = lambda do |t|
+        	doUpdateDepends(t) if(t.config.dependencyFilesUpdated)
 	end
 
 	def resolveConfiguredTasks()
@@ -409,13 +456,19 @@ module CppProjectModule
 
         objs = tools.createCompileTasks(getSourceFiles(),cfg);
 
-		unless tsk = Rake.application.lookup("#{@myNamespace}:compile") && @cppCompileTaskInitialized
+		unless compileTsk = Rake.application.lookup("#{@myNamespace}:compile") && @cppCompileTaskInitialized
 			cppCompileTaskInitialized = true;
-			tsk = tools.initCompileTask(self);
+			compileTsk = tools.initCompileTask(self);
 		end
-		tsk.enhance(objs)
+		compileTsk.enhance(objs)
+
+
+		updateDepTsk = Rake::Task.define_unique_task &UpdateDependsAction_;
+		updateDepTsk.config = cfg;
+		updateDepTsk.sources = objs;
+		compileTsk.enhance(updateDepTsk);
 
- 		unless tsk = Rake.application.lookup("#{@nativeObjDir}/depends.rb")
+		unless tsk = Rake.application.lookup("#{@moduleObjDir}/depends.rb")
             tsk = tools.initDependsTask(self)
  		end
 
@@ -427,15 +480,15 @@ module CppProjectModule
 		tsk.enhance(raked);
 
 		@objs = objs;
-		ensureDirectoryTask(nativeObjectPath());
+		ensureDirectoryTask(moduleConfiguredObjDir());
 
 		## link tasks
-		tsk = tools.createLinkTask(objs,cfg);
+		tsk = tools.createLinkTask(objs,@cppBuildConfig);
 		if(tsk)
-			ensureDirectoryTask(cfg.nativeLibDir);
+			outdir = tsk[:linkTask].name.pathmap('%d');
+			ensureDirectoryTask(outdir);
 			ensureDirectoryTask(cfg.binDir);
-
-			task :build => [ :compile, cfg.nativeLibDir, cfg.binDir, tsk ].flatten
+			task :build => [ :compile, outdir, cfg.binDir, tsk[:setupTasks], tsk[:linkTask] ].flatten
 
 		end
 
@@ -447,7 +500,7 @@ module CppProjectModule
 	# Also adds removal of output files or links to task ':cleanincludes'
 	#
 	# <b>named args:</b>
-	#   :destdir => destination directory to place output files, defaults to INCDIR/myPackage
+	#   :destdir => destination directory to place output files, defaults to buildIncludeDir/myPackage
 	#
 	def addPublicIncludes(*args)
 
@@ -458,7 +511,7 @@ module CppProjectModule
 		unless(destdir = opts[:destdir])
 			destdir = myPackage;
 		end
-		destdir = File.join(INCDIR(),destdir || '');
+		destdir = File.join(buildIncludeDir(),destdir || '');
 		ensureDirectoryTask(destdir);
 		flist = createCopyTasks(destdir,files,:config => self,&LinkIncludeAction_)
 		task :includes => flist
@@ -495,13 +548,12 @@ module CppProjectModule
 	end
 
 
-	# define a configurator to load a configuration for a specific ( string )
-	# configruation
-
-	def setupCppConfig(args={}, &b)
+	# define a configurator for the linker configuration
+	def setupLinkConfig(args={}, &b)
 		@targetType = args[:targetType];
 		@cppConfigurator_ = b;
 	end
+    alias :setupCppConfig :setupLinkConfig
 
 	class TargetConfig < BuildConfig
 		include CppProjectConfig
@@ -511,6 +563,7 @@ module CppProjectModule
 		attr_reader 	:libpaths
 		attr_reader 	:libs
 		attr_accessor   :targetName
+		attr_accessor   :dependencyFilesUpdated
 
 		def initialize(pnt, cfgName, tools)
 			super(pnt);
@@ -519,6 +572,7 @@ module CppProjectModule
 			@configName = cfgName;
 			@ctools = tools;
 			@targetBaseName = pnt.moduleName;
+			# @manifestFile = pnt.manifestFile;
 			tools.ensureConfigOptions(self);
 		end
 
@@ -534,28 +588,51 @@ module CppProjectModule
 		end
 
 		def targetName
-			@targetName||="#{targetBaseName}-#{configName}";
+			@targetName||="#{targetBaseName}";
 		end
-
-		def dependencyLibs
-			libs=[]
-			project.dependencies.each do |dep|
-                # TODO: should this check for the type of project?
-                if(dep.nativeLibDir != nil)
-                    ldef = ctools.loadLinkref(dep.nativeLibDir,configName,dep.moduleName);
-                    if(ldef != nil)
-                        deflibs = ldef[:libs];
-                        libs += deflibs if deflibs;
+        
+        # get list of libraries built by and exported by dependency projects
+        # in dependency order from most dependent to least, and follow with
+        # libraries added in the current project
+        # TODO: dependency order not proper id it needs to sort them by "registration order"
+		def getOrderedLibs
+
+        	libs=[]
+            libs << @libs;            
+
+			project.dependencies.reverse_each do |dep|
+				if(defined? dep.outputsNativeLibrary)
+					if(dep.nativeLibDir)
+						ldef = ctools.loadLinkref(dep.nativeLibDir,self,configName,dep.moduleName);
+						if(ldef != nil)
+							deflibs = ldef[:libs];
+							libs += deflibs if deflibs;
+						end
                     end
 				end
 			end
-			if(thirdPartyLibs)
+
+            # add user specified lobraries after all dependency libraries.
+
+            if(thirdPartyLibs)
 				thirdPartyLibs.flatten.each do |tpl|
-					ldef = ctools.loadLinkref("#{thirdPartyPath}/lib",configName,tpl);
+					libpath = NIL;
+					if(File.path_is_absolute?(tpl))
+					    libpath = tpl.pathmap('%d');
+					    tpl = tpl.pathmap('%f');
+					else
+					    puts("adding lib #{tpl}");
+                        libpath = "#{thirdPartyPath}/lib";
+                        unless(File.directory?(libpath))
+                            libs << tpl;
+                            next;
+                        end
+					end					
+				    ldef = ctools.loadLinkref(libpath,self,configName,tpl);
                     if(ldef != nil)
                         deflibs = ldef[:libs];
                         libs += deflibs if deflibs;
-					end
+				    end
 				end
 			end
 			libs
@@ -564,6 +641,14 @@ module CppProjectModule
 		def objectFiles
 			[]
 		end
+
+        def setManifest(file)
+            @manifestFile = File.expand_path(file);
+        end
+        def manifestFile
+            @manifestFile
+        end
+
 	end
 
 	# for a specifc named configuraton, resolves the configration and loads it with the
@@ -574,8 +659,7 @@ module CppProjectModule
 		if(ret = (@resolvedConfigs||={})[config])
 			return ret;
 		end
-
-		tools = CTools.loadConfiguredTools(config);
+        tools = ctools;
 		ret = @resolvedConfigs[config] = TargetConfig.new(self,config,tools);
 
 		if(defined? @cppConfigurator_)
@@ -588,8 +672,10 @@ end
 
 class BuildConfig
    # ensure added global project task dependencies
+    task :clean
     task :autogen 		=> [ :cleandepends, :includes, :vcproj ];
     task :cleanautogen 	=> [ :cleanincludes, :cleandepends, :vcprojclean ];
+    task :cleanAll      => [ :clean, :cleanautogen ];
     task :compile 		=> [ :includes ];
     task :depends		=> [ :includes ];
     task :build 		=> [ :compile ];