cxxproject 0.5.48 → 0.5.59

data/Rakefile.rb

@@ -1,116 +1,116 @@
-require 'rake/clean'
-require './rake_helper/spec.rb'
-
-desc "Default Task"
-task :default => [:install]
-
-
-begin
-  require 'rubygems/package_task'
-  spec = Gem::Specification.load('cxx.gemspec')
-  Gem::PackageTask.new(spec){|pkg|}
-
-  desc "install gem globally"
-  task :install => [:gem] do
-    sh "gem install pkg/#{spec.name}-#{spec.version}.gem"
-  end
-
-
-  begin
-    require 'rdoc'
-    require 'rdoc/task'
-    RDoc::Task.new do |rd|
-      rd.rdoc_files.include(spec.files)
-    end
-  rescue LoadError => e
-    task :rdoc do
-      puts 'please gem install rdoc'
-    end
-  end
-  begin
-    require 'roodi'
-    require 'roodi_task'
-    class RoodiTask
-      def define
-        # copied from roodi_task.rb
-        desc "Check for design issues in: #{patterns.join(', ')}"
-        task name do
-          runner = Roodi::Core::Runner.new
-          runner.config = config if config
-          patterns.each do |pattern|
-            Dir.glob(pattern).each { |file| runner.check_file(file) }
-          end
-          runner.errors.each {|error| puts error}
-          # raise "Found #{runner.errors.size} errors." unless runner.errors.empty?
-        end
-        self
-      end
-    end
-    RoodiTask.new('roodi', spec.files)
-    task :gem => [:roodi]
-  rescue LoadError # don't bail out when people do not have roodi installed!
-      puts 'please gem install roodi'
-  end
-rescue LoadError => e
-    puts "please missing gems #{e}"
-end
-
-def two_digits(x)
-  if x.length > 1
-    x
-  else
-    "0#{x}"
-  end
-end
-
-begin
-  require 'grit'
-  include Grit
-
-  def git_history
-    repo = Repo.new('.')
-    tag_names = repo.tags.collect {|t| t.name }
-    relevant_tags = repo.tags.reject {|t| !t.name.start_with?("v_")}
-    sorted_tags = relevant_tags.sort_by.each do |t|
-      /v_(?<x>\d+)\.(?<y>\d+)\.(?<z>\d+)/ =~ t.name
-      "#{two_digits(x)}-#{two_digits(y)}-#{two_digits(z)}"
-    end
-
-    change_text = []
-    zipped = sorted_tags[0..-2].zip(sorted_tags[1..-1])
-    zipped.reverse.each do |a,b|
-      change_text << ""
-      change_text << "#{a.name} => #{b.name}"
-      change_text << ""
-      cs = repo.commits_between(a.commit, b.commit)
-      cm = cs.each do |c|
-        change_lines = c.message.lines.to_a
-        first = change_lines.first
-        change_text << "    * " + first + "#{change_lines[1..-1].collect {|l| "      #{l}"}.join("")}"
-      end
-    end
-    change_text
-  end
-
-  desc 'generate version history'
-  task :generate_history do
-    puts git_history
-  end
-
-  desc 'generate and update version history'
-  task :update_version_history do
-    change_line = "## Change History:"
-    readme = 'README.md'
-    content = File.read(readme)
-    File.open(readme, 'w') do |f|
-      f.puts content.gsub(/^#{change_line}.*/m, ([change_line] << git_history).join("\n"))
-    end
-  end
-
-rescue LoadError => e
-  puts 'to build the version history please gem install grit'
-end
-
-
-require './rake_helper/perftools'
-
+require 'rake/clean'
+require './rake_helper/spec.rb'
+
+desc "Default Task"
+task :default => [:install]
+
+
+begin
+  require 'rubygems/package_task'
+  spec = Gem::Specification.load('cxx.gemspec')
+  Gem::PackageTask.new(spec){|pkg|}
+
+  desc "install gem globally"
+  task :install => [:gem] do
+    sh "gem install pkg/#{spec.name}-#{spec.version}.gem"
+  end
+
+
+  begin
+    require 'rdoc'
+    require 'rdoc/task'
+    RDoc::Task.new do |rd|
+      rd.rdoc_files.include(spec.files)
+    end
+  rescue LoadError => e
+    task :rdoc do
+      puts 'please gem install rdoc'
+    end
+  end
+  begin
+    require 'roodi'
+    require 'roodi_task'
+    class RoodiTask
+      def define
+        # copied from roodi_task.rb
+        desc "Check for design issues in: #{patterns.join(', ')}"
+        task name do
+          runner = Roodi::Core::Runner.new
+          runner.config = config if config
+          patterns.each do |pattern|
+            Dir.glob(pattern).each { |file| runner.check_file(file) }
+          end
+          runner.errors.each {|error| puts error}
+          # raise "Found #{runner.errors.size} errors." unless runner.errors.empty?
+        end
+        self
+      end
+    end
+    RoodiTask.new('roodi', spec.files)
+    task :gem => [:roodi]
+  rescue LoadError # don't bail out when people do not have roodi installed!
+      puts 'please gem install roodi'
+  end
+rescue LoadError => e
+    puts "please missing gems #{e}"
+end
+
+def two_digits(x)
+  if x.length > 1
+    x
+  else
+    "0#{x}"
+  end
+end
+
+begin
+  require 'grit'
+  include Grit
+
+  def git_history
+    repo = Repo.new('.')
+    tag_names = repo.tags.collect {|t| t.name }
+    relevant_tags = repo.tags.reject {|t| !t.name.start_with?("v_")}
+    sorted_tags = relevant_tags.sort_by.each do |t|
+      /v_(?<x>\d+)\.(?<y>\d+)\.(?<z>\d+)/ =~ t.name
+      "#{two_digits(x)}-#{two_digits(y)}-#{two_digits(z)}"
+    end
+
+    change_text = []
+    zipped = sorted_tags[0..-2].zip(sorted_tags[1..-1])
+    zipped.reverse.each do |a,b|
+      change_text << ""
+      change_text << "#{a.name} => #{b.name}"
+      change_text << ""
+      cs = repo.commits_between(a.commit, b.commit)
+      cm = cs.each do |c|
+        change_lines = c.message.lines.to_a
+        first = change_lines.first
+        change_text << "    * " + first + "#{change_lines[1..-1].collect {|l| "      #{l}"}.join("")}"
+      end
+    end
+    change_text
+  end
+
+  desc 'generate version history'
+  task :generate_history do
+    puts git_history
+  end
+
+  desc 'generate and update version history'
+  task :update_version_history do
+    change_line = "## Change History:"
+    readme = 'README.md'
+    content = File.read(readme)
+    File.open(readme, 'w') do |f|
+      f.puts content.gsub(/^#{change_line}.*/m, ([change_line] << git_history).join("\n"))
+    end
+  end
+
+rescue LoadError => e
+  puts 'to build the version history please gem install grit'
+end
+
+
+require './rake_helper/perftools'
+

data/bin/cxx

@@ -1,10 +1,10 @@
-#!/usr/bin/env ruby
-$:.unshift File.join(File.dirname(__FILE__),"..","lib")
-
-require 'tools/project_wizard'
-
-if ARGV.size < 1
-	puts "usage: cxx project-dir"
-	exit 0
-end
-prepare_project(ARGV[0])
+#!/usr/bin/env ruby
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require 'tools/project_wizard'
+
+if ARGV.size < 1
+	puts "usage: cxx project-dir"
+	exit 0
+end
+prepare_project(ARGV[0])

data/lib/cxxproject.rb

@@ -1,23 +1,23 @@
-# Just the default file wich is auto-required in the gem and which requires all needed stuff
-require 'rubygems'
-require 'yaml'
-require 'rake/clean'
-
-require 'cxxproject/utils/optional'
-
-require 'cxxproject/ext/string'
-require 'cxxproject/utils/utils'
-require 'cxxproject/torake'
-require 'cxxproject/utils/ubigraph'
-require 'cxxproject/utils/graphstream'
-require 'cxxproject/toolchain/provider'
-
-require 'cxxproject/utils/progress'
-require 'cxxproject/utils/rbcurse'
-require 'cxxproject/utils/progress'
-require 'cxxproject/utils/rbcurse'
-require 'cxxproject/utils/stats'
-
-include Cxxproject::Toolchain
-CxxProject2Rake = Cxxproject::CxxProject2Rake
-BinaryLibs = Cxxproject::BinaryLibs
+# Just the default file wich is auto-required in the gem and which requires all needed stuff
+require 'rubygems'
+require 'yaml'
+require 'rake/clean'
+
+require 'cxxproject/utils/optional'
+
+require 'cxxproject/ext/string'
+require 'cxxproject/utils/utils'
+require 'cxxproject/torake'
+require 'cxxproject/utils/ubigraph'
+require 'cxxproject/utils/graphstream'
+require 'cxxproject/toolchain/provider'
+
+require 'cxxproject/utils/progress'
+require 'cxxproject/utils/rbcurse'
+require 'cxxproject/utils/progress'
+require 'cxxproject/utils/rbcurse'
+require 'cxxproject/utils/stats'
+
+include Cxxproject::Toolchain
+CxxProject2Rake = Cxxproject::CxxProject2Rake
+BinaryLibs = Cxxproject::BinaryLibs

data/lib/cxxproject/buildingblocks/binary_library.rb

@@ -1,39 +1,39 @@
-require 'cxxproject/buildingblocks/building_block'
-require 'cxxproject/buildingblocks/has_libraries_mixin'
-require 'cxxproject/buildingblocks/has_includes_mixin'
-
-module Cxxproject
-
-  class BinaryLibrary < BuildingBlock
-    include HasLibraries
-    include HasIncludes
-
-    def initialize(name, useNameAsLib = true)
-      super(name)
-      if useNameAsLib
-        @useNameAsLib = name
-        add_lib_element(HasLibraries::LIB, name, true)
-      else
-        @useNameAsLib = nil
-      end
-    end
-
-    def get_task_name()
-      return @useNameAsLib if @useNameAsLib
-      @name
-    end
-
-
-    def convert_to_rake()
-      res = task get_task_name
-      def res.needed?
-        return false
-      end
-      res.transparent_timestamp = true
-      res.type = Rake::Task::BINARY
-      setup_rake_dependencies(res)
-      res
-    end
-
-  end
-end
+require 'cxxproject/buildingblocks/building_block'
+require 'cxxproject/buildingblocks/has_libraries_mixin'
+require 'cxxproject/buildingblocks/has_includes_mixin'
+
+module Cxxproject
+
+  class BinaryLibrary < BuildingBlock
+    include HasLibraries
+    include HasIncludes
+
+    def initialize(name, useNameAsLib = true)
+      super(name)
+      if useNameAsLib
+        @useNameAsLib = name
+        add_lib_element(HasLibraries::LIB, name, true)
+      else
+        @useNameAsLib = nil
+      end
+    end
+
+    def get_task_name()
+      return @useNameAsLib if @useNameAsLib
+      @name
+    end
+
+
+    def convert_to_rake()
+      res = task get_task_name
+      def res.needed?
+        return false
+      end
+      res.transparent_timestamp = true
+      res.type = Rake::Task::BINARY
+      setup_rake_dependencies(res)
+      res
+    end
+
+  end
+end

data/lib/cxxproject/buildingblocks/building_block.rb

@@ -1,239 +1,251 @@
-require 'cxxproject/buildingblocks/has_dependencies_mixin'
-require 'cxxproject/utils/exit_helper'
-require 'cxxproject/ext/rake'
-require 'cxxproject/ext/file'
-require 'cxxproject/ide_interface'
-require 'cxxproject/utils/printer'
-
-# no deprecated warning for rake >= 0.9.x
-include Rake::DSL if defined?(Rake::DSL)
-module Cxxproject
-
-  # stores all defined buildingblocks by name (the name should be unique)
-  ALL_BUILDING_BLOCKS = {}
-
-  trap("INT") do
-    Rake.application.idei.set_abort(true)
-  end
-
-  class BuildingBlock
-    include HasDependencies
-
-    attr_reader :name
-    attr_reader :config_name
-    attr_reader :config_files
-
-    attr_reader :project_dir
-    attr_accessor :output_dir
-    attr_accessor :pre_step
-    attr_reader :output_dir_abs
-
-    def set_name(x)
-      @name = x
-      self
-    end
-
-    def set_tcs(x)
-      @tcs = x
-      self
-    end
-
-    def has_tcs?
-      @tcs != nil
-    end
-
-    def tcs()
-      raise "Toolchain settings must be set before!" if @tcs.nil?
-      @tcs
-    end
-
-    def set_config_files(x)
-      @config_files = x
-      @config_date = Time.now
-      self
-    end
-
-    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)
-      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
-      else
-        File.join(@project_dir,  @output_dir)
-      end
-    end
-
-    def initialize(name)
-      @name = name
-      @config_name = nil
-      @config_files = []
-      @config_date = nil
-      @project_dir = nil
-      @tcs = nil
-      @output_dir = nil
-      @output_dir_abs = false
-      @complete_output_dir = nil
-      @pre_step = nil
-
-      if ALL_BUILDING_BLOCKS.include?(@name) and not self.instance_of?(BinaryLibrary)
-        raise "building block already exists: #{name}"
-      else
-        ALL_BUILDING_BLOCKS[@name] = self
-      end
-    end
-    
-    def set_config_name(x)
-      @config_name = x
-    end
-
-    def complete_init()
-      if self.respond_to?(:calc_compiler_strings)
-        calc_compiler_strings
-      end
-    end
-
-    def get_task_name()
-      raise "this method must be implemented by decendants"
-    end
-
-    ##
-    # convert all dependencies of a building block to rake task prerequisites (e.g. exe needs lib)
-    #
-    def setup_rake_dependencies(task, multitask = nil)
-      dependencies.reverse_each do |d|
-        begin
-          bb = ALL_BUILDING_BLOCKS[d]
-          raise "Error: tried to add the dependencies of \"#{d}\" to \"#{@name}\" but such a building block could not be found!" unless bb
-          
-          if multitask and bb.pre_step
-            multitask.prerequisites.unshift(bb.get_task_name)
-          else
-            task.prerequisites.unshift(bb.get_task_name)
-          end
-        rescue ExitHelperException
-          raise
-        rescue Exception => e
-          Printer.printError e.message
-          ExitHelper.exit(1)
-        end
-      end
-      
-      task
-    end
-
-    def add_output_dir_dependency(file, taskOfFile, addDirToCleanTask)
-      d = File.dirname(file)
-      directory d
-      taskOfFile.enhance([d])
-      
-      if addDirToCleanTask
-        CLOBBER.include(complete_output_dir)
-        if (@output_dir_abs)
-          CLEAN.include(file)
-        else
-          CLEAN.include(complete_output_dir)
-        end
-      end
-    end
-
-    def process_result(cmd, console_output, error_parser, alternate)
-
-      hasError = ($?.success? == false)
- 
-      if hasError or RakeFileUtils.verbose or (alternate.nil? and not Rake::application.options.silent)
-        exedIn = ""
-        exedIn = " (executed in '#{@project_dir}')" if (hasError or RakeFileUtils.verbose)
-        if cmd.is_a?(Array)
-          puts cmd.join(' ') + exedIn
-        else
-          puts cmd + exedIn
-        end
-      else
-        puts alternate unless Rake::application.options.silent
-      end
-
-      errorPrinted = process_console_output(console_output, error_parser)
-      
-      if hasError
-        if not errorPrinted
-          Printer.printError "Error: system command failed" 
-          res = ErrorDesc.new
-          res.file_name = @project_dir
-          res.line_number = 0
-          res.message = "Unknown error, see log output. Maybe the lake error parser has to be updated..."
-          res.severity = ErrorParser::SEVERITY_ERROR
-          Rake.application.idei.set_errors([res])
-        end
-        
-        raise SystemCommandFailed.new
-      end
-    end
-
-    def read_file_or_empty_string(filename)
-      begin
-        return File.read(filename)
-      rescue
-        return ""
-      end
-    end
-
-    def typed_file_task(type, *args, &block)
-      t = file *args do
-        block.call
-      end
-      t.type = type
-      t.progress_count = 1
-      return t
-    end
-
-    def remove_empty_strings_and_join(a, j=' ')
-      return a.reject{|e|e.to_s.empty?}.join(j)
-    end
-
-    def catch_output(cmd)
-      new_command = "#{cmd} 2>&1"
-      # "/" does not work on windows with backticks, switch the separator on windows:
-      new_command.gsub!(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
-      return `#{new_command}`
-    end
-
-    def check_config_file()
-      if @config_date
-        @config_files.each do |c|
-          err_msg = nil
-          if File.exists?(c) and File.mtime(c) > @config_date
-            @config_date = File.mtime(c)
-            begin
-              FileUtils.touch(c)
-            rescue Exception
-            end
-          end
-        end
-      end
-    end
-
-  end
-  
-end
+require 'cxxproject/buildingblocks/has_dependencies_mixin'
+require 'cxxproject/utils/exit_helper'
+require 'cxxproject/ext/rake'
+require 'cxxproject/ext/file'
+require 'cxxproject/ide_interface'
+require 'cxxproject/utils/printer'
+
+# no deprecated warning for rake >= 0.9.x
+include Rake::DSL if defined?(Rake::DSL)
+module Cxxproject
+
+  # stores all defined buildingblocks by name (the name should be unique)
+  ALL_BUILDING_BLOCKS = {}
+
+  trap("INT") do
+    Rake.application.idei.set_abort(true)
+  end
+
+  class BuildingBlock
+    include HasDependencies
+
+    attr_reader :name
+    attr_reader :config_name
+    attr_reader :config_files
+
+    attr_reader :project_dir
+    attr_accessor :output_dir
+    attr_accessor :pre_step
+    attr_reader :output_dir_abs
+
+    def set_name(x)
+      @name = x
+      self
+    end
+
+    def set_tcs(x)
+      @tcs = x
+      self
+    end
+
+    def has_tcs?
+      @tcs != nil
+    end
+
+    def tcs()
+      raise "Toolchain settings must be set before!" if @tcs.nil?
+      @tcs
+    end
+
+    def set_config_files(x)
+      @config_files = x
+      @config_date = Time.now
+      self
+    end
+
+    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)
+      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
+      else
+        File.join(@project_dir,  @output_dir)
+      end
+    end
+
+    def initialize(name)
+      @name = name
+      @config_name = nil
+      @config_files = []
+      @config_date = nil
+      @project_dir = nil
+      @tcs = nil
+      @output_dir = nil
+      @output_dir_abs = false
+      @complete_output_dir = nil
+      @pre_step = nil
+      @printedCmdAlternate = false
+      @lastCommand = nil
+
+      if ALL_BUILDING_BLOCKS.include?(@name) and not self.instance_of?(BinaryLibrary)
+        raise "building block already exists: #{name}"
+      else
+        ALL_BUILDING_BLOCKS[@name] = self
+      end
+    end
+
+    def set_config_name(x)
+      @config_name = x
+    end
+
+    def complete_init()
+      if self.respond_to?(:calc_compiler_strings)
+        calc_compiler_strings
+      end
+    end
+
+    def get_task_name()
+      raise "this method must be implemented by decendants"
+    end
+
+    ##
+    # convert all dependencies of a building block to rake task prerequisites (e.g. exe needs lib)
+    #
+    def setup_rake_dependencies(task, multitask = nil)
+      dependencies.reverse_each do |d|
+        begin
+          bb = ALL_BUILDING_BLOCKS[d]
+          raise "Error: tried to add the dependencies of \"#{d}\" to \"#{@name}\" but such a building block could not be found!" unless bb
+
+          if multitask and bb.pre_step
+            multitask.prerequisites.unshift(bb.get_task_name)
+          else
+            task.prerequisites.unshift(bb.get_task_name)
+          end
+        rescue ExitHelperException
+          raise
+        rescue Exception => e
+          Printer.printError e.message
+          ExitHelper.exit(1)
+        end
+      end
+
+      task
+    end
+
+    def add_output_dir_dependency(file, taskOfFile, addDirToCleanTask)
+      d = File.dirname(file)
+      directory d
+      taskOfFile.enhance([d])
+
+      if addDirToCleanTask
+        CLOBBER.include(complete_output_dir)
+        if (@output_dir_abs)
+          CLEAN.include(file)
+        else
+          CLEAN.include(complete_output_dir)
+        end
+      end
+    end
+
+    def printCmd(cmd, alternate, showPath)
+      @lastCommand = cmd
+      if showPath or RakeFileUtils.verbose or (alternate.nil? and not Rake::application.options.silent)
+        @printedCmdAlternate = false
+        exedIn = ""
+        exedIn = " (executed in '#{@project_dir}')" if (showPath or RakeFileUtils.verbose)
+        puts "" if Rake::application.addEmptyLine
+        if cmd.is_a?(Array)
+          puts cmd.join(' ') + exedIn
+        else
+          puts cmd + exedIn
+        end
+      else
+        @printedCmdAlternate = true
+        puts alternate unless Rake::application.options.silent
+      end
+      @lastCommand = cmd
+    end
+
+
+    def process_result(cmd, console_output, error_parser, alternate)
+      hasError = ($?.success? == false)
+      if (cmd != @lastCommand) or (@printedCmdAlternate and hasError)
+        printCmd(cmd, alternate, hasError)
+      end
+      errorPrinted = process_console_output(console_output, error_parser)
+
+      if hasError
+        if not errorPrinted
+          Printer.printError "Error: system command failed"
+          res = ErrorDesc.new
+          res.file_name = @project_dir
+          res.line_number = 0
+          res.message = "Unknown error, see log output. Maybe the lake error parser has to be updated..."
+          res.severity = ErrorParser::SEVERITY_ERROR
+          Rake.application.idei.set_errors([res])
+        end
+      end
+      if hasError or errorPrinted
+        raise SystemCommandFailed.new
+      end
+    end
+
+    def read_file_or_empty_string(filename)
+      begin
+        return File.read(filename)
+      rescue
+        return ""
+      end
+    end
+
+    def typed_file_task(type, *args, &block)
+      t = file *args do
+        block.call
+      end
+      t.type = type
+      t.progress_count = 1
+      return t
+    end
+
+    def remove_empty_strings_and_join(a, j=' ')
+      return a.reject{|e|e.to_s.empty?}.join(j)
+    end
+
+    def catch_output(cmd)
+      new_command = "#{cmd} 2>&1"
+      # "/" does not work on windows with backticks, switch the separator on windows:
+      new_command.gsub!(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
+      return `#{new_command}`
+    end
+
+    def check_config_file()
+      if @config_date
+        @config_files.each do |c|
+          err_msg = nil
+          if File.exists?(c) and File.mtime(c) > @config_date
+            @config_date = File.mtime(c)
+            begin
+              FileUtils.touch(c)
+            rescue Exception
+            end
+          end
+        end
+      end
+    end
+
+  end
+
+end