bake-toolkit 1.0.2 → 1.0.3

data/bin/createVSProjects

@@ -0,0 +1,208 @@
+#!/usr/bin/env ruby
+puts "Initializing..."
+
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+
+require "securerandom"
+require "vs/options"
+
+module Cxxproject
+
+PATH = 0
+UUID = 1
+
+def self.writeProjects(f,projects)
+    projects.each do |k,v|
+      f.puts "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"" + k + "\", \"" + v[PATH] + "/" + k + ".vcxproj\", \"{" + v[UUID] + "}\""
+      f.puts "EndProject"
+	end
+end
+
+def self.writeCfg(f,projects)
+  projects.each do |k,v|
+    f.puts "		{" + v[UUID] + "}.bake|Win32.ActiveCfg = bake|Win32"
+	f.puts "		{" + v[UUID] + "}.bake|Win32.Build.0 = bake|Win32"
+  end
+end
+
+@options = VsOptions.new(ARGV)
+@options.parse_options
+
+version = "error" 
+toolset = "error"
+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)
+
+puts "Scanning for bake projects...."
+
+projects = {}
+@options.roots.each do |r|
+  Dir.glob(r + "/*/Project.meta").each do |m|
+    projects[File.basename(File.dirname(m))] = [File.dirname(m), SecureRandom.uuid.upcase]
+  end
+end  
+
+#if not @options.rewriteProjects
+#  projects.delete_if { |k,v| File.exist?(v[PATH]+"/"+k+".vcxproj") or File.exist?(v[PATH]+"/"+k+".vcxproj.filters") }
+#end
+
+@options.rewriteSolution = true unless File.exist?(slnFilename)
+
+slnText = ""
+if not @options.rewriteSolution
+  pattern = /Project.*[\\\/]([^\\\/]*)\.vcxproj/
+  slnText=File.open(slnFilename).read
+  slnText.gsub!(/\r\n?/, "\n")
+  slnText.each_line do |line|
+    x = line.match(pattern)
+    projects.delete(x[1]) if x
+  end
+end  
+
+if projects.length == 0
+  puts "Nothing to do."
+  exit(0)
+end
+
+if not @options.rewriteSolution
+
+  puts "Adding new projects to " + slnFilename + "... "    
+  File.open(slnFilename, 'w') do |f|  
+
+    addedProjects = false
+    slnText.each_line do |line|
+      if line.include?"Project("
+        writeProjects(f,projects)
+	    addedProjects = true
+      end
+	
+	  f.puts line
+
+      if line.include?"postSolution"
+        writeCfg(f,projects)
+      end
+	end
+
+  end
+  
+else
+
+  puts "Rewriting " + slnFilename + "... "  
+  File.open(slnFilename, 'w') do |f|  
+    f.puts "Microsoft Visual Studio Solution File, Format Version " + version
+
+	writeProjects(f,projects)
+
+    f.puts "Global"
+    f.puts "	GlobalSection(SolutionConfigurationPlatforms) = preSolution"
+    f.puts "		bake|Win32 = bake|Win32"
+    f.puts "	EndGlobalSection"
+    f.puts "	GlobalSection(ProjectConfigurationPlatforms) = postSolution"
+    
+	writeCfg(f,projects)
+	
+    f.puts "	EndGlobalSection"
+    f.puts "	GlobalSection(SolutionProperties) = preSolution"
+    f.puts "		HideSolutionNode = FALSE"
+    f.puts "	EndGlobalSection"
+    f.puts "EndGlobal"
+  end
+  
+end
+
+projects.each do |k,v|
+
+  filename = v[PATH] + "/" + k + ".vcxproj"
+  puts "Writing " + filename + "... "
+  File.open(filename, 'w') do |f|  
+  
+    f.puts "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+    f.puts "<Project DefaultTargets=\"Build\" ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">"
+    f.puts "  <ItemGroup Label=\"ProjectConfigurations\">"
+    f.puts "    <ProjectConfiguration Include=\"bake|Win32\">"
+    f.puts "      <Configuration>bake</Configuration>"
+    f.puts "      <Platform>Win32</Platform>"
+    f.puts "    </ProjectConfiguration>"
+    f.puts "  </ItemGroup>"
+    f.puts "  <PropertyGroup Label=\"Globals\">"
+    f.puts "    <Keyword>MakeFileProj</Keyword>"
+    f.puts "    <ProjectGuid>{" + v[UUID] + "}</ProjectGuid>"
+    f.puts "  </PropertyGroup>"
+    f.puts "  <Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />"
+    f.puts "  <PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='bake|Win32'\" Label=\"Configuration\">"
+    f.puts "    <ConfigurationType>Makefile</ConfigurationType>"
+    f.puts "    <PlatformToolset>" +  toolset + "</PlatformToolset>"
+    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("**/*")
+	  files.each do |item|
+	    if (item[0..5] != ".bake") and not File.directory?(item)
+          f.puts "    <None Include=\"" + item + "\" />"	
+		end
+	  end
+	end
+    f.puts "  </ItemGroup>"
+	
+    f.puts "  <Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.targets\" />"
+    f.puts "</Project>"
+  
+  end
+
+  filename = filename + ".filters"
+  puts "Writing " + filename + "... "  
+  File.open(filename, 'w') do |f|  
+
+    f.puts "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+    f.puts "<Project ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">"
+
+    fileList = []    
+	f.puts "  <ItemGroup>"
+	Dir.chdir(v[PATH]) do
+	  files = Dir.glob("**/*")
+	  files.each do |item|
+	    if (item[0..5] != ".bake")
+          if (File.directory? item)
+            f.puts "    <Filter Include=\"" + item.gsub(/\//,"\\") + "\" />"
+		  else
+		    fileList << item
+		  end
+		end
+	  end
+	end
+    f.puts "  </ItemGroup>"
+  
+    f.puts "  <ItemGroup>"
+	fileList.each do |i|
+	  if File.dirname(i) != "."
+        f.puts "    <None Include=\"" + i + "\">"
+        f.puts "      <Filter>" + File.dirname(i).gsub(/\//,"\\") + "</Filter>"
+        f.puts "    </None>"
+	  else
+        f.puts "    <None Include=\"" + i + "\" />"
+	  end
+	end
+    f.puts "  </ItemGroup>"
+	
+    f.puts "</Project>"
+  
+  end  
+  
+end
+
+puts "Finished."
+
+end

data/lib/bake/version.rb

@@ -1,7 +1,7 @@
 module Cxxproject
   class Version
     def self.bake
-      "1.0.2"
+      "1.0.3"
     end
   end
     

data/lib/tocxx.rb

@@ -671,13 +671,19 @@ module Cxxproject
               if not File.exists?(@startupFilename)
                 Dir.chdir(startBB.project_dir) do
                   theFile = Dir.glob("**/#{@startupFilename}")
+                  theFile.map! {|tf| startBB.project_dir + "/" + tf}
                 end
                 if theFile.length == 0
                   Printer.printError "Error: #{@startupFilename} not found in project #{@options.project}"
                   ExitHelper.exit(1)
                 end
               else
-                theFile << @startupFilename
+                if File.is_absolute?(@startupFilename)
+                  theFile << @startupFilename
+                else
+                  theFile << startBB.project_dir + "/" + @startupFilename
+                end
+                  
               end
               
               exclude_files = []
@@ -692,7 +698,7 @@ module Cxxproject
               
               source_files = c.sources.dup
               c.source_patterns.each do |p|
-                Dir.glob(p).each {|f| source_files << f}
+                Dir.glob(p).each {|f| source_files << (startBB.project_dir + "/" + f)} 
               end
               
               theFile.delete_if { |f| source_files.all? {|e| e!=f} }

data/lib/vs/options.rb

@@ -0,0 +1,67 @@
+require "option/parser"
+
+module Cxxproject
+
+  class VsOptions < Parser
+    attr_accessor :version, :roots, :rewriteSolution
+
+    def initialize(argv)
+      super(argv)
+      
+      @version = "2012"
+      @rewriteSolution = false
+      @roots = []
+            
+      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("-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 " --rewrite_solution  Rewrites existing solution files instead of appending new projects."
+      puts " -h                  Print this help."
+    end
+  
+    def parse_options()
+      parse_internal(false)
+      @roots << Dir.pwd if @roots.length == 0
+    end
+    
+    def check_valid_dir(dir)
+     if not File.exists?(dir)
+        puts "Error: Directory #{dir} does not exist"
+        ExitHelper.exit(1)
+      end
+      if not File.directory?(dir)
+        puts "Error: #{dir} is not a directory"
+        ExitHelper.exit(1)
+      end      
+    end    
+    
+    def set_version(v)
+	  if v != "2010" and v != "2012"
+	    puts "Error: version mut be '2010' or '2012'"
+	  end
+      ExitHelper.exit(1)
+      @version = v
+    end
+    
+    def set_rewrite_solution
+      @rewriteSolution = true
+    end
+    
+    def set_root(dir)
+      check_valid_dir(dir)
+      r = File.expand_path(dir.gsub(/[\\]/,'/'))
+      @roots << r if not @roots.include?r
+    end
+        
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: bake-toolkit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Alexander Schaal
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-07 00:00:00 Z
+date: 2013-01-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cxxproject
@@ -50,6 +50,7 @@ email: alexander.schaal@esrlabs.com
 executables: 
 - bake
 - bakery
+- createVSProjects
 extensions: []
 
 extra_rdoc_files: []
@@ -73,10 +74,12 @@ files:
 - lib/bakery/options.rb
 - lib/option/parser.rb
 - lib/tocxx.rb
+- lib/vs/options.rb
 - Rakefile.rb
 - license.txt
 - bin/bake
 - bin/bakery
+- bin/createVSProjects
 homepage: http://www.esrlabs.com
 licenses: []