cxxproject 0.6.30 → 0.6.31

data/lib/cxxproject/toolchain/toolchain.rb

@@ -1,7 +1,9 @@
 require 'yaml'
 
 class Toolchain
+
   attr_reader :toolchain
+
   def initialize(toolchain_file)
     @toolchain = YAML::load(File.open(toolchain_file))
     if @toolchain.base
@@ -12,6 +14,7 @@ class Toolchain
     basechain = YAML::load(File.open(File.join(File.dirname(__FILE__),"#{@based_on}.json")))
     @toolchain = basechain.recursive_merge(@toolchain)
   end
+
   def method_missing(m, *args, &block)
     if @toolchain[m.to_s]
       self.class.send(:define_method, m) { @toolchain[m.to_s] }

data/lib/cxxproject/utils/deprecated.rb

@@ -0,0 +1,23 @@
+# modified from http://www.seejohncode.com/2012/01/09/deprecating-methods-in-ruby/
+module Deprecated
+  attr_accessor :deprecated_warnings
+
+  def reset
+    self.deprecated_warnings = {}
+  end
+
+  # Define a deprecated alias for a method
+  # @param [Symbol] name - name of method to define
+  # @param [Symbol] replacement - name of method to (alias)
+  def deprecated_alias(name, replacement)
+    define_method(name) do |*args, &block|
+      self.class.deprecated_warnings ||= {}
+      if self.class.deprecated_warnings.has_key?(name) == false
+        warn "#{self.class.name}##{name} deprecated (please use ##{replacement})"
+        self.class.deprecated_warnings[name] = true
+      end
+      send replacement, *args, &block
+    end
+  end
+
+end

data/lib/cxxproject/utils/utils.rb

@@ -3,23 +3,29 @@ module Cxxproject
     # Simple helper query the operating system we are running in
     module OS
 
+      def self.os
+        return :OSX if mac?
+        return :WINDOWS if windows?
+        return :UNIX
+      end
+
       # Is it windows
-      def OS.windows?
+      def self.windows?
         (RUBY_PLATFORM =~ /cygwin|mswin|mingw|bccwin|wince|emx/) != nil
       end
 
       # Is it osx
-      def OS.mac?
+      def self.mac?
         (RUBY_PLATFORM =~ /darwin/) != nil
       end
 
       # Is it kind of unix
-      def OS.unix?
+      def self.unix?
         !OS.windows?
       end
 
       # Is it linux
-      def OS.linux?
+      def self.linux?
         OS.unix? and not OS.mac?
       end
 

data/lib/cxxproject/version.rb

@@ -1,5 +1,5 @@
 module Cxxproject
-  VERSION = '0.6.30'
+  VERSION = '0.6.31'
 
   class Version
     def self.cxxproject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cxxproject
 version: !ruby/object:Gem::Version
-  version: 0.6.30
+  version: 0.6.31
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -51,55 +51,52 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/cxxproject.rb
-- lib/cxxproject/context.rb
 - lib/cxxproject/errorparser/error_parser.rb
+- lib/cxxproject/utils/optional.rb
+- lib/cxxproject/utils/cleanup.rb
+- lib/cxxproject/utils/exit_helper.rb
+- lib/cxxproject/utils/rbcurse_progress.rb
+- lib/cxxproject/utils/process.rb
+- lib/cxxproject/utils/printer.rb
+- lib/cxxproject/utils/rbcurse_executable_ext.rb
+- lib/cxxproject/utils/utils.rb
+- lib/cxxproject/utils/rbcurse_tasktable.rb
+- lib/cxxproject/utils/graphstream.rb
+- lib/cxxproject/utils/deprecated.rb
+- lib/cxxproject/toolchain/provider.rb
+- lib/cxxproject/toolchain/colorizing_formatter.rb
+- lib/cxxproject/toolchain/toolchain.rb
 - lib/cxxproject/version.rb
-- lib/cxxproject/plugin_context.rb
 - lib/cxxproject/ide_interface.rb
-- lib/cxxproject/ext/file.rb
-- lib/cxxproject/ext/hash.rb
-- lib/cxxproject/ext/rake_dirty.rb
 - lib/cxxproject/ext/filelist.rb
-- lib/cxxproject/ext/rake_listener.rb
-- lib/cxxproject/ext/stdout.rb
 - lib/cxxproject/ext/rake.rb
-- lib/cxxproject/ext/progressbar.rb
+- lib/cxxproject/ext/stdout.rb
+- lib/cxxproject/ext/hash.rb
+- lib/cxxproject/ext/rake_dirty.rb
+- lib/cxxproject/ext/file.rb
+- lib/cxxproject/context.rb
+- lib/cxxproject/plugin_context.rb
+- lib/cxxproject/buildingblocks/building_block.rb
 - lib/cxxproject/buildingblocks/has_libraries_mixin.rb
-- lib/cxxproject/buildingblocks/executable.rb
-- lib/cxxproject/buildingblocks/has_includes_mixin.rb
-- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
 - lib/cxxproject/buildingblocks/custom_building_block.rb
+- lib/cxxproject/buildingblocks/static_library.rb
+- lib/cxxproject/buildingblocks/makefile.rb
+- lib/cxxproject/buildingblocks/has_includes_mixin.rb
+- lib/cxxproject/buildingblocks/building_blocks.rb
+- lib/cxxproject/buildingblocks/has_sources_mixin.rb
 - lib/cxxproject/buildingblocks/binary_library.rb
 - lib/cxxproject/buildingblocks/module.rb
-- lib/cxxproject/buildingblocks/building_block.rb
-- lib/cxxproject/buildingblocks/source_library.rb
-- lib/cxxproject/buildingblocks/building_blocks.rb
 - lib/cxxproject/buildingblocks/single_source.rb
-- lib/cxxproject/buildingblocks/makefile.rb
+- lib/cxxproject/buildingblocks/linkable.rb
+- lib/cxxproject/buildingblocks/shared_libs_helper.rb
+- lib/cxxproject/buildingblocks/has_dependencies_mixin.rb
 - lib/cxxproject/buildingblocks/command_line.rb
-- lib/cxxproject/buildingblocks/has_sources_mixin.rb
-- lib/cxxproject/utils/rbcurse_progress.rb
-- lib/cxxproject/utils/ubigraph.rb
-- lib/cxxproject/utils/graphstream.rb
-- lib/cxxproject/utils/progress.rb
-- lib/cxxproject/utils/utils.rb
-- lib/cxxproject/utils/optional.rb
-- lib/cxxproject/utils/progress_helper.rb
-- lib/cxxproject/utils/exit_helper.rb
-- lib/cxxproject/utils/cleanup.rb
-- lib/cxxproject/utils/rbcurse_tasktable.rb
-- lib/cxxproject/utils/rbcurse_executable_ext.rb
-- lib/cxxproject/utils/rbcurse.rb
-- lib/cxxproject/utils/printer.rb
-- lib/cxxproject/utils/process.rb
-- lib/cxxproject/toolchain/provider.rb
-- lib/cxxproject/toolchain/toolchain.rb
-- lib/cxxproject/toolchain/colorizing_formatter.rb
+- lib/cxxproject.rb
 - LICENSE
 - README.md
 homepage: https://github.com/marcmo/cxxproject
-licenses: []
+licenses:
+- BSD-2
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -118,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Cpp Support for Rake.

data/lib/cxxproject/buildingblocks/executable.rb

@@ -1,227 +0,0 @@
-require 'cxxproject/buildingblocks/building_block'
-require 'cxxproject/buildingblocks/has_libraries_mixin'
-require 'cxxproject/buildingblocks/has_sources_mixin'
-require 'cxxproject/buildingblocks/has_includes_mixin'
-require 'cxxproject/utils/process'
-require 'cxxproject/utils/utils'
-require 'cxxproject/ext/stdout'
-
-require 'tmpdir'
-require 'set'
-require 'etc'
-
-module Cxxproject
-
-  class Executable < BuildingBlock
-    include HasLibraries
-    include HasSources
-    include HasIncludes
-
-    def set_linker_script(x)
-      @linker_script = x
-      self
-    end
-
-    def set_mapfile(x)
-      @mapfile = x
-      self
-    end
-
-    def initialize(name)
-      super(name)
-      @linker_script = nil
-      @mapfile = nil
-    end
-
-    def set_executable_name(name) # ensure it's relative
-      @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
-    end
-
-    def get_task_name() # full path
-      @project_dir + "/" + get_executable_name
-    end
-
-    def collect_unique(array, set)
-      ret = []
-      array.each do |v|
-        if set.add?(v)
-          ret << v
-        end
-      end
-      ret
-    end
-
-    def adapt_path(v, d, prefix)
-      tmp = nil
-      if File.is_absolute?(v)
-        tmp = v
-      else
-        prefix ||= File.rel_from_to_project(@project_dir, d.project_dir)
-        tmp = File.add_prefix(prefix, v)
-      end
-      [tmp, prefix]
-    end
-
-    def linker_lib_string(linker)
-      lib_path_set = Set.new
-      deps = collect_dependencies
-      res = []
-      deps.each do |d|
-        handle_whole_archive(d, res, linker, :START_OF_WHOLE_ARCHIVE)
-        if HasLibraries === d
-          d.lib_elements.each do |elem|
-            case elem[0]
-            when HasLibraries::LIB
-              res.push("#{linker[:LIB_FLAG]}#{elem[1]}")
-            when HasLibraries::USERLIB
-              res.push("#{linker[:USER_LIB_FLAG]}#{elem[1]}")
-            when HasLibraries::LIB_WITH_PATH
-              tmp, prefix = adapt_path(elem[1], d, prefix)
-              res.push(tmp)
-            when HasLibraries::SEARCH_PATH
-              tmp, prefix = adapt_path(elem[1], d, prefix)
-              if not lib_path_set.include?(tmp)
-                lib_path_set << tmp
-                res.push("#{linker[:LIB_PATH_FLAG]}#{tmp}")
-              end
-            end
-          end
-        end
-        handle_whole_archive(d, res, linker, :END_OF_WHOLE_ARCHIVE)
-      end
-      res
-    end
-
-    # res the array with command line arguments that is used as result
-    # linker the linker hash
-    # sym the symbol that is used to fish out a value from the linker
-    def handle_whole_archive(building_block, res, linker, sym)
-      if building_block.instance_of?(SourceLibrary)
-        if building_block.whole_archive
-          res.push(linker[sym]) if linker[sym] and !linker[sym].empty?
-        end
-      end
-    end
-
-    # create a task that will link an executable from a set of object files
-    #
-    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
-        Dir.chdir(@project_dir) do
-
-          cmd = [linker[:COMMAND]] # g++
-          cmd += linker[:MUST_FLAGS].split(" ")
-          cmd += linker[:FLAGS]
-          cmd << linker[:EXE_FLAG]
-          cmd << get_executable_name # -o debug/x.exe
-          cmd += @objects
-          cmd << linker[:SCRIPT] if @linker_script # -T
-          cmd << @linker_script if @linker_script # xy/xy.dld
-          cmd << linker[:MAP_FILE_FLAG] if @mapfile # -Wl,-m6
-          cmd += linker[:LIB_PREFIX_FLAGS].split(" ") # TODO ... is this still needed e.g. for diab
-          cmd += linker_lib_string(@tcs[:LINKER])
-          cmd += linker[:LIB_POSTFIX_FLAGS].split(" ") # TODO ... is this still needed e.g. for diab
-
-          mapfileStr = @mapfile ? " >#{@mapfile}" : ""
-          rd, wr = IO.pipe
-          cmdLinePrint = cmd
-          printCmd(cmdLinePrint, "Linking #{get_executable_name}", false)
-          cmd << {
-            :out=> @mapfile ? "#{@mapfile}" : wr, # > xy.map
-            :err=>wr
-          }
-          sp = spawn(*cmd)
-          cmd.pop
-
-          # for console print
-          cmd << " >#{@mapfile}" if @mapfile
-          consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
-
-          process_result(cmdLinePrint, consoleOutput, linker[:ERROR_PARSER], nil)
-          check_config_file()
-        end
-      end
-      res.immediate_output = true
-      res.enhance(@config_files)
-      res.enhance([@project_dir + "/" + @linker_script]) if @linker_script
-
-      add_output_dir_dependency(get_task_name, res, true)
-      add_grouping_tasks(get_task_name)
-      setup_rake_dependencies(res, object_multitask)
-
-      # check that all source libs are checked even if they are not a real rake dependency (can happen if "build this project only")
-      begin
-        libChecker = task get_task_name+"LibChecker" do
-          if File.exists?(get_task_name) # otherwise the task will be executed anyway
-            all_dependencies.each do |bb|
-              if bb and SourceLibrary === bb
-                f = bb.get_task_name # = abs path of library
-                if not File.exists?(f) or File.mtime(f) > File.mtime(get_task_name)
-                  def res.needed?
-                    true
-                  end
-                  break
-                end
-              end
-            end
-          end
-        end
-      rescue
-        def res.needed?
-          true
-        end
-      end
-      libChecker.transparent_timestamp = true
-      res.enhance([libChecker])
-
-      return res
-    end
-
-    def add_grouping_tasks(executable)
-      namespace 'exe' do
-        desc executable
-        task @name => executable
-      end
-      create_run_task(executable, @name)
-    end
-
-    def create_run_task(executable, name)
-      namespace 'run' do
-        desc "run executable #{executable}"
-        res = task name => executable do |t|
-          args = ENV['args'] ? ' ' + ENV['args'] : ''
-          sh "\"#{executable}\"#{args}"
-        end
-        res.type = Rake::Task::RUN
-        res
-      end
-    end
-
-    def get_temp_filename
-      Dir.tmpdir + "/lake.tmp"
-    end
-
-    def no_sources_found()
-    end
-
-  end
-end

data/lib/cxxproject/ext/progressbar.rb

@@ -1,20 +0,0 @@
-class ::ProgressBar
-  attr_writer :title
-
-  def title_width=(w)
-    @title_width = w
-    @format = "%-#{@title_width}s #{'%3d%%'.red} #{'%s'.green} #{'%s'.blue}"
-  end
-
-  show_original = self.instance_method(:show)
-  define_method(:show) do
-    if @unblocked && !RakeFileUtils.verbose
-      show_original.bind(self).call
-    end
-  end
-
-  def unblock
-    @unblocked = true
-    show
-  end
-end

data/lib/cxxproject/ext/rake_listener.rb

@@ -1,57 +0,0 @@
-require 'rake'
-
-module Rake
-
-  def self.add_listener(l)
-    get_listener() << l
-  end
-
-  def self.get_listener
-    @listener ||= []
-  end
-
-  def self.remove_listener(l)
-    get_listener().delete(l)
-  end
-
-  def self.notify_listener(symbol, name)
-    Rake::get_listener().each do |l|
-      if l.respond_to?(symbol)
-        l.send(symbol, name)
-      end
-    end
-  end
-
-  def self.augmented_invoke_prerequisites(o, name, invoke_prerequisites_original, obj, task_args, invocation_chain)
-      Rake::notify_listener(:before_prerequisites, name)
-      invoke_prerequisites_original.bind(obj).call(task_args, invocation_chain)
-      Rake::notify_listener(:after_prerequisites, name)
-      if !o.needed?
-        Rake::notify_listener(:after_execute, name)
-      end
-  end
-
-  class MultiTask
-    invoke_prerequisites_original = self.instance_method(:invoke_prerequisites)
-    define_method(:invoke_prerequisites) do |task_args, invocation_chain|
-      Rake::augmented_invoke_prerequisites(self, name, invoke_prerequisites_original, self, task_args, invocation_chain)
-    end
-  end
-
-  class Task
-    invoke_prerequisites_original = self.instance_method(:invoke_prerequisites)
-    define_method (:invoke_prerequisites) do |task_args, invocation_chain|
-      Rake::augmented_invoke_prerequisites(self, name, invoke_prerequisites_original, self, task_args, invocation_chain)
-    end
-
-    execute_original = self.instance_method(:execute)
-    define_method(:execute) do |args|
-      Rake::notify_listener(:before_execute, name)
-      execute_original.bind(self).call(args)
-      Rake::notify_listener(:after_execute, name)
-    end
-
-  end
-
-end
-