cxxproject 0.5.61 → 0.5.62

data/lib/cxxproject/buildingblocks/building_block.rb

@@ -180,8 +180,8 @@ module Cxxproject
     end
 
 
-    def process_result(cmd, console_output, error_parser, alternate)
-      hasError = ($?.success? == false)
+    def process_result(cmd, console_output, error_parser, alternate, success)
+      hasError = (success == false)
       if (cmd != @lastCommand) or (@printedCmdAlternate and hasError)
         printCmd(cmd, alternate, hasError)
       end

data/lib/cxxproject/buildingblocks/executable.rb

@@ -161,8 +161,10 @@ module Cxxproject
               strCmd = "#{cmd.join(" ") + mapfileStr + " 2>" + get_temp_filename}"
             end
             printCmd(cmdLinePrint, "Linking #{get_executable_name}", false)
-            consoleOutput = `#{strCmd}`
-            consoleOutput.concat(read_file_or_empty_string(get_temp_filename))
+            
+            success, consoleOutput, exceptionThrown = ProcessHelper.safeExecute() { `#{strCmd}` }
+            consoleOutput.concat(read_file_or_empty_string(get_temp_filename)) unless exceptionThrown
+            
           else
             rd, wr = IO.pipe
             cmdLinePrint = cmd
@@ -171,15 +173,15 @@ module Cxxproject
              :out=> @mapfile ? "#{@mapfile}" : wr, # > xy.map
              :err=>wr
             }
-            sp = spawn(*cmd)
+            
+            success, consoleOutput = ProcessHelper.safeExecute() { sp = spawn(*cmd); ProcessHelper.readOutput(sp, rd, wr) }
             cmd.pop
 
             # for console print
             cmd << " >#{@mapfile}" if @mapfile
-            consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
           end
 
-          process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil)
+          process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil, success)
 
           check_config_file()
         end

data/lib/cxxproject/buildingblocks/has_sources_mixin.rb

@@ -105,7 +105,7 @@ module Cxxproject
         parts << @name
       end
 
-      parts << sourceRel.chomp(File.extname(sourceRel))
+      parts << sourceRel.chomp(File.extname(sourceRel)).gsub(/\.\./, "##")
       File.join(parts) + (Rake::application.preproFlags ? ".i" : ".o")
     end
 
@@ -167,26 +167,15 @@ module Cxxproject
     end
 
     def create_object_file_tasks()
-
       sources_to_build = {}
 
       exclude_files = Set.new
       exclude_sources.each do |p|
-        if p.include?".."
-          Printer.printError "Error: Exclude source file pattern '#{p}' must not include '..'"
-          return nil
-        end
-
         Dir.glob(p).each {|f| exclude_files << f}
       end
       files = Set.new  # do not build the same file twice
 
       sources.each do |f|
-        if f.include?".."
-          Printer.printError "Error: Source file '#{f}' must not include '..'"
-          return nil
-        end
-
         next if exclude_files.include?(f)
         next if files.include?(f)
         files << f
@@ -194,11 +183,6 @@ module Cxxproject
       end
 
       source_patterns.each do |p|
-        if p.include?".."
-          Printer.printError "Error: Source file pattern '#{p}' must not include '..'"
-          return nil
-        end
-
         globRes = Dir.glob(p)
         if (globRes.length == 0)
           Printer.printWarning "Warning: Source file pattern '#{p}' did not match to any file"
@@ -291,9 +275,9 @@ module Cxxproject
               inputName = objectRel+".tmp"
               File.open(inputName,"wb") { |f| f.write(cmd[1..-1].join(" ")) }
               inputName = "\""+inputName+"\"" if inputName.include?" "
-              consoleOutput = `#{compiler[:COMMAND] + " @" + inputName}`
+              success, consoleOutput = ProcessHelper.safeExecute() { `#{compiler[:COMMAND] + " @" + inputName}` }
             else
-              consoleOutput = `#{cmd.join(" ")} 2>&1`
+              success, consoleOutput = ProcessHelper.safeExecute() { `#{cmd.join(" ")} 2>&1` }
             end
           else
             rd, wr = IO.pipe
@@ -301,12 +285,11 @@ module Cxxproject
              :err=>wr,
              :out=>wr
             }
-            sp = spawn(*cmd)
+            success, consoleOutput = ProcessHelper.safeExecute() { sp = spawn(*cmd); ProcessHelper.readOutput(sp, rd, wr) }
             cmd.pop
-            consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
           end
 
-          process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "Compiling #{sourceRel}")
+          process_result(cmd, consoleOutput, compiler[:ERROR_PARSER], "Compiling #{sourceRel}", success)
 
           convert_depfile(dep_file) if dep_file
 

data/lib/cxxproject/buildingblocks/source_library.rb

@@ -84,9 +84,9 @@ module Cxxproject
             if cmdLine.length > 8000
               inputName = aname+".tmp"
               File.open(inputName,"wb") { |f| f.write(cmd[1..-1].join(" ")) }
-              consoleOutput = `#{archiver[:COMMAND] + " @" + inputName}`
+              success, consoleOutput = ProcessHelper.safeExecute() { `#{archiver[:COMMAND] + " @" + inputName}` }
             else
-              consoleOutput = `#{cmd.join(" ")} 2>&1`
+              success, consoleOutput = ProcessHelper.safeExecute() { `#{cmd.join(" ")} 2>&1` }
             end
           else
             rd, wr = IO.pipe
@@ -94,13 +94,11 @@ module Cxxproject
              :err=>wr,
              :out=>wr
             }
-            sp = spawn(*cmd)
+            success, consoleOutput = ProcessHelper.safeExecute() { sp = spawn(*cmd); ProcessHelper.readOutput(sp, rd, wr) }
             cmd.pop
-
-            consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
           end
 
-          process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{aname}")
+          process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{aname}", success)
 
           check_config_file()
         end

data/lib/cxxproject/utils/process.rb

@@ -25,15 +25,14 @@ module Cxxproject
       rd.close
       
       # seems that pipe cannot handle non-ascii characters right on windows (even with correct encoding)  
-      consoleOutput.gsub!(/\xE2\x80\x98/,"`") # ���
-      consoleOutput.gsub!(/\xE2\x80\x99/,"'") # ���
+      consoleOutput.gsub!(/\xE2\x80\x98/,"`") # ÔÇÿ
+      consoleOutput.gsub!(/\xE2\x80\x99/,"'") # ÔÇÖ
       
       consoleOutput
     end
 
     def self.spawnProcess(cmdLine)
       return system(cmdLine) if Cxxproject::Utils.old_ruby?
-      
       @@pid = spawn(cmdLine)
       pid, status = Process.wait2(@@pid)
       @@pid = nil
@@ -48,6 +47,14 @@ module Cxxproject
       @@pid = nil
     end
     
+    def self.safeExecute
+      begin
+        consoleOutput = yield
+        [$?.success?, consoleOutput, false]
+      rescue Exception => e
+        [false, e.message, true]
+      end
+    end
   end
 
 end

data/lib/cxxproject/version.rb

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

metadata

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