bake-toolkit 1.0.5 → 1.0.6

data/bin/bake

@@ -5,7 +5,7 @@ $timeStart = Time.now
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require 'bake/version'
 
-$:.unshift(File.dirname(__FILE__)+"/../../cxxproject_master.git/lib")
+$:.unshift(File.dirname(__FILE__)+"/../../cxxproject.git/lib")
 
 require "cxxproject/version"
 

data/bin/createVSProjects

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
-puts "Initializing..."
-
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 
 require "securerandom"
 require "vs/options"
+require 'bake/version'
+
+puts "-- bake #{Cxxproject::Version.bake}, ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}, platform #{RUBY_PLATFORM} --"
 
 module Cxxproject
 
@@ -28,15 +29,13 @@ end
 @options = VsOptions.new(ARGV)
 @options.parse_options
 
-version = "error" 
-toolset = "error"
+version = "12.00" 
+toolset = "v110"
 if @options.version == "2010"
   version = "11.00" 
   toolset = "v100"
-elsif @options.version == "2012"
-  version = "12.00" 
-  toolset = "v110"
 end
+
 	
 slnFilename = @options.roots[0] + "/" + File.basename(@options.roots[0]) + ".sln"
 appendProjects = (File.exist?(slnFilename) and @options.rewriteSolution)
@@ -141,11 +140,15 @@ projects.each do |k,v|
     f.puts "    <ConfigurationType>Makefile</ConfigurationType>"
     f.puts "    <PlatformToolset>" +  toolset + "</PlatformToolset>"
     f.puts "  </PropertyGroup>"
+    f.puts "  <PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='bake|Win32'\">"
+    f.puts "    <ExecutablePath>$(PATH)</ExecutablePath>"
+    f.puts "  </PropertyGroup>"
     f.puts "  <Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.props\" />"
     f.puts "  <ImportGroup Label=\"PropertySheets\" Condition=\"'$(Configuration)|$(Platform)'=='bake|Win32'\">"
     f.puts "    <Import Project=\"$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props\" Condition=\"exists('$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props')\" Label=\"LocalAppDataPlatform\" />"
     f.puts "  </ImportGroup>"
 	
+	
     f.puts "  <ItemGroup>"
 	Dir.chdir(v[PATH]) do
 	  files = Dir.glob("**/*")

data/lib/bake/options.rb

@@ -49,7 +49,7 @@ module Cxxproject
       add_option(Option.new("--rebuild",false)             {     set_rebuild                })
       add_option(Option.new("--prepro",false)              {     set_prepro                 })
       add_option(Option.new("--link_only",false)           {     set_linkOnly               })
-      add_option(Option.new("--print_less",false)           {    set_printLess              })
+      add_option(Option.new("--print_less",false)          {    set_printLess               })
       add_option(Option.new("--ignore_cache",false)        {     set_nocache                })
       add_option(Option.new("--threads",true)              { |x| set_threads(x)             })
       add_option(Option.new("--socket",true)               { |x| set_socket(x)              })
@@ -58,6 +58,7 @@ module Cxxproject
       add_option(Option.new("--include_filter",true)       { |x| set_include_filter(x)      })
       add_option(Option.new("--exclude_filter",true)       { |x| set_exclude_filter(x)      })
       add_option(Option.new("--show_abs_paths",false)      {     set_show_fullnames         })
+      add_option(Option.new("--visualStudio",false)        {     set_visualStudio           })
       add_option(Option.new("-h",false)                    {     usage; ExitHelper.exit(0)  })
       add_option(Option.new("--help",false)                {     usage; ExitHelper.exit(0)  })
       add_option(Option.new("--show_include_paths",false)  {     set_show_inc               })
@@ -213,6 +214,10 @@ module Cxxproject
       Rake::application.consoleOutput_fullnames = true
     end    
 
+    def set_visualStudio
+      Rake::application.consoleOutput_visualStudio = true
+    end
+        
     def set_root(dir)
       check_valid_dir(dir)
       r = File.expand_path(dir.gsub(/[\\]/,'/'))

data/lib/bake/version.rb

@@ -1,11 +1,11 @@
 module Cxxproject
   class Version
     def self.bake
-      "1.0.5"
+      "1.0.6"
     end
   end
     
-  expectedCxx = "0.5.60"
+  expectedCxx = "0.5.61"
   expectedRGen = "0.6.0"
   expectedRText = "0.2.0"
   

data/lib/vs/options.rb

@@ -14,16 +14,16 @@ module Cxxproject
             
       add_option(Option.new("--version",true)           { |x| set_version(x)            })
       add_option(Option.new("--rewrite_solution",false) {     set_rewrite_solution      })
-	  add_option(Option.new("-w",true)                  { |x| set_root(x)               })
+	    add_option(Option.new("-w",true)                  { |x| set_root(x)               })
       add_option(Option.new("-h",false)                 {     usage; ExitHelper.exit(0) })
     end
     
     def usage
       puts "\nUsage: createVSProjects [options]"
       puts " -w <root>           Add a workspace root. Default is current directory."
-	  puts "                     This Options can be used at multiple times."
-	  puts "                     Solution files will be created in the first root directory."
-	  puts " --version <year>    Visual Studio version. Currently supported: 2010 and 2012 (default)."
+	    puts "                     This option can be used at multiple times."
+	    puts "                     Solution files will be created in the first root directory."
+	    puts " --version <year>    Visual Studio version. Currently supported: 2010 and 2012 (default)."
       puts " --rewrite_solution  Rewrites existing solution files instead of appending new projects."
       puts " -h                  Print this help."
     end
@@ -46,9 +46,9 @@ module Cxxproject
     
     def set_version(v)
 	  if v != "2010" and v != "2012"
-	    puts "Error: version mut be '2010' or '2012'"
-	  end
+	    puts "Error: version must be '2010' or '2012'"
       ExitHelper.exit(1)
+	  end
       @version = v
     end
     

metadata

@@ -2,7 +2,7 @@
 name: bake-toolkit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Alexander Schaal
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-15 00:00:00 Z
+date: 2013-01-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cxxproject
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.60
+        version: 0.5.61
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency