cxxproject 0.5.48 → 0.5.59

data/lib/cxxproject/buildingblocks/makefile.rb

@@ -1,153 +1,153 @@
-require 'cxxproject/buildingblocks/building_block'
-require 'cxxproject/buildingblocks/has_libraries_mixin'
-require 'cxxproject/utils/printer'
-require 'cxxproject/utils/process'
-
-module Cxxproject
-  class Makefile < BuildingBlock
-    include HasLibraries
-
-    def set_target(x)
-      @target = x
-      self
-    end
-    
-    def set_flags(x)
-      @flags = x
-      self
-    end  
-      
-    def get_flags(x)
-      @flags
-    end    
-      
-
-    def set_makefile(x)
-      @makefile = x
-      self
-    end
-
-    def set_path_to(hash)
-      @path_to = hash
-      self
-    end
-
-    def get_makefile
-      @makefile
-    end
-
-    def get_target
-      @target
-    end
-    
-    def initialize(mfile, mtarget)
-      @target = mtarget != "" ? mtarget : "all"
-      @makefile = mfile
-      @flags = ""
-      @path_to = {}
-      @num = Rake.application.makefile_number  
-      super(get_task_name)
-    end
-
-    def get_task_name()
-      "makefile (#{@num}): " + get_makefile + (get_target ? ("_"+get_target) : "")    
-    end
-
-    def calc_pathes_to_projects
-      vars = []
-      @path_to.each do |k,v|
-        bb = ALL_BUILDING_BLOCKS[p]
-        if bb
-          pref = File.rel_from_to_project(@project_dir,bb.project_dir)
-          rex = Regexp.new "\\.\\.\\/(.*)#{p}"
-          var = pref.scan(rex)[0]
-          if var
-            vars << "PATH_TO_#{p}=#{var[0]}"
-          end
-        else
-          vars << "PATH_TO_#{k}=#{v}"
-        end
-      end
-      vars.join(" ")
-    end
-
-    def executeCmd(cmd)
-        Dir.chdir(@project_dir) do      
-          check_config_file      
-          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 = @project_dir + "/" + get_makefile()
-              err_res.line_number = 1
-              err_res.severity = ErrorParser::SEVERITY_ERROR
-              if get_target != ""
-                err_res.message = "Target \"#{get_target}\" failed"
-              else
-                err_res.message = "Failed"
-              end
-              Rake.application.idei.set_errors([err_res])
-            end
-            Printer.printError "Error: command \"#{cmd}\" failed" + (RakeFileUtils.verbose ? "" : " (executed in '#{@project_dir}')")
-            raise SystemCommandFailed.new
-          end          
-        end      
-    end
-
-    def convert_to_rake()
-      pathes_to_projects = calc_pathes_to_projects
-    
-      mfile = get_makefile()
-      make = @tcs[:MAKE]
-      cmd = remove_empty_strings_and_join([
-        make[:COMMAND], # make
-        get_target, # all
-        make[:MAKE_FLAGS],
-        @flags, # -j
-        make[:DIR_FLAG], # -C
-        File.dirname(mfile), # x/y
-        make[:FILE_FLAG], # -f
-        File.basename(mfile), # x/y/makefile
-        pathes_to_projects
-      ])
-      
-      mfileTask = task get_task_name do
-        executeCmd(cmd)
-      end
-      
-      mfileTask.immediate_output = true
-      mfileTask.transparent_timestamp = true
-      mfileTask.type = Rake::Task::MAKE
-      mfileTask.enhance(@config_files)
-
-      create_clean_task(@project_dir+"/"+mfile, pathes_to_projects)
-      setup_rake_dependencies(mfileTask)
-      mfileTask
-    end
-
-    def create_clean_task(mfile, pathes_to_projects)
-      # generate the clean task
-      if not Rake.application["clean"].prerequisites.include?(mfile+"Clean")
-        cmd = remove_empty_strings_and_join([@tcs[:MAKE][:COMMAND], # make
-          @tcs[:MAKE][:CLEAN], # clean
-          @tcs[:MAKE][:DIR_FLAG], # -C
-          File.dirname(mfile), # x/y
-          @tcs[:MAKE][:FILE_FLAG], # -f
-          File.basename(mfile), # x/y/makefile
-          pathes_to_projects
-        ])
-        mfileCleanTask = task mfile+"Clean" do
-          executeCmd(cmd)
-        end
-        mfileCleanTask.immediate_output = true
-        Rake.application["clean"].enhance([mfileCleanTask])
-      end
-    end
-
-  end
-end
+require 'cxxproject/buildingblocks/building_block'
+require 'cxxproject/buildingblocks/has_libraries_mixin'
+require 'cxxproject/utils/printer'
+require 'cxxproject/utils/process'
+
+module Cxxproject
+  class Makefile < BuildingBlock
+    include HasLibraries
+
+    def set_target(x)
+      @target = x
+      self
+    end
+
+    def set_flags(x)
+      @flags = x
+      self
+    end
+
+    def get_flags(x)
+      @flags
+    end
+
+
+    def set_makefile(x)
+      @makefile = x
+      self
+    end
+
+    def set_path_to(hash)
+      @path_to = hash
+      self
+    end
+
+    def get_makefile
+      @makefile
+    end
+
+    def get_target
+      @target
+    end
+
+    def initialize(mfile, mtarget)
+      @target = mtarget != "" ? mtarget : "all"
+      @makefile = mfile
+      @flags = ""
+      @path_to = {}
+      @num = Rake.application.makefile_number
+      super(get_task_name)
+    end
+
+    def get_task_name()
+      "makefile (#{@num}): " + get_makefile + (get_target ? ("_"+get_target) : "")
+    end
+
+    def calc_pathes_to_projects
+      vars = []
+      @path_to.each do |k,v|
+        bb = ALL_BUILDING_BLOCKS[p]
+        if bb
+          pref = File.rel_from_to_project(@project_dir,bb.project_dir)
+          rex = Regexp.new "\\.\\.\\/(.*)#{p}"
+          var = pref.scan(rex)[0]
+          if var
+            vars << "PATH_TO_#{p}=#{var[0]}"
+          end
+        else
+          vars << "PATH_TO_#{k}=#{v}"
+        end
+      end
+      vars.join(" ")
+    end
+
+    def executeCmd(cmd)
+        Dir.chdir(@project_dir) do
+          check_config_file
+          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 = @project_dir + "/" + get_makefile()
+              err_res.line_number = 1
+              err_res.severity = ErrorParser::SEVERITY_ERROR
+              if get_target != ""
+                err_res.message = "Target \"#{get_target}\" failed"
+              else
+                err_res.message = "Failed"
+              end
+              Rake.application.idei.set_errors([err_res])
+            end
+            Printer.printError "Error: command \"#{cmd}\" failed" + (RakeFileUtils.verbose ? "" : " (executed in '#{@project_dir}')")
+            raise SystemCommandFailed.new
+          end
+        end
+    end
+
+    def convert_to_rake()
+      pathes_to_projects = calc_pathes_to_projects
+
+      mfile = get_makefile()
+      make = @tcs[:MAKE]
+      cmd = remove_empty_strings_and_join([
+        make[:COMMAND], # make
+        get_target, # all
+        make[:MAKE_FLAGS],
+        @flags, # -j
+        make[:DIR_FLAG], # -C
+        File.dirname(mfile), # x/y
+        make[:FILE_FLAG], # -f
+        File.basename(mfile), # x/y/makefile
+        pathes_to_projects
+      ])
+
+      mfileTask = task get_task_name do
+        executeCmd(cmd)
+      end
+
+      mfileTask.immediate_output = true
+      mfileTask.transparent_timestamp = true
+      mfileTask.type = Rake::Task::MAKE
+      mfileTask.enhance(@config_files)
+
+      create_clean_task(@project_dir+"/"+mfile, pathes_to_projects)
+      setup_rake_dependencies(mfileTask)
+      mfileTask
+    end
+
+    def create_clean_task(mfile, pathes_to_projects)
+      # generate the clean task
+      if not Rake.application["clean"].prerequisites.include?(mfile+"Clean")
+        cmd = remove_empty_strings_and_join([@tcs[:MAKE][:COMMAND], # make
+          @tcs[:MAKE][:CLEAN], # clean
+          @tcs[:MAKE][:DIR_FLAG], # -C
+          File.dirname(mfile), # x/y
+          @tcs[:MAKE][:FILE_FLAG], # -f
+          File.basename(mfile), # x/y/makefile
+          pathes_to_projects
+        ])
+        mfileCleanTask = task mfile+"Clean" do
+          executeCmd(cmd)
+        end
+        mfileCleanTask.immediate_output = true
+        Rake.application["clean"].enhance([mfileCleanTask])
+      end
+    end
+
+  end
+end

data/lib/cxxproject/buildingblocks/module.rb

@@ -1,35 +1,35 @@
-require 'cxxproject/buildingblocks/building_block'
-require 'cxxproject/buildingblocks/has_libraries_mixin'
-require 'cxxproject/buildingblocks/has_sources_mixin'
-require 'cxxproject/buildingblocks/has_includes_mixin'
-
-
-# can be used as wrapper for other tasks
-module Cxxproject
-  class ModuleBuildingBlock < BuildingBlock
-
-    attr_accessor :contents
-    attr_accessor :main_content
-    attr_accessor :last_content
-
-    def initialize(name)
-      super
-      @contents = []
-      @last_content = self
-      @main_content = nil
-    end
-
-    def get_task_name()
-      name
-    end
-
-    def convert_to_rake()
-      res = task get_task_name
-      res.type = Rake::Task::MODULE
-      res.transparent_timestamp = true
-
-      setup_rake_dependencies(res)
-      res
-    end
-  end
-end
+require 'cxxproject/buildingblocks/building_block'
+require 'cxxproject/buildingblocks/has_libraries_mixin'
+require 'cxxproject/buildingblocks/has_sources_mixin'
+require 'cxxproject/buildingblocks/has_includes_mixin'
+
+
+# can be used as wrapper for other tasks
+module Cxxproject
+  class ModuleBuildingBlock < BuildingBlock
+
+    attr_accessor :contents
+    attr_accessor :main_content
+    attr_accessor :last_content
+
+    def initialize(name)
+      super
+      @contents = []
+      @last_content = self
+      @main_content = nil
+    end
+
+    def get_task_name()
+      name
+    end
+
+    def convert_to_rake()
+      res = task get_task_name
+      res.type = Rake::Task::MODULE
+      res.transparent_timestamp = true
+
+      setup_rake_dependencies(res)
+      res
+    end
+  end
+end

data/lib/cxxproject/buildingblocks/single_source.rb

@@ -1,33 +1,33 @@
-require 'cxxproject/buildingblocks/building_block'
-require 'cxxproject/buildingblocks/has_sources_mixin'
-require 'cxxproject/buildingblocks/has_includes_mixin'
-
-module Cxxproject
-  module SingleSourceModule
-    def get_task_name()
-      get_sources_task_name
-    end
-
-    def convert_to_rake()
-      objects_multitask = prepare_tasks_for_objects()
-
-      if objects_multitask
-        namespace "compile" do
-          desc "compile sources in #{@name}-configuration"
-          task @name => objects_multitask
-        end
-        objects_multitask.add_description("compile sources only")
-      end
-
-      setup_rake_dependencies(objects_multitask)
-      objects_multitask
-    end
-  end
-
-  class SingleSource < BuildingBlock
-    include HasSources
-    include HasIncludes
-
-    include SingleSourceModule
-  end
-end
+require 'cxxproject/buildingblocks/building_block'
+require 'cxxproject/buildingblocks/has_sources_mixin'
+require 'cxxproject/buildingblocks/has_includes_mixin'
+
+module Cxxproject
+  module SingleSourceModule
+    def get_task_name()
+      get_sources_task_name
+    end
+
+    def convert_to_rake()
+      objects_multitask = prepare_tasks_for_objects()
+
+      if objects_multitask
+        namespace "compile" do
+          desc "compile sources in #{@name}-configuration"
+          task @name => objects_multitask
+        end
+        objects_multitask.add_description("compile sources only")
+      end
+
+      setup_rake_dependencies(objects_multitask)
+      objects_multitask
+    end
+  end
+
+  class SingleSource < BuildingBlock
+    include HasSources
+    include HasIncludes
+
+    include SingleSourceModule
+  end
+end

data/lib/cxxproject/buildingblocks/source_library.rb

@@ -1,124 +1,124 @@
-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'
-
-module Cxxproject
-  class SourceLibrary < BuildingBlock
-    include HasLibraries
-    include HasSources
-    include HasIncludes
-
-    def initialize(name)
-      super(name)
-    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
-      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
-    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
-    end
-
-    # task that will link the given object files to a static lib
-    #
-    def convert_to_rake()
-      object_multitask = prepare_tasks_for_objects()
-      archiver = @tcs[:ARCHIVER]
-
-      res = typed_file_task Rake::Task::LIBRARY, get_task_name => object_multitask do
-        dir = @project_dir
-        objs = @objects
-        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
-        
-        Dir.chdir(dir) do
-          FileUtils.rm(aname) if File.exists?(aname)
-          cmd = [archiver[:COMMAND]] # ar
-          cmd += archiver[:ARCHIVE_FLAGS].split(" ")
-          cmd += archiver[:FLAGS].split(" ") # --all_load
-          cmd << aname # -o debug/x.exe
-          cmd += objs
-
-          if Cxxproject::Utils.old_ruby?
-            cmd.map! {|c| ((c.include?" ") ? ("\""+c+"\"") : c )}
-          
-            cmdLine = cmd.join(" ")
-            if cmdLine.length > 8000
-              inputName = aname+".tmp"
-              File.open(inputName,"wb") { |f| f.write(cmd[1..-1].join(" ")) }
-              consoleOutput = `#{archiver[:COMMAND] + " @" + inputName}`
-            else
-              consoleOutput = `#{cmd.join(" ")} 2>&1`
-            end
-          else
-            rd, wr = IO.pipe
-            cmd << {
-             :err=>wr,
-             :out=>wr
-            }
-            sp = spawn(*cmd)
-            cmd.pop
-            
-            consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
-          end
-
-          process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{aname}")
-        
-          check_config_file()  
-        end
-      end
-      enhance_with_additional_files(res)
-      add_output_dir_dependency(get_task_name, res, true)
-
-      add_grouping_tasks(get_task_name)
-
-      setup_rake_dependencies(res, object_multitask)
-      return res
-    end
-
-    def add_grouping_tasks(archive)
-      namespace 'lib' do
-        desc archive
-        task @name => archive
-      end
-    end
-  end
-end
+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'
+
+module Cxxproject
+  class SourceLibrary < BuildingBlock
+    include HasLibraries
+    include HasSources
+    include HasIncludes
+
+    def initialize(name)
+      super(name)
+    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
+      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
+    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
+    end
+
+    # task that will link the given object files to a static lib
+    #
+    def convert_to_rake()
+      object_multitask = prepare_tasks_for_objects()
+      archiver = @tcs[:ARCHIVER]
+
+      res = typed_file_task Rake::Task::LIBRARY, get_task_name => object_multitask do
+        dir = @project_dir
+        objs = @objects
+        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
+
+        Dir.chdir(dir) do
+          FileUtils.rm(aname) if File.exists?(aname)
+          cmd = [archiver[:COMMAND]] # ar
+          cmd += archiver[:ARCHIVE_FLAGS].split(" ")
+          cmd += Cxxproject::Utils::flagSplit(archiver[:FLAGS]) # --all_load
+          cmd << aname # -o debug/x.exe
+          cmd += objs
+
+          if Cxxproject::Utils.old_ruby?
+            cmd.map! {|c| ((c.include?" ") ? ("\""+c+"\"") : c )}
+
+            cmdLine = cmd.join(" ")
+            if cmdLine.length > 8000
+              inputName = aname+".tmp"
+              File.open(inputName,"wb") { |f| f.write(cmd[1..-1].join(" ")) }
+              consoleOutput = `#{archiver[:COMMAND] + " @" + inputName}`
+            else
+              consoleOutput = `#{cmd.join(" ")} 2>&1`
+            end
+          else
+            rd, wr = IO.pipe
+            cmd << {
+             :err=>wr,
+             :out=>wr
+            }
+            sp = spawn(*cmd)
+            cmd.pop
+
+            consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
+          end
+
+          process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{aname}")
+
+          check_config_file()
+        end
+      end
+      enhance_with_additional_files(res)
+      add_output_dir_dependency(get_task_name, res, true)
+
+      add_grouping_tasks(get_task_name)
+
+      setup_rake_dependencies(res, object_multitask)
+      return res
+    end
+
+    def add_grouping_tasks(archive)
+      namespace 'lib' do
+        desc archive
+        task @name => archive
+      end
+    end
+  end
+end