cxxproject 0.5.76 → 0.6.0

data/lib/cxxproject/buildingblocks/building_block.rb

@@ -1,234 +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 :output_dir_relPath
-    attr_accessor :pre_step
-
-    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)
-      self
-    end
-
-    def set_output_dir(x)
-      return self if @output_dir
-      
-      if not @project_dir
-        raise "Error: set project dir before output dir!"
-      end
-
-      if File.is_absolute?(x)
-        @output_dir = x
-        @output_dir_relPath = File.rel_from_to_project(@project_dir, x)
-      else
-        @output_dir = File.join(@project_dir,  x)
-        @output_dir_relPath = x
-      end
-      
-      self
-    end
-
-    def initialize(name)
-      @name = name
-      @config_name = nil
-      @config_files = []
-      @config_date = nil
-      @project_dir = nil
-      @tcs = nil
-      @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
-        CLEAN.include(@output_dir)
-      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 = "\n(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, success)
-      hasError = (success == false)
-      if (cmd != @lastCommand) or (@printedCmdAlternate and hasError)
-        printCmd(cmd, alternate, hasError && Rake::application.lint == false)
-      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 bake 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
-      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

data/lib/cxxproject/buildingblocks/command_line.rb

@@ -1,86 +1,79 @@
-require 'cxxproject/buildingblocks/building_block'
-require 'cxxproject/utils/process'
-
-module Cxxproject
-
-  class CommandLine < BuildingBlock
-
-    def set_command_line(x)
-      @line = x
-      self
-    end
-
-    def get_command_line
-      @line
-    end
-
-    def set_defined_in_file(x)
-      @defined_in_file = x
-      self
-    end
-
-    def get_defined_in_file
-      @defined_in_file
-    end
-
-    def set_defined_in_line(x)
-      @defined_in_line = x
-      self
-    end
-
-    def get_defined_in_line
-      @defined_in_line
-    end
-
-    def initialize(name)
-      set_command_line(name)
-      @num = Rake.application.command_line_number
-      super(get_task_name)
-    end
-
-    def get_task_name()
-      "command line (#{@num}): " + get_command_line
-    end
-
-    def convert_to_rake()
-      res = task get_task_name do
-        Dir.chdir(@project_dir) do
-          check_config_file
-          cmd = get_command_line
-          puts cmd + (RakeFileUtils.verbose ? "\n(executed in '#{@project_dir}')" : "")
-          cmd_result = false
-          begin
-            rd, wr = IO.pipe
-            cmd = [cmd]
-            cmd << {
-             :err=>wr,
-             :out=>wr
-            }
-            cmd_result, consoleOutput = ProcessHelper.safeExecute() { sp = spawn(*cmd); ProcessHelper.readOutput(sp, rd, wr) }
-            puts consoleOutput
-          rescue
-          end
-          if (cmd_result == false)
-            if Rake.application.idei
-              err_res = ErrorDesc.new
-              err_res.file_name = (@defined_in_file ? @defined_in_file : @project_dir)
-              err_res.line_number = (@defined_in_line ? @defined_in_line : 0)
-              err_res.severity = ErrorParser::SEVERITY_ERROR
-              err_res.message = "Command \"#{get_command_line}\" failed"
-              Rake.application.idei.set_errors([err_res])
-            end
-            Printer.printError "Error: command \"#{get_command_line}\" failed" + (RakeFileUtils.verbose ? "" : "\n(executed in '#{@project_dir}')")
-            raise SystemCommandFailed.new
-          end
-        end
-      end
-      res.immediate_output = true
-      res.transparent_timestamp = true
-      res.type = Rake::Task::COMMANDLINE
-      setup_rake_dependencies(res)
-      res
-    end
-
-
-  end
-end
+require 'cxxproject/buildingblocks/building_block'
+require 'cxxproject/utils/process'
+
+module Cxxproject
+
+  class CommandLine < BuildingBlock
+
+    def set_command_line(x)
+      @line = x
+      self
+    end
+
+    def get_command_line
+      @line
+    end
+
+    def set_defined_in_file(x)
+      @defined_in_file = x
+      self
+    end
+
+    def get_defined_in_file
+      @defined_in_file
+    end
+
+    def set_defined_in_line(x)
+      @defined_in_line = x
+      self
+    end
+
+    def get_defined_in_line
+      @defined_in_line
+    end
+
+    def initialize(name)
+      set_command_line(name)
+      @num = Rake.application.command_line_number
+      super(get_task_name)
+    end
+
+    def get_task_name()
+      "command line (#{@num}): " + get_command_line
+    end
+
+    def convert_to_rake()
+      res = task get_task_name do
+        Dir.chdir(@project_dir) do
+          check_config_file
+          cmd = get_command_line
+          puts cmd + (RakeFileUtils.verbose ? " (executed in '#{@project_dir}')" : "")
+          cmd_result = false
+          begin
+            cmd_result = ProcessHelper.spawnProcess(cmd + " 2>&1")
+          rescue
+          end
+          if (cmd_result == false)
+            if Rake.application.idei
+              err_res = ErrorDesc.new
+              err_res.file_name = (@defined_in_file ? @defined_in_file : @project_dir)
+              err_res.line_number = (@defined_in_line ? @defined_in_line : 0)
+              err_res.severity = ErrorParser::SEVERITY_ERROR
+              err_res.message = "Command \"#{get_command_line}\" failed"
+              Rake.application.idei.set_errors([err_res])
+            end
+            Printer.printError "Error: command \"#{get_command_line}\" failed" + (RakeFileUtils.verbose ? "" : " (executed in '#{@project_dir}')")
+            raise SystemCommandFailed.new
+          end
+        end
+      end
+      res.immediate_output = true
+      res.transparent_timestamp = true
+      res.type = Rake::Task::COMMANDLINE
+      setup_rake_dependencies(res)
+      res
+    end
+
+
+  end
+end