cxxproject 0.5.70 → 0.5.71

data/lib/cxxproject/buildingblocks/has_sources_mixin.rb

@@ -5,6 +5,11 @@ require 'cxxproject/utils/printer'
 
 module Cxxproject
   module HasSources
+    
+    class << self
+      attr_accessor :print_additional_depfile_info
+    end
+
 
     attr_writer :file_dependencies
     attr_reader :incArray
@@ -300,6 +305,13 @@ module Cxxproject
           convert_depfile(dep_file) if dep_file
 
           check_config_file()
+          
+          if Cxxproject::HasSources.print_additional_depfile_info
+            File.open(dep_file+".org","w") do |f|
+              f.write(source+"\n")
+              f.write(Dir.pwd+"\n")
+            end if dep_file
+          end
         end
       end
       enhance_with_additional_files(res)
@@ -349,6 +361,8 @@ module Cxxproject
             puts "Original output:"
             puts console_output
           end
+        else
+          puts console_output # fallback
         end
       end
       ret

data/lib/cxxproject/toolchain/clang.rb

@@ -2,6 +2,7 @@ require 'cxxproject/utils/utils'
 require 'cxxproject/toolchain/provider'
 require 'cxxproject/errorparser/error_parser'
 require 'cxxproject/errorparser/gcc_compiler_error_parser'
+require 'cxxproject/errorparser/gcc_linker_error_parser'
 
 module Cxxproject
   module Toolchain
@@ -15,7 +16,7 @@ module Cxxproject
       :OBJECT_FILE_FLAG => "-o",
       :INCLUDE_PATH_FLAG => "-I",
       :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "-MMD -MF ", # empty space at the end is important!
+      :DEP_FLAGS => "-MD -MF ", # empty space at the end is important!
       :ERROR_PARSER => gccCompilerErrorParser
     })
 
@@ -28,6 +29,7 @@ module Cxxproject
 
     CLANG_CHAIN[:ARCHIVER][:COMMAND] = "ar"
     CLANG_CHAIN[:ARCHIVER][:ARCHIVE_FLAGS] = "r"
+    CLANG_CHAIN[:ARCHIVER][:ERROR_PARSER] = gccCompilerErrorParser
 
     CLANG_CHAIN[:LINKER][:COMMAND] = "llvm-g++"
     CLANG_CHAIN[:LINKER][:SCRIPT] = "-T"
@@ -35,5 +37,7 @@ module Cxxproject
     CLANG_CHAIN[:LINKER][:EXE_FLAG] = "-o"
     CLANG_CHAIN[:LINKER][:LIB_FLAG] = "-l"
     CLANG_CHAIN[:LINKER][:LIB_PATH_FLAG] = "-L"
+      
+    CLANG_CHAIN[:LINKER][:ERROR_PARSER] = GCCLinkerErrorParser.new      
   end
 end

data/lib/cxxproject/toolchain/diab.rb

@@ -15,7 +15,7 @@ module Cxxproject
       :OBJECT_FILE_FLAG => "-o ",
       :INCLUDE_PATH_FLAG => "-I",
       :COMPILE_FLAGS => "-c",
-      :DEP_FLAGS => "-Xmake-dependency=6 -Xmake-dependency-savefile=",
+      :DEP_FLAGS => "-Xmake-dependency=5 -Xmake-dependency-savefile=",
       :DEP_FLAGS_SPACE => false,
       :PREPRO_FLAGS => "-P"
     })

data/lib/cxxproject/toolchain/gcc.rb

@@ -15,7 +15,7 @@ module Cxxproject
       :OBJECT_FILE_FLAG => "-o ",
       :INCLUDE_PATH_FLAG => "-I",
       :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "-MMD -MF",
+      :DEP_FLAGS => "-MD -MF",
       :DEP_FLAGS_SPACE => true,
       :PREPRO_FLAGS => "-E -P"
     })

data/lib/cxxproject/utils/process.rb

@@ -24,15 +24,8 @@ module Cxxproject
       Process.wait(sp)
       rd.close
       
-      # seems that pipe cannot handle non-ascii characters right on windows (even with correct encoding)  
-      
-      # seems not to work anymore with Ruby 2.0:
-      # consoleOutput.gsub!(/\xE2\x80\x98/,"`") # ÔÇÿ
-      # consoleOutput.gsub!(/\xE2\x80\x99/,"'") # ÔÇÖ
-      
-      # to be tested:
-      # consoleOutput.encode!('UTF-8',  :invalid => :replace, :undef => :replace, :replace => '')
-      # consoleOutput.encode!('binary', :invalid => :replace, :undef => :replace, :replace => '')
+      consoleOutput.encode!('UTF-8',  :invalid => :replace, :undef => :replace, :replace => '')
+      consoleOutput.encode!('binary', :invalid => :replace, :undef => :replace, :replace => '')
       
       consoleOutput
     end

data/lib/cxxproject/version.rb

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

metadata

@@ -1,52 +1,48 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cxxproject
-version: !ruby/object:Gem::Version
-  version: 0.5.70
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 0.5.71
 platform: ruby
-authors:
+authors: 
 - oliver mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-03-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: colored
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: |2
-      Some more high level building blocks for cpp projects.
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+description: "    Some more high level building blocks for cpp projects.\n"
 email: oliver.mueller@gmail.com
-executables:
+executables: 
 - cxx
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/cxxproject.rb
+
+files: 
 - lib/cxxproject/buildingblocks/binary_library.rb
 - lib/cxxproject/buildingblocks/building_block.rb
 - lib/cxxproject/buildingblocks/command_line.rb
@@ -103,6 +99,7 @@ files:
 - lib/cxxproject/utils/utils.rb
 - lib/cxxproject/utils/valgrind.rb
 - lib/cxxproject/version.rb
+- lib/cxxproject.rb
 - lib/tools/project_wizard.rb
 - Rakefile.rb
 - spec/building_block_spec.rb
@@ -120,33 +117,38 @@ files:
 - spec/testdata/multiple_levels/libs/lib1/project.rb
 - spec/testdata/multiple_levels/libs/lib2/project.rb
 - spec/testdata/multiple_levels/mainproject/basic/project.rb
-- spec/testdata/onlyOneHeader/Rakefile.rb
 - spec/testdata/onlyOneHeader/project.rb
+- spec/testdata/onlyOneHeader/Rakefile.rb
 - spec/toolchain_spec.rb
-- lib/tools/Rakefile.rb.template
 - lib/tools/project.rb.template
+- lib/tools/Rakefile.rb.template
 - bin/cxx
 homepage: https://github.com/marcmo/cxxproject
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Cpp Support for Rake.
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4241f8b0d6b0af8bc85e0637664820575a19c7ba
-  data.tar.gz: 0464a6c1c1c93c98cb72ce16dccfba17d2d8d706
-SHA512:
-  metadata.gz: 92eaba35323b2949acf5865da5cfc964129f363f7ebc5b704bd6375eacb12623eef1b3d0aed1717f70511ab38b8ce689b23357d7da3bcc8cc37cef0dab8c4972
-  data.tar.gz: 55f0ef37e765852b49745684baa1c5dc87e89121ffb90f3af61df9fc934106a35f226a036059c5918889909ad21091b8789515ef17a9af0c4e202b1dc490d8f8