rake-builder 0.0.12 → 0.0.13

data/Rakefile

@@ -23,6 +23,7 @@ spec = Gem::Specification.new do |s|
   s.homepage         = 'http://github.com/joeyates/rake-builder'
   s.author           = 'Joe Yates'
   s.email            = 'joe.g.yates@gmail.com'
+  s.rubyforge_project = 'nowarning'
 
   s.files            = ADMIN_FILES +
                        SOURCE_FILES +

data/lib/compiler.rb

@@ -0,0 +1,84 @@
+
+module Compiler
+
+  class Base
+    EXTRA_PATHS = [ '/opt/local/include' ]
+
+    def self.for( compiler )
+      COMPILERS[ compiler ].new
+    end
+
+    def initialize
+      @paths = {}
+    end
+
+    def include_paths( headers )
+      paths = []
+      headers.each do | header |
+        path = find_header( header )
+        raise "Can't find header '#{ header }' in any known include path" if path.nil?
+        paths << path
+      end
+      paths.uniq
+    end
+
+    private
+
+    def find_header( header )
+      EXTRA_PATHS.each do | path |
+        if File.exist?( "#{ path }/#{ header }" )
+          return path
+        end
+      end
+      nil
+    end
+
+  end
+
+  class GCC < Base
+
+    def self.framework_path( framework, qt_major )
+      "/Library/Frameworks/#{ framework }.framework/Versions/#{ qt_major }/Headers"
+    end
+
+    def default_include_paths( language )
+      return @paths[ language ] if @paths[ language ]
+
+      paths = []
+      # Below is the recommended(!) way of getting standard serach paths from GCC
+      output = `echo | gcc -v -x #{ language } -E - 2>&1 1>/dev/null`
+      collecting = false
+      output.each_line do | line |
+        case
+        when line =~ /#include <\.\.\.> search starts here:/
+          collecting = true
+        when line =~ /End of search list\./
+          collecting = false
+        when line =~ / \(framework directory\)/
+          # Skip frameworks
+        else
+          paths << line.strip if collecting
+        end
+      end
+
+      @paths[ language ] = paths
+    end
+
+    def missing_headers( include_paths, source_files )
+      include_path = include_paths.map { | path | "-I#{ path }" }.join( ' ' )
+      command      = "makedepend -f- -- #{ include_path } -- #{ source_files.join( ' ' ) } 2>&1 1>/dev/null"
+      output       = `#{ command }`
+      missing      = []
+      output.each_line do | line |
+        match = line.match( /cannot find include file "([^"]*)"/m )
+        missing << match[ 1 ] if match
+      end
+
+      missing
+    end
+
+  end
+
+  COMPILERS = { :gcc => GCC }
+
+end

data/lib/rake/builder/qt_builder.rb

@@ -8,10 +8,10 @@ module Rake
     #   generate Info.plist
     #   package task
 
+    attr_accessor :qt_version
     attr_accessor :frameworks
     attr_accessor :resource_files
-    attr_accessor :qt_version
-    attr_accessor :architecture
+    attr_accessor :ui_files
 
     def initialize( &block )
       super( &block )
@@ -25,11 +25,20 @@ module Rake
       super
       @programming_language  = 'c++'
       @header_file_extension = 'h'
-      @frameworks            = [ 'QtGui', 'QtCore' ]
-      @framework_paths       = [ '/Library/Frameworks' ]
-      @compilation_defines   = '-DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED'
-      @moc_defines           = '-D__APPLE__ -D__GNUC__'
+      @frameworks            = []
+      case
+      when RUBY_PLATFORM =~ /linux$/
+        @include_paths         << '/usr/include/qt4'
+        @moc_defines           = [ '-D__GNUC__' ]
+      when RUBY_PLATFORM =~ /darwin/i
+        @framework_paths       = [ '/Library/Frameworks' ]
+        @moc_defines           = [ '-D__APPLE__',  '-D__GNUC__' ]
+      else
+        raise "Unrecognised platform"
+      end
+      @compilation_defines   = [ '-DQT_GUI_LIB', '-DQT_CORE_LIB', '-DQT_SHARED' ]
       @resource_files        = []
+      @ui_files              = []
     end
 
     def configure
@@ -39,37 +48,83 @@ module Rake
       super
 
       @resource_files      = Rake::Path.expand_all_with_root( @resource_files, @rakefile_path )
+      @ui_files            = Rake::Path.expand_all_with_root( @ui_files, @rakefile_path )
       @compilation_options += [ '-pipe', '-g', '-gdwarf-2', '-Wall', '-W' ]
-      @compilation_options.uniq!
-      @architecture        ||= 'i386'
-      @compilation_options += [ architecture_option ]
-
-      @frameworks.each do | framework |
-        @include_paths << "/Library/Frameworks/#{ framework }.framework/Versions/#{ qt_major }/Headers"
-        @include_paths << "/usr/include/#{ framework }"
-      end
+      @include_paths << @objects_path # for UI headers
     end
 
     def define
       super
+      define_ui_tasks
       define_moc_tasks
       define_resource_tasks
     end
 
     def generated_files
-      super + moc_files + qrc_files
+      super + moc_files + ui_headers + qrc_files
+    end
+
+    def generated_headers
+      super + ui_headers
     end
 
     def source_files
       ( super + moc_files + qrc_files ).uniq
     end
 
+    def header_files
+      ( super + ui_headers ).uniq
+    end
+
     def compiler_flags
-      [ compilation_options.join( ' ' ), @compilation_defines, include_path, framework_path_list ].join( ' ' )
+      flags = compilation_options + @compilation_defines + [ include_path ]
+      if RUBY_PLATFORM =~ /darwin/i
+        flags += framework_paths
+        flags << architecture_option
+      end
+      flags.join( ' ' )
     end
 
     def link_flags
-      [ '-headerpad_max_install_names', architecture_option, @linker_options, library_paths_list, library_dependencies_list, framework_path_list, framework_list ].join( " " )
+      flags = [ @linker_options, library_paths_list, library_dependencies_list ]
+      if RUBY_PLATFORM =~ /darwin/i
+        flags += [ '-headerpad_max_install_names', architecture_option ]
+        flags += framework_paths + framework_options
+      end
+      flags.join( ' ' )
+    end
+
+    # Exclude paths like QtFoo/Bar, but grab frameworks
+    def missing_headers
+      super
+      @missing_headers.reject! do | path |
+        m = path.match( /^(Qt\w+)\/(\w+?(?:\.h)?)$/ )
+        if m
+          framework      = m[ 1 ]
+          @frameworks << framework
+          framework_path = Compiler::GCC.framework_path( framework, qt_major )
+          header_path    = "#{ framework_path }/#{ m[ 2 ] }"
+          File.exist?( header_path )
+        else
+          false
+        end
+      end
+
+      @frameworks.each do | framework |
+        @include_paths << Compiler::GCC.framework_path( framework, qt_major )
+        @include_paths << "/usr/include/#{ framework }"
+      end
+
+      # Last chance: exclude headers of the form 'Aaaaaa' if found under frameworks
+      @missing_headers.reject! do | header |
+        @frameworks.any? do | framework |
+          framework_path = Compiler::GCC.framework_path( framework, qt_major )
+          header_path    = "#{ framework_path }/#{ header }"
+          File.exist?( header_path )
+        end
+      end
+
+      @missing_headers
     end
 
     # QT-specific
@@ -78,18 +133,38 @@ module Rake
       @qt_version.match( /^(\d+)/ )[ 1 ]
     end
 
-    def architecture_option
-      "-arch #{ @architecture }"
+    def framework_paths
+      @framework_paths.map { |p| "-F#{ p }" }
+    end
+
+    def framework_options
+      @frameworks.map { |p| "-framework #{ p }" }
     end
 
-    def framework_path_list
-      @framework_paths.map { |p| "-F#{ p }" }.join( " " )
+    # UI
+    # /Developer/Tools/Qt/uic ../scanner_cpp/mainwindow.ui -o ui_mainwindow.h
+
+    def define_ui_tasks
+      @ui_files.each do | ui_file |
+        ui_header = ui_header_path( ui_file )
+        file ui_header => [ @objects_path, ui_file ] do |t|
+          command = "uic #{ ui_file } -o #{ ui_header }"
+          shell command
+        end
+      end
     end
 
-    def framework_list
-      @frameworks.map { |p| "-framework #{ p }" }.join( " " )
+    def ui_headers
+      @ui_files.collect do | ui_file |
+        ui_header_path( ui_file )
+      end
+    end
+
+    def ui_header_path( ui_file )
+      header_name = 'ui_' + File.basename( ui_file ).gsub( '.ui', '.h' )
+      Rake::Path.expand_with_root( header_name, @objects_path )
     end
-    
+
     # MOC
 
     def define_moc_tasks
@@ -98,7 +173,10 @@ module Rake
         moc         = moc_pathname( header_file )
 
         file moc => [ header_file ] do |t|
-          command = "moc #{ @compilation_defines } #{ framework_path_list } #{ @moc_defines } #{ header_file } -o #{ moc }"
+          options = @compilation_defines
+          options += framework_paths if RUBY_PLATFORM =~ /darwin/i
+          options += @moc_defines
+          command = "moc #{ options.join( ' ' ) } #{ header_file } -o #{ moc }"
           shell command
         end
 

data/lib/rake/builder.rb

@@ -5,6 +5,7 @@ require 'rake'
 require 'rake/tasklib'
 require 'rake/path'
 require 'rake/file_task_alias'
+require 'compiler'
 
 module Rake
 
@@ -23,8 +24,8 @@ module Rake
     module VERSION #:nodoc:
       MAJOR = 0
       MINOR = 0
-      TINY  = 12
- 
+      TINY  = 13
+
       STRING = [ MAJOR, MINOR, TINY ].join('.')
     end
 
@@ -39,7 +40,10 @@ module Rake
     # The types of file that can be built
     TARGET_TYPES = [ :executable, :static_library, :shared_library ]
 
-    # The programming language: 'c++' or 'c' (default 'c++')
+    # processor type: 'i386', 'x86_64', 'ppc' or 'ppc64'.
+    attr_accessor :architecture
+
+    # The programming language: 'c++', 'c' or 'objective-c' (default 'c++')
     # This also sets defaults for source_file_extension
     attr_accessor :programming_language
 
@@ -165,6 +169,8 @@ module Rake
     end
 
     def initialize_attributes
+      @architecture          = 'i386'
+      @compiler_data         = Compiler::Base.for( :gcc )
       @logger                = Logger.new( STDOUT )
       @logger.level          = Logger::UNKNOWN
       @logger.formatter      = Formatter.new
@@ -179,9 +185,13 @@ module Rake
       @target                = 'a.out'
       @generated_files       = []
       @compilation_options   = []
+      @include_paths         = []
     end
 
     def configure
+      @compilation_options   += [ architecture_option ] if RUBY_PLATFORM =~ /apple/i
+      @compilation_options.uniq!
+
       @programming_language.downcase!
       raise "Don't know how to build '#{ @programming_language }' programs" if KNOWN_LANGUAGES[ @programming_language ].nil?
       @compiler              ||= KNOWN_LANGUAGES[ @programming_language ][ :compiler ]
@@ -201,7 +211,8 @@ module Rake
       @install_path          ||= default_install_path( @target_type )
 
       @linker_options        ||= ''
-      @include_paths         ||= @header_search_paths.dup
+      @include_paths         += []
+      @include_paths         = Rake::Path.expand_all_with_root( @include_paths.uniq, @rakefile_path )
       @generated_files       = Rake::Path.expand_all_with_root( @generated_files, @rakefile_path )
 
       @default_task          ||= :build
@@ -209,32 +220,9 @@ module Rake
 
       @makedepend_file       = @objects_path + '/.' + target_basename + '.depend.mf'
 
-      load_local_config
-
-      @include_paths         = Rake::Path.expand_all_with_root( @include_paths, @rakefile_path )
-
       raise "No source files found" if source_files.length == 0
     end
 
-    def local_config
-      filename = '.rake-builder'
-      filename += '.' + @task_namespace.to_s if @task_namespace
-      Rake::Path.expand_with_root( filename, @rakefile_path )
-    end
-
-    def load_local_config
-      return if ! File.exist?( local_config )
-
-      config = YAML.load_file( local_config )
-
-      version = config[ :rake_builder ][ :config_file ][ :version ]
-      raise "Config file version missing" if version.nil?
-
-      @include_paths += config[ :include_paths ] if config[ :include_paths ]
-    rescue => e
-      raise "#{__FILE__}:#{__LINE__}: Failed to load local config file '#{ local_config }': #{ e.message }"
-    end
-
     def define_tasks
       if @task_namespace
         namespace @task_namespace do
@@ -287,12 +275,38 @@ module Rake
 
       directory @objects_path
 
-      file @makedepend_file => [ @objects_path, *project_files ] do
+      file local_config => scoped_task( :missing_headers ) do
+        added_includes   = @compiler_data.include_paths( missing_headers )
+        config           = { :rake_builder  => { :config_file => { :version=> '1.0' } },
+                             :include_paths => added_includes }
+        File.open( local_config, 'w' ) do | file |
+          file.write config.to_yaml
+        end
+      end
+
+      file @makedepend_file => [ scoped_task( :load_local_config ),
+                                 scoped_task( :missing_headers ),
+                                 @objects_path,
+                                 *project_files ] do
         @logger.add( Logger::DEBUG, "Analysing dependencies" )
         command = "makedepend -f- -- #{ include_path } -- #{ file_list( source_files ) } 2>/dev/null > #{ @makedepend_file }"
         shell command
       end
 
+      task :load_local_config => local_config do
+        config = YAML.load_file( local_config )
+
+        version = config[ :rake_builder ][ :config_file ][ :version ]
+        raise "Config file version missing" if version.nil?
+
+        config[ :include_paths ] ||= []
+        @include_paths += Rake::Path.expand_all_with_root( config[ :include_paths ], @rakefile_path )
+      end
+
+      task :missing_headers => [ *generated_headers ] do
+        missing_headers
+      end
+
       # Reimplemented mkdepend file loading to make objects depend on
       # sources with the correct paths:
       # the standard rake mkdepend loader doesn't do what we want,
@@ -355,6 +369,10 @@ module Rake
       end
     end
 
+    def generated_headers
+      []
+    end
+
     def scoped_task( task )
       if @task_namespace
         "#{ task_namespace }:#{ task }"
@@ -368,7 +386,8 @@ module Rake
       @generated_files << object
       file object => [ source ] do |t|
         @logger.add( Logger::INFO, "Compiling '#{ source }'" )
-        shell "#{ @compiler } -c #{ compiler_flags } -o #{ object } #{ source }"
+        command = "#{ @compiler } -c #{ compiler_flags } -o #{ object } #{ source }"
+        shell command
       end
     end
 
@@ -395,6 +414,15 @@ module Rake
       end
     end
 
+    # Discovery
+
+    def missing_headers
+      return @missing_headers if @missing_headers
+      default_includes = @compiler_data.default_include_paths( @programming_language )
+      all_includes     = default_includes + @include_paths
+      @missing_headers = @compiler_data.missing_headers( all_includes, source_files )
+    end
+
     # Compiling and linking parameters
 
     def include_path
@@ -402,21 +430,34 @@ module Rake
     end
 
     def compiler_flags
-      include_path + ' ' + compilation_options.join( " " )
+      flags = include_path + ' ' + compilation_options.join( ' ' )
+      flags << ' ' << architecture_option if RUBY_PLATFORM =~ /darwin/i
+      flags
+    end
+
+    def architecture_option
+      "-arch #{ @architecture }"
     end
 
     def link_flags
-      [ @linker_options, library_paths_list, library_dependencies_list ].join( " " )
+      flags = [ @linker_options, architecture_option, library_paths_list, library_dependencies_list ]
+      flags << architecture_option if RUBY_PLATFORM =~ /darwin/i
+      flags.join( " " )
     end
 
     # Paths
 
+    def local_config
+      filename = '.rake-builder'
+      Rake::Path.expand_with_root( filename, @rakefile_path )
+    end
+
     def save_rakefile_info( block )
       if RUBY_VERSION < '1.9'
         # Hack the path from the block String representation
         @rakefile = block.to_s.match( /@([^\:]+):/ )[ 1 ]
       else
-        @rakefile = block.source_location
+        @rakefile = block.source_location[ 0 ]
       end
       @rakefile_path = File.expand_path( File.dirname( @rakefile ) )
     end
@@ -455,8 +496,8 @@ module Rake
       source_files + header_files
     end
 
-    def file_list( files )
-      files.join( " " )
+    def file_list( files, delimiter = ' ' )
+      files.join( delimiter )
     end
     
     def library_paths_list

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rake-builder
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Joe Yates
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 +01:00
+date: 2011-02-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,7 @@ extensions: []
 extra_rdoc_files: 
 - COPYING
 - README.rdoc
+- lib/compiler.rb
 - lib/rake/builder/qt_builder.rb
 - lib/rake/builder.rb
 - lib/rake/file_task_alias.rb
@@ -59,6 +60,7 @@ files:
 - COPYING
 - Rakefile
 - README.rdoc
+- lib/compiler.rb
 - lib/rake/builder/qt_builder.rb
 - lib/rake/builder.rb
 - lib/rake/file_task_alias.rb
@@ -131,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: nowarning
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3