cxxproject 0.5.63 → 0.5.64

data/lib/cxxproject/buildingblocks/building_block.rb

@@ -151,7 +151,6 @@ module Cxxproject
       taskOfFile.enhance([d])
 
       if addDirToCleanTask
-        CLOBBER.include(complete_output_dir)
         if (@output_dir_abs)
           CLEAN.include(file)
         else

data/lib/cxxproject/buildingblocks/has_sources_mixin.rb

@@ -166,7 +166,7 @@ module Cxxproject
       end
     end
 
-    def create_object_file_tasks()
+    def calc_sources_to_build(quiet = false)
       sources_to_build = {}
 
       exclude_files = Set.new
@@ -184,8 +184,8 @@ module Cxxproject
 
       source_patterns.each do |p|
         globRes = Dir.glob(p)
-        if (globRes.length == 0)
-          Printer.printWarning "Warning: Source file pattern '#{p}' did not match to any file"
+        if (globRes.length == 0 and RakeFileUtils.verbose and not quiet)
+          Printer.printInfo "Info: Source file pattern '#{p}' did not match to any file"
         end
         globRes.each do |f|
           next if exclude_files.include?(f)
@@ -196,6 +196,11 @@ module Cxxproject
           sources_to_build[f] = t
         end
       end
+      sources_to_build      
+    end
+    
+    def create_object_file_tasks()
+      sources_to_build = calc_sources_to_build
 
       ordered = sources_to_build.keys.sort()
       dirs = []

data/lib/cxxproject/buildingblocks/source_library.rb

@@ -50,7 +50,7 @@ module Cxxproject
       @task_name = @project_dir + "/" + @task_name unless @output_dir_abs
       @task_name
     end
-
+    
     # task that will link the given object files to a static lib
     #
     def convert_to_rake()
@@ -60,52 +60,75 @@ module Cxxproject
       res = typed_file_task Rake::Task::LIBRARY, get_task_name => object_multitask do
         dir = @project_dir
         objs = @objects
-        aname = get_archive_name
-
+        aname = get_archive_name        
+          
         if @output_dir_abs
           dir = @output_dir
           prefix = File.rel_from_to_project(@project_dir, @output_dir)
           objs.map! { |m| m[prefix.length..-1] }
           aname = aname[prefix.length..-1]
         end
-
-        Dir.chdir(dir) do
-          FileUtils.rm(aname) if File.exists?(aname)
-          cmd = [archiver[:COMMAND]] # ar
-          cmd += archiver[:ARCHIVE_FLAGS].split(" ")
-          cmd += Cxxproject::Utils::flagSplit(archiver[:FLAGS]) # --all_load
-          cmd << aname # -o debug/x.exe
-          cmd += objs
-
-          if Cxxproject::Utils.old_ruby?
-            cmd.map! {|c| ((c.include?" ") ? ("\""+c+"\"") : c )}
-
-            cmdLine = cmd.join(" ")
-            if cmdLine.length > 8000
-              inputName = aname+".tmp"
-              File.open(inputName,"wb") { |f| f.write(cmd[1..-1].join(" ")) }
-              success, consoleOutput = ProcessHelper.safeExecute() { `#{archiver[:COMMAND] + " @" + inputName}` }
+        
+        if (objs.length != 0 or not File.exist?(get_task_name))
+          Dir.chdir(dir) do
+            if File.exists?(aname)
+              FileUtils.rm(aname)
+            else 
+              d = File.dirname(aname)
+              FileUtils.mkdir_p(d)
+            end
+            
+            cmd = [archiver[:COMMAND]] # ar
+            cmd += archiver[:ARCHIVE_FLAGS].split(" ")
+            cmd += Cxxproject::Utils::flagSplit(archiver[:FLAGS]) # --all_load
+            cmd << aname # -o debug/x.exe
+            cmd += objs
+  
+            if Cxxproject::Utils.old_ruby?
+              cmd.map! {|c| ((c.include?" ") ? ("\""+c+"\"") : c )}
+  
+              cmdLine = cmd.join(" ")
+              if cmdLine.length > 8000
+                inputName = aname+".tmp"
+                File.open(inputName,"wb") { |f| f.write(cmd[1..-1].join(" ")) }
+                success, consoleOutput = ProcessHelper.safeExecute() { `#{archiver[:COMMAND] + " @" + inputName}` }
+              else
+                success, consoleOutput = ProcessHelper.safeExecute() { `#{cmd.join(" ")} 2>&1` }
+              end
             else
-              success, consoleOutput = ProcessHelper.safeExecute() { `#{cmd.join(" ")} 2>&1` }
+              rd, wr = IO.pipe
+              cmd << {
+               :err=>wr,
+               :out=>wr
+              }
+              success, consoleOutput = ProcessHelper.safeExecute() { sp = spawn(*cmd); ProcessHelper.readOutput(sp, rd, wr) }
+              cmd.pop
             end
-          else
-            rd, wr = IO.pipe
-            cmd << {
-             :err=>wr,
-             :out=>wr
-            }
-            success, consoleOutput = ProcessHelper.safeExecute() { sp = spawn(*cmd); ProcessHelper.readOutput(sp, rd, wr) }
-            cmd.pop
+  
+            process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{aname}", success)
+  
+            check_config_file()
           end
-
-          process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{aname}", success)
-
-          check_config_file()
         end
       end
       enhance_with_additional_files(res)
-      add_output_dir_dependency(get_task_name, res, true)
-
+      
+      if not Rake.application["clean"].prerequisites.include?(get_task_name+"Clean")
+        cleanTask = task get_task_name+"Clean" do
+          Dir.chdir(@project_dir) do 
+            if (calc_sources_to_build(true).length != 0 or not File.exist?(get_task_name))
+              if (@output_dir_abs)
+                FileUtils.rm_rf(file)
+              else
+                FileUtils.rm_rf(complete_output_dir)
+              end
+            end
+          end
+        end        
+        
+        Rake.application["clean"].enhance([cleanTask])
+      end
+      
       add_grouping_tasks(get_task_name)
 
       setup_rake_dependencies(res, object_multitask)

data/lib/cxxproject/utils/cleanup.rb

@@ -14,6 +14,9 @@ module Cxxproject
       task :clean do
         CLEAN.each { |fn| rm_r fn rescue nil }
       end
+      task :clobber => [:clean] do
+        CLOBBER.each { |fn| rm_r fn rescue nil }
+      end      
     end
 
   end

data/lib/cxxproject/version.rb

@@ -1,7 +1,7 @@
 module Cxxproject
   class Version
     def self.cxxproject
-      "0.5.63"
+      "0.5.64"
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.63
+  version: 0.5.64
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-04 00:00:00 Z
+date: 2013-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline