cxxproject 0.6.30 → 0.6.31

data/lib/cxxproject/buildingblocks/makefile.rb

@@ -74,7 +74,7 @@ module Cxxproject
     def executeCmd(cmd)
         Dir.chdir(@project_dir) do
           check_config_file
-          puts cmd + (RakeFileUtils.verbose ? " (executed in '#{@project_dir}')" : "")
+          puts cmd + ((RakeFileUtils.verbose == true) ? " (executed in '#{@project_dir}')" : "")
           cmd_result = false
           begin
             cmd_result = ProcessHelper.spawnProcess(cmd + " 2>&1")
@@ -93,7 +93,7 @@ module Cxxproject
               end
               Rake.application.idei.set_errors([err_res])
             end
-            Printer.printError "Error: command \"#{cmd}\" failed" + (RakeFileUtils.verbose ? "" : " (executed in '#{@project_dir}')")
+            Printer.printError "Error: command \"#{cmd}\" failed" + ((RakeFileUtils.verbose == true) ? "" : " (executed in '#{@project_dir}')")
             raise SystemCommandFailed.new
           end
         end

data/lib/cxxproject/buildingblocks/shared_libs_helper.rb

@@ -0,0 +1,93 @@
+module Cxxproject
+  class SharedLibsHelper
+    def symlink_lib_to(link, bb)
+      file = File.basename(bb.executable_name)
+      if file != link
+        cd "#{bb.output_dir}/libs" do
+          symlink(file, link)
+        end
+      end
+    end
+  end
+
+  class OsxSharedLibs < SharedLibsHelper
+    def calc(linker, bb)
+      flags = ['-install_name', bb.get_output_name(linker)]
+      if bb.compatibility != nil
+        flags << '-compatibility_version'
+        flags << bb.compatibility
+      end
+      if bb.minor != nil
+        flags << '-current_version'
+        flags << bb.minor
+      end
+      flags
+    end
+
+    # For :major=>A, minor=>1.0.1, compatibility=>1.0.0 basic is 'libfoo.A.so'
+    def get_basic_name(linker, bb)
+      prefix = bb.get_output_prefix(linker)
+      name = bb.name
+      dylib = bb.shared_suffix linker
+      return "#{prefix}#{name}#{dylib}"
+    end
+
+
+    # Some symbolic links
+    # ln -s foo.dylib foo.A.dylib
+    def post_link_hook(linker, bb)
+      basic_name = get_basic_name(linker, bb)
+      symlink_lib_to(basic_name, bb)
+    end
+
+    def get_version_suffix(linker, bb)
+      bb.major ? ".#{bb.major}" : ''
+    end
+  end
+
+  class UnixSharedLibs < SharedLibsHelper
+
+    def initialize()
+    end
+
+    # For :major=>1, minor=>2 fullname is '1.2.so'
+    def get_version_suffix(linker, bb)
+      "#{major_suffix bb}#{[bb.major, bb.minor].compact.join('.')}"
+    end
+
+    def major_suffix(bb)
+      bb.major ? ".#{bb.major}" : ''
+    end
+
+    # For :major=>1, minor=>2 soname is 'libfoo.1.so'
+    #def get_major(linker)
+    # prefix = get_output_prefix(linker)
+    # return "#{prefix}#{name}#{major_suffix}#{shared_suffix linker}"
+    #end
+
+    def get_soname(linker, bb)
+      prefix = bb.get_output_prefix(linker)
+      "#{prefix}#{bb.name}#{major_suffix bb}#{bb.shared_suffix linker}"
+    end
+
+    def calc(linker, bb)
+      return ["-Wl,-soname,#{get_soname(linker, bb)}"]
+    end
+
+    # For :major=>1, minor=>2 fullname is 'libfoo.so'
+    def get_basic_name(linker, bb)
+      prefix = bb.get_output_prefix(linker)
+      return "#{prefix}#{bb.name}#{bb.shared_suffix(linker)}"
+    end
+
+    # Some symbolic links
+    # ln -s libfoo.so libfoo.1.2.so
+    # ln -s libfoo.1.so libfoo.1.2.so
+    def post_link_hook(linker, bb)
+      basic_name = get_basic_name(linker, bb)
+      soname = get_soname(linker, bb)
+      symlink_lib_to(basic_name, bb)
+      symlink_lib_to(soname, bb)
+    end
+  end
+end

data/lib/cxxproject/buildingblocks/{source_library.rb → static_library.rb}

@@ -6,7 +6,7 @@ require 'cxxproject/utils/process'
 require 'cxxproject/utils/utils'
 
 module Cxxproject
-  class SourceLibrary < BuildingBlock
+  class StaticLibrary < BuildingBlock
     include HasLibraries
     include HasSources
     include HasIncludes
@@ -28,13 +28,17 @@ module Cxxproject
       super
     end
 
+    def additional_path_components
+      ['libs']
+    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'
+        parts += additional_path_components()
       end
 
       parts << "lib#{@name}.a"
@@ -54,6 +58,29 @@ module Cxxproject
       @task_name
     end
 
+    def calc_command_line
+      objs = @objects
+       if @output_dir_abs
+        prefix = File.rel_from_to_project(@project_dir, @output_dir)
+#        objs.map! { |m| m[prefix.length..-1] }
+      end
+      archiver = @tcs[:ARCHIVER]
+      cmd = [archiver[:COMMAND]] # ar
+      cmd += archiver[:ARCHIVE_FLAGS].split(" ")
+      cmd += archiver[:FLAGS]
+      cmd << calc_archive_name # -o debug/x.exe
+      cmd += objs
+    end
+
+    def calc_archive_name
+      aname = get_archive_name
+#      if @output_dir_abs
+#        prefix = File.rel_from_to_project(@project_dir, @output_dir)
+#        aname = aname[prefix.length..-1]
+#      end
+      return aname
+    end
+
     # task that will link the given object files to a static lib
     #
     def convert_to_rake()
@@ -61,26 +88,11 @@ module Cxxproject
       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
+        cmd = calc_command_line
+        aname = calc_archive_name
+        Dir.chdir(@project_dir) do
           FileUtils.rm(aname) if File.exists?(aname)
-          cmd = [archiver[:COMMAND]] # ar
-          cmd += archiver[:ARCHIVE_FLAGS].split(" ")
-          cmd += archiver[:FLAGS]
-          cmd << aname # -o debug/x.exe
-          cmd += objs
-
-          cmd.map! {|c| c.include?(' ') ? "\"#{c}\"" : c }
+#          cmd.map! {|c| c.include?(' ') ? "\"#{c}\"" : c }
           rd, wr = IO.pipe
           cmd << {
             :err => wr,
@@ -91,11 +103,12 @@ module Cxxproject
 
           consoleOutput = ProcessHelper.readOutput(sp, rd, wr)
 
-          process_result(cmd, consoleOutput, archiver[:ERROR_PARSER], "Creating #{aname}")
+          process_result(cmd, consoleOutput, @tcs[:ARCHIVER][:ERROR_PARSER], "Creating #{aname}")
 
           check_config_file()
         end
       end
+      res.tags = tags
       enhance_with_additional_files(res)
       add_output_dir_dependency(get_task_name, res, true)
 

data/lib/cxxproject/context.rb

@@ -5,7 +5,7 @@ module Cxxproject
       hash.keys.map do |k|
         error_string = ["error while evaluating \"#{@current_working_dir}/#{@current_project_file}\"",
                         "\"#{k}\" is not a valid specifier!",
-                        "allowd specifiers: #{allowed}"].join($/)
+                        "allowed specifiers: #{allowed}"].join($/)
         raise error_string unless allowed.include?(k)
       end
     end

data/lib/cxxproject/ext/rake.rb

@@ -17,12 +17,17 @@ end
 module Rake
 
   class Application
+    attr_writer :raise_exceptions 
     attr_writer :max_parallel_tasks
     attr_writer :check_unnecessary_includes
     attr_writer :deriveIncludes
     attr_writer :preproFlags
     attr_writer :consoleOutput_fullnames
     attr_writer :addEmptyLine
+    def raise_exceptions 
+      @raise_exceptions ||= false
+    end
+    
     def max_parallel_tasks
       @max_parallel_tasks ||= 8
     end
@@ -226,11 +231,15 @@ module Rake
     attr_accessor :deps # used to store deps by depfile task for the apply task (no re-read of depsfile)
     attr_accessor :type
     attr_accessor :transparent_timestamp
-    attr_accessor :progress_count
     attr_accessor :output_string
     attr_accessor :output_after_execute
     attr_accessor :immediate_output
     attr_accessor :prerequisites
+    attr_writer :tags
+    def tags
+      @tags = Set.new unless @tags
+      return @tags
+    end
 
     UNKNOWN     = 0x0000 #
     OBJECT      = 0x0001 #
@@ -247,6 +256,7 @@ module Rake
     RUN         = 0x0800 #
     CUSTOM      = 0x1000 # x
     COMMANDLINE = 0x2000 # x
+    SHARED_LIBRARY = 0x4000 # x
 
     STANDARD    = 0x371A # x above means included in STANDARD
     attr_reader :ignore
@@ -261,7 +271,6 @@ module Rake
       @type = UNKNOWN
       @deps = nil
       @transparent_timestamp = false
-      @progress_count = 0
       @ignore = false
       @failure = false
       @output_after_execute = true
@@ -297,21 +306,25 @@ module Rake
           rescue Cxxproject::ExitHelperException
             raise
           rescue Exception => e
-            if prereq and Rake::Task[n].ignore
-              @prerequisites.delete(n)
-              def self.needed?
-                true
-              end
-              return
-            end
-            Cxxproject::Printer.printError "Error #{name}: #{e.message}"
-            if RakeFileUtils.verbose
-              puts e.backtrace
-            end
-            set_failed
-            if e.message.include?('Circular dependency detected')
-              Rake.application.idei.set_abort(true)
-            end
+             if not application.raise_exceptions
+                if prereq and Rake::Task[n].ignore
+                   @prerequisites.delete(n)
+                   def self.needed?
+                      true
+                   end
+                   return
+                end
+                Cxxproject::Printer.printError "Error #{name}: #{e.message}"
+                if RakeFileUtils.verbose == true
+                   puts e.backtrace
+                end
+                set_failed
+                if e.message.include?('Circular dependency detected')
+                   Rake.application.idei.set_abort(true)
+                end
+             else 
+                raise e
+             end
           end
 
         end
@@ -365,18 +378,27 @@ module Rake
       end
     end
 
-    def handle_error(ex1, isSysCmd)
-      if not Rake.application.idei.get_abort()
-        if not isSysCmd
-          Cxxproject::Printer.printError "Error for task #{@name}: #{ex1.message}"
-        end
-      end
-      begin
-        FileUtils.rm(@name) if File.exists?(@name)
-      rescue Exception => ex2
-        Cxxproject::Printer.printError "Error: Could not delete #{@name}: #{ex2.message}"
-      end
-      set_failed
+    def handle_error(exception, isSysCmd)
+       if not application.raise_exceptions
+          if not Rake.application.idei.get_abort()
+             if not isSysCmd
+                Cxxproject::Printer.printError "Error for task #{@name}: #{exception.message}"
+                if Rake.application.options.trace
+                   exception.backtrace.each do |t|
+                      Cxxproject::Printer.printError t
+                   end
+                end
+             end
+          end
+          begin
+             FileUtils.rm(@name) if File.exists?(@name)
+          rescue Exception => follow_up_exception
+             Cxxproject::Printer.printError "Error: Could not delete #{@name}: #{follow_up_exception.message}"
+          end
+          set_failed
+       else
+          raise exception
+       end
     end
 
     def output(name, to_output)

data/lib/cxxproject/plugin_context.rb

@@ -15,10 +15,19 @@ module Cxxproject
   class PluginContext
     include Context
 
-    def initialize(cxxproject2rake, building_blocks, log)
+    def self.create_no_args_context
+      return PluginContext.new(nil, nil, nil, 0)
+    end
+
+    def self.create_three_args_context(cxx, building_blocks, log)
+      return PluginContext.new(cxx, building_blocks, log, 3)
+    end
+
+    def initialize(cxxproject2rake, building_blocks, log, expected_arity)
       @cxxproject2rake = cxxproject2rake
       @building_blocks = building_blocks
       @log = log
+      @expected_arity = expected_arity
     end
 
     # method for plugins to get the
@@ -26,7 +35,16 @@ module Cxxproject
     # building_blocks
     # log
     def cxx_plugin(&blk)
-      blk.call(@cxxproject2rake, @building_blocks, @log)
+      if blk.arity != @expected_arity
+        return
+      end
+    
+      case blk.arity
+      when 0
+        blk.call()
+      when 3
+        blk.call(@cxxproject2rake, @building_blocks, @log)
+      end
     end
 
     # specify a toolchain

data/lib/cxxproject/toolchain/provider.rb

@@ -1,4 +1,5 @@
 require 'cxxproject/toolchain/colorizing_formatter'
+require 'cxxproject/utils/utils'
 
 module Cxxproject
   module Toolchain
@@ -6,6 +7,7 @@ module Cxxproject
     class Provider
       @@settings = {}
       @@default = {
+        :TARGET_OS => Utils::OS.os(),
         :COMPILER =>
         {
           :CPP => {
@@ -65,17 +67,33 @@ module Cxxproject
           :MUST_FLAGS => "",
           :SCRIPT => "",
           :USER_LIB_FLAG => "",
-          :EXE_FLAG => "",
+          :OUTPUT_FLAG => 'output_flag_default',
+          :SHARED_FLAG => 'shared_flag_default',
+          :SONAME_FLAG => 'soname_flag_default',
           :LIB_FLAG => "",
           :LIB_PATH_FLAG => "",
           :LIB_PREFIX_FLAGS => "", # "-Wl,--whole-archive",
           :LIB_POSTFIX_FLAGS => "", # "-Wl,--no-whole-archive",
           :FLAGS => [],
           :MAP_FILE_FLAG => "",
-          :OUTPUT_ENDING => ".exe", # or .elf
+          :OUTPUT_PREFIX => {:EXECUTABLE => '', :SHARED_LIBRARY => {:UNIX => 'lib', :OSX => 'lib'} },
+          :OUTPUT_SUFFIX => {
+            :EXECUTABLE => {
+              :UNIX => '.exe',
+              :OSX => '.exe',
+              :WINDOWS => '.exe'
+            },
+            :SHARED_LIBRARY => {
+              :UNIX => '.so',
+              :OSX => '.dylib',
+              :WINDOWS => '.dll'
+            }
+          },
           :ERROR_PARSER => nil,
-          :START_OF_WHOLE_ARCHIVE => '',
-          :END_OF_WHOLE_ARCHIVE => ''
+          :START_OF_WHOLE_ARCHIVE => {:UNIX => '', :OSX => '', :WINDOWS => ''},
+          :END_OF_WHOLE_ARCHIVE => {:UNIX => '', :OSX => '', :WINDOWS => ''},
+          :ADDITIONAL_COMMANDS => {:OSX => '', :UNIX => ''},
+          :ADDITIONAL_OBJECT_FILE_FLAGS => {:OSX => [], :UNIX => []}
         },
 
         :MAKE =>
@@ -87,6 +105,10 @@ module Cxxproject
           :CLEAN => "clean"
         },
 
+        :ENV =>
+        {
+          :LIB_VAR=> {:UNIX => 'LD_LIBRARY_PATH', :OSX => 'DYLD_LIBRARY_PATH', :WINDOWS => 'PATH'},
+        },
         :CONSOLE_HIGHLIGHTER => ColorizingFormatter.new
       }
 
@@ -121,22 +143,25 @@ module Cxxproject
         @@default
       end
 
-      def self.modify_cpp_compiler(based_on, h)
+      def self.modify_linker(based_on, h)
         chain = @@settings[based_on]
         raise "unknown toolchain: #{based_on}" unless chain
-        chain[:COMPILER][:CPP].update(h)
+        chain[:LINKER].update(h)
         chain
       end
 
-      def self.[](name)
+      def self.modify_compiler(based_on, compiler_type, h)
+        chain = @@settings[based_on]
+        raise "unknown toolchain: #{based_on}" unless chain
+        chain[:COMPILER][compiler_type].update(h)
+        chain
+      end
 
-        if name == "TI"
-          if not ENV['TI_HOME']
-            Printer.printError "Error: Please set TI_HOME"
-            ExitHelper.exit(1)
-          end
-        end
+      def self.modify_cpp_compiler(based_on, h)
+        modify_compiler(based_on, :CPP, h)
+      end
 
+      def self.[](name)
         return @@settings[name] if @@settings.include? name
         nil
       end