cxxproject 0.5.74 → 0.5.75

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: faf4f189aeccaaf3a6feea85cc6554e59132ebb9
+  data.tar.gz: d17ac365b7230c6355f05b766f140afa55858b24
+SHA512:
+  metadata.gz: b1c39297b27b72298f4471933c89ee544a0b4f6fba3bf80a26fed0ad6b98d5b39004a0493bbb6b52d21aa383d10715007e5e4dc21da71613ec5d141276b67924
+  data.tar.gz: 29424d18d3ec1cbb327d09d2046e65ed7c83fdc7b199173c6794df9d043eec410d9f19744b00c503883df46a97cdc1740b8fe9cedad6833767d9cfa0d25ab6ce

data/lib/cxxproject/buildingblocks/building_block.rb

@@ -25,8 +25,8 @@ module Cxxproject
 
     attr_reader :project_dir
     attr_accessor :output_dir
+    attr_accessor :output_dir_relPath
     attr_accessor :pre_step
-    attr_reader :output_dir_abs
 
     def set_name(x)
       @name = x
@@ -55,34 +55,25 @@ module Cxxproject
 
     def set_project_dir(x)
       @project_dir = File.expand_path(x)
-      if @output_dir_abs
-        @output_dir_relPath = File.rel_from_to_project(@project_dir, @output_dir)
-      end
       self
     end
 
-    # if output dir is absolute, -L and -l is used for linker ("linux mode")
     def set_output_dir(x)
       return self if @output_dir
-
-      @output_dir = x
-      @output_dir_abs = File.is_absolute?(@output_dir)
-      if @project_dir
-        @output_dir_relPath = File.rel_from_to_project(@project_dir, @output_dir)
+      
+      if not @project_dir
+        raise "Error: set project dir before output dir!"
       end
-      self
-    end
 
-    def complete_output_dir
-      @complete_output_dir ||= calc_complete_output_dir
-    end
-
-    def calc_complete_output_dir
-      if @output_dir_abs
-        @output_dir
+      if File.is_absolute?(x)
+        @output_dir = x
+        @output_dir_relPath = File.rel_from_to_project(@project_dir, x)
       else
-        File.join(@project_dir,  @output_dir)
+        @output_dir = File.join(@project_dir,  x)
+        @output_dir_relPath = x
       end
+      
+      self
     end
 
     def initialize(name)
@@ -93,8 +84,6 @@ module Cxxproject
       @project_dir = nil
       @tcs = nil
       @output_dir = nil
-      @output_dir_abs = false
-      @complete_output_dir = nil
       @pre_step = nil
       @printedCmdAlternate = false
       @lastCommand = nil
@@ -151,11 +140,7 @@ module Cxxproject
       taskOfFile.enhance([d])
 
       if addDirToCleanTask
-        if (@output_dir_abs)
-          CLEAN.include(file)
-        else
-          CLEAN.include(complete_output_dir)
-        end
+        CLEAN.include(@output_dir)
       end
     end
 

data/lib/cxxproject/buildingblocks/executable.rb

@@ -38,23 +38,12 @@ module Cxxproject
       @exe_name = name
     end
 
-    def get_executable_name() # relative path
-      return @exe_name if @exe_name
-
-      parts = [@output_dir]
-
-      if @output_dir_abs
-        parts = [@output_dir_relPath] if @output_dir_relPath
-      end
-
-      parts << "#{@name}#{@tcs[:LINKER][:OUTPUT_ENDING]}"
-
-      @exe_name = File.join(parts)
-      @exe_name
+    def get_executable_name() # maybe relative path
+      @exe_name ||= File.join([@output_dir_relPath, "#{@name}#{@tcs[:LINKER][:OUTPUT_ENDING]}"])
     end
 
     def get_task_name() # full path
-      @project_dir + "/" + get_executable_name
+      @task_name ||= File.join([@output_dir, "#{@name}#{@tcs[:LINKER][:OUTPUT_ENDING]}"])
     end
 
     def collect_unique(array, set)
@@ -133,7 +122,6 @@ module Cxxproject
     #
     def convert_to_rake()
       object_multitask = prepare_tasks_for_objects()
-
       linker = @tcs[:LINKER]
 
       res = typed_file_task Rake::Task::EXECUTABLE, get_task_name => object_multitask do
@@ -196,6 +184,7 @@ module Cxxproject
           check_config_file()
         end
       end
+      
       res.immediate_output = true
       res.enhance(@config_files)
       res.enhance([@project_dir + "/" + @linker_script]) if @linker_script

data/lib/cxxproject/buildingblocks/has_sources_mixin.rb

@@ -103,14 +103,7 @@ module Cxxproject
     end
 
     def get_object_file(sourceRel)
-      parts = [@output_dir]
-      if @output_dir_abs
-        parts = [@output_dir_relPath] if @output_dir_relPath
-        parts << 'objects'
-        parts << @name
-      end
-
-      parts << sourceRel.chomp(File.extname(sourceRel)).gsub(/\.\./, "##")
+      parts = [@output_dir_relPath, sourceRel.chomp(File.extname(sourceRel)).gsub(/\.\./, "##")]
       File.join(parts) + (Rake::application.preproFlags ? ".i" : ".o")
     end
 
@@ -374,10 +367,6 @@ module Cxxproject
     end
 
     def prepare_tasks_for_objects
-      if (@output_dir_abs)
-        CLEAN.include(@output_dir + "/objects/" + @name)
-      end
-
       @objects = []
       t = multitask get_sources_task_name
       t.type = Rake::Task::SOURCEMULTI

data/lib/cxxproject/buildingblocks/lint.rb

@@ -20,14 +20,7 @@ module Cxxproject
     end
     
     def get_task_name()
-      return @task_name if @task_name
-
-      parts = [@output_dir]
-      parts << 'lint' if @output_dir_abs
-      parts << "#{@name}_lint"
-      @task_name = File.join(parts)
-      @task_name = @project_dir + "/" + @task_name unless @output_dir_abs
-      @task_name
+      @task_name ||= File.join([@output_dir, "#{@name}_lint"])
     end    
     
     def convert_to_rake()

data/lib/cxxproject/buildingblocks/source_library.rb

@@ -16,39 +16,16 @@ module Cxxproject
     end
 
     def complete_init()
-      if @output_dir_abs
-        add_lib_element(HasLibraries::SEARCH_PATH, File.join(@output_dir, 'libs'), true)
-        add_lib_element(HasLibraries::LIB, @name, true)
-      else
-        add_lib_element(HasLibraries::LIB_WITH_PATH, File.join(@output_dir,"lib#{@name}.a"), true)
-      end
+      add_lib_element(HasLibraries::LIB_WITH_PATH, get_archive_name, true)
       super
     end
 
     def get_archive_name() # relative path
-      return @archive_name if @archive_name
-      parts = [@output_dir]
-
-      if @output_dir_abs
-        parts = [@output_dir_relPath] if @output_dir_relPath
-        parts << 'libs'
-      end
-
-      parts << "lib#{@name}.a"
-
-      @archive_name = File.join(parts)
-      @archive_name
+      @archive_name ||= File.join([@output_dir_relPath, "lib#{@name}.a"])
     end
 
     def get_task_name() # full path
-      return @task_name if @task_name
-
-      parts = [@output_dir]
-      parts << 'libs' if @output_dir_abs
-      parts << "lib#{@name}.a"
-      @task_name = File.join(parts)
-      @task_name = @project_dir + "/" + @task_name unless @output_dir_abs
-      @task_name
+      @task_name ||= File.join([@output_dir, "lib#{@name}.a"])
     end
     
     # task that will link the given object files to a static lib
@@ -60,15 +37,8 @@ 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
-        
         if (objs.length != 0 or not File.exist?(get_task_name))
           Dir.chdir(dir) do
             if File.exists?(aname)
@@ -117,11 +87,7 @@ module Cxxproject
         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
+              FileUtils.rm_rf(@output_dir)
             end
           end
         end        

data/lib/cxxproject/ext/file.rb

@@ -12,6 +12,7 @@ class File
     end
   end
 
+  # seems both are rel or both are abs in all cases
   def self.rel_from_to_project(from,to,endWithSlash = true)
     return nil if from.nil? or to.nil?
     
@@ -25,15 +26,24 @@ class File
 	i = 0
 
 	# path letter in windows may be case different
+  toIsWindowsAbs = false
 	if toSplitted[0].length > 1 and fromSplitted[0].length > 1
       if Cxxproject::Utils.old_ruby?
-        i = 1 if toSplitted[0][1] == 58 and fromSplitted[0][1] == 58 and toSplitted[0].swapcase[0] == fromSplitted[0][0] 
+        toIsWindowsAbs = toSplitted[0][1] == 58
+        i = 1 if toIsWindowsAbs and fromSplitted[0][1] == 58 and toSplitted[0][0].downcase == fromSplitted[0][0].downcase 
       else
-        i = 1  if toSplitted[0][1] == ':' and fromSplitted[0][1] == ':' and toSplitted[0].swapcase[0] == fromSplitted[0][0]
+        toIsWindowsAbs = toSplitted[0][1] == ':'
+        i = 1  if toIsWindowsAbs and fromSplitted[0][1] == ':' and toSplitted[0][0].downcase == fromSplitted[0][0].downcase
       end	
 	end
 	
-	while i < max
+  if (toIsWindowsAbs and i==0)
+    res = to
+    res += "/" if endWithSlash 
+    return res	  
+  end
+	
+  while i < max
       break if toSplitted[i] != fromSplitted[i] 
 	  i += 1
 	end

data/lib/cxxproject/toolchain/gcc_param.rb

@@ -1,7 +1,7 @@
-module Cxxproject
-  module Toolchain
-    
-    
+module Cxxproject
+  module Toolchain
     
-  end
-end
+    
+    
+  end
+end

data/lib/cxxproject/toolchain/greenhills.rb

@@ -1,51 +1,51 @@
-require 'cxxproject/toolchain/provider'
-require 'cxxproject/utils/utils'
-require 'cxxproject/errorparser/greenhills_compiler_error_parser'
-require 'cxxproject/errorparser/greenhills_linker_error_parser'
-
-module Cxxproject
-  module Toolchain
-
-    GreenHillsChain = Provider.add("GreenHills")
-
-    GreenHillsChain[:COMPILER][:C].update({
-      :COMMAND => "cxppc",
-      :FLAGS => "",
-      :DEFINE_FLAG => "-D",
+require 'cxxproject/toolchain/provider'
+require 'cxxproject/utils/utils'
+require 'cxxproject/errorparser/greenhills_compiler_error_parser'
+require 'cxxproject/errorparser/greenhills_linker_error_parser'
+
+module Cxxproject
+  module Toolchain
+
+    GreenHillsChain = Provider.add("GreenHills")
+
+    GreenHillsChain[:COMPILER][:C].update({
+      :COMMAND => "cxppc",
+      :FLAGS => "",
+      :DEFINE_FLAG => "-D",
       :OBJECT_FILE_FLAG => "-o ",
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c",
-      :DEP_FLAGS => "-MD",
-      :DEP_FLAGS_FILENAME => false,
-      :PREPRO_FLAGS => "-P"
-    })
-
-    GreenHillsChain[:COMPILER][:CPP] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
-    GreenHillsChain[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS]
-
-    GreenHillsChain[:COMPILER][:ASM] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
-    GreenHillsChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-    GreenHillsChain[:COMPILER][:ASM][:PREPRO_FLAGS] = ""
-
-    GreenHillsChain[:ARCHIVER][:COMMAND] = "cxppc"
-    GreenHillsChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-archive -o"
-
-    GreenHillsChain[:LINKER][:COMMAND] = "cxppc" # ??
-    GreenHillsChain[:LINKER][:SCRIPT] = "-T" # -T file.ld
-    GreenHillsChain[:LINKER][:USER_LIB_FLAG] = "-l" # user lib not supported? same as lib... 
-    GreenHillsChain[:LINKER][:EXE_FLAG] = "-o"
-    GreenHillsChain[:LINKER][:LIB_FLAG] = "-l"
-    GreenHillsChain[:LINKER][:LIB_PATH_FLAG] = "-L"
-    GreenHillsChain[:LINKER][:MAP_FILE_FLAG] = "-map=" # -map=filename
-    GreenHillsChain[:LINKER][:MAP_FILE_PIPE] = false   
-    GreenHillsChain[:LINKER][:OUTPUT_ENDING] = ".elf"
-
-    GreenHillsCompilerErrorParser =                   GreenHillsCompilerErrorParser.new
-    GreenHillsChain[:COMPILER][:C][:ERROR_PARSER] =   GreenHillsCompilerErrorParser
-    GreenHillsChain[:COMPILER][:CPP][:ERROR_PARSER] = GreenHillsCompilerErrorParser
-    GreenHillsChain[:COMPILER][:ASM][:ERROR_PARSER] = GreenHillsCompilerErrorParser
-    GreenHillsChain[:ARCHIVER][:ERROR_PARSER] =       GreenHillsCompilerErrorParser
-    GreenHillsChain[:LINKER][:ERROR_PARSER] =         GreenHillsLinkerErrorParser.new
-
-  end
-end
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c",
+      :DEP_FLAGS => "-MD",
+      :DEP_FLAGS_FILENAME => false,
+      :PREPRO_FLAGS => "-P"
+    })
+
+    GreenHillsChain[:COMPILER][:CPP] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
+    GreenHillsChain[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:CPP][:SOURCE_FILE_ENDINGS]
+
+    GreenHillsChain[:COMPILER][:ASM] = Utils.deep_copy(GreenHillsChain[:COMPILER][:C])
+    GreenHillsChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    GreenHillsChain[:COMPILER][:ASM][:PREPRO_FLAGS] = ""
+
+    GreenHillsChain[:ARCHIVER][:COMMAND] = "cxppc"
+    GreenHillsChain[:ARCHIVER][:ARCHIVE_FLAGS] = "-archive -o"
+
+    GreenHillsChain[:LINKER][:COMMAND] = "cxppc" # ??
+    GreenHillsChain[:LINKER][:SCRIPT] = "-T" # -T file.ld
+    GreenHillsChain[:LINKER][:USER_LIB_FLAG] = "-l" # user lib not supported? same as lib... 
+    GreenHillsChain[:LINKER][:EXE_FLAG] = "-o"
+    GreenHillsChain[:LINKER][:LIB_FLAG] = "-l"
+    GreenHillsChain[:LINKER][:LIB_PATH_FLAG] = "-L"
+    GreenHillsChain[:LINKER][:MAP_FILE_FLAG] = "-map=" # -map=filename
+    GreenHillsChain[:LINKER][:MAP_FILE_PIPE] = false   
+    GreenHillsChain[:LINKER][:OUTPUT_ENDING] = ".elf"
+
+    GreenHillsCompilerErrorParser =                   GreenHillsCompilerErrorParser.new
+    GreenHillsChain[:COMPILER][:C][:ERROR_PARSER] =   GreenHillsCompilerErrorParser
+    GreenHillsChain[:COMPILER][:CPP][:ERROR_PARSER] = GreenHillsCompilerErrorParser
+    GreenHillsChain[:COMPILER][:ASM][:ERROR_PARSER] = GreenHillsCompilerErrorParser
+    GreenHillsChain[:ARCHIVER][:ERROR_PARSER] =       GreenHillsCompilerErrorParser
+    GreenHillsChain[:LINKER][:ERROR_PARSER] =         GreenHillsLinkerErrorParser.new
+
+  end
+end

data/lib/cxxproject/toolchain/keil.rb

@@ -1,52 +1,52 @@
-require 'cxxproject/utils/utils'
-require 'cxxproject/toolchain/provider'
-require 'cxxproject/errorparser/error_parser'
-require 'cxxproject/errorparser/keil_compiler_error_parser'
-require 'cxxproject/errorparser/keil_linker_error_parser'
-
-module Cxxproject
-  module Toolchain
+require 'cxxproject/utils/utils'
+require 'cxxproject/toolchain/provider'
+require 'cxxproject/errorparser/error_parser'
+require 'cxxproject/errorparser/keil_compiler_error_parser'
+require 'cxxproject/errorparser/keil_linker_error_parser'
 
-    KeilChain = Provider.add("Keil")
-
-    KeilChain[:COMPILER][:CPP].update({
-      :COMMAND => "armcc",
-      :DEFINE_FLAG => "-D",
+module Cxxproject
+  module Toolchain
+
+    KeilChain = Provider.add("Keil")
+
+    KeilChain[:COMPILER][:CPP].update({
+      :COMMAND => "armcc",
+      :DEFINE_FLAG => "-D",
       :OBJECT_FILE_FLAG => "-o ",
-      :INCLUDE_PATH_FLAG => "-I",
-      :COMPILE_FLAGS => "-c ",
-      :DEP_FLAGS => "--depend=",
-      :DEP_FLAGS_SPACE => false,
-      :PREPRO_FLAGS => "-E -P"
-    })
-
-    KeilChain[:COMPILER][:C] = Utils.deep_copy(KeilChain[:COMPILER][:CPP])
-    KeilChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
-
-    KeilChain[:COMPILER][:ASM] = Utils.deep_copy(KeilChain[:COMPILER][:C])
-    KeilChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
-    KeilChain[:COMPILER][:ASM][:COMMAND] = "armasm"
-    KeilChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
-      
-    KeilChain[:ARCHIVER][:COMMAND] = "armar"
-    KeilChain[:ARCHIVER][:ARCHIVE_FLAGS] = "--create"
-
-    KeilChain[:LINKER][:COMMAND] = "armlink"
-    KeilChain[:LINKER][:SCRIPT] = "--scatter"
-    KeilChain[:LINKER][:USER_LIB_FLAG] = ""
-    KeilChain[:LINKER][:EXE_FLAG] = "-o"
-    KeilChain[:LINKER][:LIB_FLAG] = ""
-    KeilChain[:LINKER][:LIB_PATH_FLAG] = "--userlibpath="
-    KeilChain[:LINKER][:MAP_FILE_FLAG] = "--map --list="
-    KeilChain[:LINKER][:MAP_FILE_PIPE] = false   
-    KeilChain[:LINKER][:LIST_MODE] = true  
-      
-    keilCompilerErrorParser =                   KeilCompilerErrorParser.new
-    KeilChain[:COMPILER][:C][:ERROR_PARSER] =   keilCompilerErrorParser
-    KeilChain[:COMPILER][:CPP][:ERROR_PARSER] = keilCompilerErrorParser
-    KeilChain[:COMPILER][:ASM][:ERROR_PARSER] = keilCompilerErrorParser
-    KeilChain[:ARCHIVER][:ERROR_PARSER] =       keilCompilerErrorParser
-    KeilChain[:LINKER][:ERROR_PARSER] =         KeilLinkerErrorParser.new
+      :INCLUDE_PATH_FLAG => "-I",
+      :COMPILE_FLAGS => "-c ",
+      :DEP_FLAGS => "--depend=",
+      :DEP_FLAGS_SPACE => false,
+      :PREPRO_FLAGS => "-E -P"
+    })
+
+    KeilChain[:COMPILER][:C] = Utils.deep_copy(KeilChain[:COMPILER][:CPP])
+    KeilChain[:COMPILER][:C][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:C][:SOURCE_FILE_ENDINGS]
+
+    KeilChain[:COMPILER][:ASM] = Utils.deep_copy(KeilChain[:COMPILER][:C])
+    KeilChain[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS] = Provider.default[:COMPILER][:ASM][:SOURCE_FILE_ENDINGS]
+    KeilChain[:COMPILER][:ASM][:COMMAND] = "armasm"
+    KeilChain[:COMPILER][:ASM][:COMPILE_FLAGS] = ""
+      
+    KeilChain[:ARCHIVER][:COMMAND] = "armar"
+    KeilChain[:ARCHIVER][:ARCHIVE_FLAGS] = "--create"
+
+    KeilChain[:LINKER][:COMMAND] = "armlink"
+    KeilChain[:LINKER][:SCRIPT] = "--scatter"
+    KeilChain[:LINKER][:USER_LIB_FLAG] = ""
+    KeilChain[:LINKER][:EXE_FLAG] = "-o"
+    KeilChain[:LINKER][:LIB_FLAG] = ""
+    KeilChain[:LINKER][:LIB_PATH_FLAG] = "--userlibpath="
+    KeilChain[:LINKER][:MAP_FILE_FLAG] = "--map --list="
+    KeilChain[:LINKER][:MAP_FILE_PIPE] = false   
+    KeilChain[:LINKER][:LIST_MODE] = true  
+      
+    keilCompilerErrorParser =                   KeilCompilerErrorParser.new
+    KeilChain[:COMPILER][:C][:ERROR_PARSER] =   keilCompilerErrorParser
+    KeilChain[:COMPILER][:CPP][:ERROR_PARSER] = keilCompilerErrorParser
+    KeilChain[:COMPILER][:ASM][:ERROR_PARSER] = keilCompilerErrorParser
+    KeilChain[:ARCHIVER][:ERROR_PARSER] =       keilCompilerErrorParser
+    KeilChain[:LINKER][:ERROR_PARSER] =         KeilLinkerErrorParser.new
 
-  end
-end
+  end
+end

data/lib/cxxproject/version.rb

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

data/spec/building_block_spec.rb

@@ -42,8 +42,8 @@ describe Cxxproject::BuildingBlock do
     cxx.prepare_block(lib1)
     cxx.prepare_block(lib2)
 
-    lib1.complete_output_dir.should eq(File.join(Dir.pwd, 'build'))
-    lib2.complete_output_dir.should eq(File.join(Dir.pwd, 'lib2', 'build2'))
+    lib1.output_dir.should eq(File.join(Dir.pwd, 'build'))
+    lib2.output_dir.should eq(File.join(Dir.pwd, 'lib2', 'build2'))
   end
 
   it 'should raise exception if building block cannot be resolved' do

metadata

@@ -1,48 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cxxproject
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.5.74
+version: !ruby/object:Gem::Version
+  version: 0.5.75
 platform: ruby
-authors: 
+authors:
 - oliver mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-05-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-11-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: highline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: colored
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    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: *id002
-description: "    Some more high level building blocks for cpp projects.\n"
+  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.
 email: oliver.mueller@gmail.com
-executables: 
+executables:
 - cxx
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/cxxproject.rb
 - lib/cxxproject/buildingblocks/binary_library.rb
 - lib/cxxproject/buildingblocks/building_block.rb
 - lib/cxxproject/buildingblocks/command_line.rb
@@ -103,7 +107,6 @@ 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
@@ -121,38 +124,33 @@ 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/project.rb
 - spec/testdata/onlyOneHeader/Rakefile.rb
+- spec/testdata/onlyOneHeader/project.rb
 - spec/toolchain_spec.rb
-- lib/tools/project.rb.template
 - lib/tools/Rakefile.rb.template
+- lib/tools/project.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 
-  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"
+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'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cpp Support for Rake.
 test_files: []
-