bake-toolkit 1.0.19 → 1.0.20

data/bin/createVSProjects

@@ -44,7 +44,7 @@ puts "Scanning for bake projects...."
 
 projects = {}
 @options.roots.each do |r|
-  Dir.glob(r + "/*/Project.meta").each do |m|
+  Dir.glob(r + "/**/Project.meta").each do |m|
     projects[File.basename(File.dirname(m))] = [File.dirname(m), SecureRandom.uuid.upcase]
   end
 end  

data/lib/bake/options.rb

@@ -35,7 +35,7 @@ module Cxxproject
       @socket = 0
       @include_filter = []
       @exclude_filter = []
-      @def_root = nil
+      @def_roots = []
       @eclipse_version = ""
       @alias_filename = ""
       
@@ -118,7 +118,7 @@ module Cxxproject
       parse_internal(false)
       set_main_dir(Dir.pwd) if @main_dir.nil?
       set_project(File.basename(@main_dir)) if @project.nil?
-      @roots << @def_root if @roots.length == 0
+      @roots = @def_roots if @roots.length == 0
       Rake::application.max_parallel_tasks = @threads
       
       if @linkOnly
@@ -170,7 +170,7 @@ module Cxxproject
     def set_main_dir(dir)
       check_valid_dir(dir)
       @main_dir = File.expand_path(dir.gsub(/[\\]/,'/'))
-      @def_root = File.dirname(@main_dir)
+      @def_roots = calc_def_roots(@main_dir)
     end
     
     def set_project(name)

data/lib/bake/util.rb

@@ -96,3 +96,30 @@ def sanitize_filename(filename)
   end
 end
 
+def searchRootsFile(dir)
+  rootsFile = dir+"/roots.bake"
+  return rootsFile if File.exist?(rootsFile)
+  
+  parent = File.dirname(dir)
+  return searchRootsFile(parent) if parent != dir
+
+  return nil
+end
+
+def calc_def_roots(dir)
+  def_roots = []
+  rootsFile = searchRootsFile(dir)
+  if (rootsFile)
+    File.open(rootsFile).each do |line|
+      line.gsub!(/[\\]/,'/')
+      if File.is_absolute?(line)
+        def_roots << line
+      else
+        def_roots << File.dirname(rootsFile) + "/" + line
+      end
+    end
+  else
+    def_roots << File.dirname(dir)
+  end
+  def_roots
+end

data/lib/bake/version.rb

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

data/lib/bakery/options.rb

@@ -19,7 +19,7 @@ module Cxxproject
       @error = false
       @roots = []
       @socket = 0
-      @def_root = nil
+      @def_root = []
             
       add_option(Option.new("-b",true)        { |x| set_collection_name(x)     })
       add_option(Option.new("-m",true)        { |x| set_collection_dir(x)     })
@@ -47,8 +47,8 @@ module Cxxproject
       parse_internal(true)
       set_collection_dir(Dir.pwd) if @collection_dir.nil?
       if @roots.length == 0
-        @roots << @def_root 
-        @roots << @collection_dir if @def_root != @collection_dir
+        @roots = @def_root 
+        @roots << @collection_dir unless @def_root.include?@collection_dir
       end
     end
     
@@ -74,7 +74,7 @@ module Cxxproject
     def set_collection_dir(dir)
       check_valid_dir(dir)
       @collection_dir = File.expand_path(dir.gsub(/[\\]/,'/'))
-      @def_root = File.dirname(@collection_dir)
+      @def_roots = calc_def_roots(@collection_dir)
     end
     
     def set_color(x)

data/lib/tocxx.rb

@@ -190,7 +190,6 @@ module Cxxproject
     end
 
     def loadProjMeta(loader, filename, configname)
-      
       @project_files << filename
       f = loader.load(filename)
 
@@ -236,19 +235,25 @@ module Cxxproject
       project2config_pending = {}
       project2config_pending[@mainProjectName] = @options.build_config
       
+      potentialProjs = []
+      @options.roots.each do |r|
+        potentialProjs.concat(Dir.glob(r+"/**/Project.meta"))
+      end
+      
+      potentialProjs.uniq!
+            
       while project2config_pending.length > 0
       
         pname_toload = project2config_pending.keys[0]
         cname_toload = project2config_pending[pname_toload]
         project2config_pending.delete(pname_toload)
         
-        
         # check if file is in more than one root
         pmeta_filenames = []
-        @options.roots.each do |r|
-          f = r + "/" + pname_toload + "/Project.meta"
-          if File.exists?(f)
-            pmeta_filenames  << f
+
+        potentialProjs.each do |pp|
+          if pp.include?(pname_toload + "/Project.meta")
+            pmeta_filenames << pp
           end
         end
 

metadata

@@ -2,7 +2,7 @@
 name: bake-toolkit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors: 
 - Alexander Schaal
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-21 00:00:00 Z
+date: 2013-07-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cxxproject