makeconf 0.1.0 → 0.2.0

data/lib/makeconf.rb

@@ -95,7 +95,7 @@ class Makeconf
        end
 
        opts.on_tail('-V', '--version', 'Display version information and exit') do
-         puts "Makeconf $Id: makeconf.rb 295 2012-11-10 17:55:29Z mheily $"
+         puts "Makeconf $Id: makeconf.rb 301 2012-11-17 16:47:04Z mheily $"
          exit
        end
     end
@@ -124,8 +124,14 @@ class Makeconf
     end
   end
 
+  # Adjust the log level to increase debugging output
+  def log_level=(level)
+    @@logger.level = level
+  end
+
   # Examine the operating environment and set configuration options
-  def configure
+  def configure(project = nil)
+    @project = project unless project.nil?
 
     @@logger.info 'Configuring the project'
     # FIXME: once the GUI is finished, it should just be
@@ -142,7 +148,7 @@ class Makeconf
     raise ArgumentError unless options.kind_of?(Hash)
     options.each do |k,v|
       case k
-      when :minimum_version
+      when :minimum_version, :log_level
         send(k.to_s + '=',v)
       else
         raise ArgumentError, "Unknown argument #{k}"
@@ -201,13 +207,6 @@ class Makeconf
     makefile.add_rule('install', Platform.is_windows? ?
             'dir $(DESTDIR)' + Platform.dev_null :
             '/usr/bin/test -e $(DESTDIR)')
-
-    # Distribute Makeconf with 'make distdir'
-    makefile.distribute([
-            'configure', 
-            'makeconf/*.rb',
-            'makeconf/makeconf/*.rb',
-     ])
   end
 
 end

data/lib/makeconf/baseproject.rb

@@ -28,6 +28,7 @@ class BaseProject
     @license_file = nil
     @author = 'Unknown author'
     @config_h = 'config.h'
+    @config_h_rules = [] # Makefile rules to generate config.h
     @header = {}        # Hash of system header availablity
     @build = []         # List of items to build
     @distribute = []    # List of items to distribute
@@ -35,6 +36,7 @@ class BaseProject
     @target = []        # List of additional Makefile targets
     @decls = {}         # List of declarations discovered via check_decl()
     @funcs = {}         # List of functions discovered via check_func()
+    @defs = {}          # Custom preprocessor macro definitions
     @packager = Packager.new(self)
     @cc = nil
 
@@ -166,6 +168,17 @@ class BaseProject
     # Add custom targets
     @target.each { |t| makefile.add_target t }
 
+    # Add the config.h target
+    @config_h_rules.unshift \
+        '@echo "/* AUTOMATICALLY GENERATED -- DO NOT EDIT */" > config.h.tmp',
+        '@date > config.log'
+    @config_h_rules.push \
+        '@rm -f conftest.c conftest.o',
+        '@mv config.h.tmp ' + @config_h
+    makefile.add_target Target.new('config.h', [], @config_h_rules) 
+
+    makefile.distribute 'Makefile'
+
     makefile
   end
 
@@ -175,35 +188,77 @@ class BaseProject
     @install.each { |x| @installer.install x }
   end
 
+  # Check if a system header file is available
+  def check_header(headers)
+      headers = [ headers ] if headers.kind_of? String
+      throw ArgumentError unless headers.kind_of? Array
+      rc = true
+
+      headers.each do |header|
+        printf "checking for #{header}... "
+        @header[header] = @cc.check_header(header)
+        if @header[header]
+          puts 'yes'
+        else
+          puts 'no'
+          rc = false
+        end
+      end
+
+      rc
+  end
+
   # Check if a system header declares a macro or symbol
-  def check_decl(header,decl)
-      throw ArgumentError unless header.kind_of? String
+  def check_decl(decl, opt = { :include => 'stdlib.h' })
       decl = [ decl ] if decl.kind_of? String
       throw ArgumentError unless decl.kind_of? Array
-
-       @cc ||= CCompiler.new() #FIXME: stop this
+      rc = true
 
       decl.each do |x|
         next if @decls.has_key? x
         printf "checking whether #{x} is declared... "
-        @decls[x] = @cc.test_compile "#define _GNU_SOURCE\n#include <#{header}>\nint main() { #{x}; }"
-        puts @decls[x] ? 'yes' : 'no'
+        source = [
+         "#define _GNU_SOURCE",
+         "#include <#{opt[:include]}>",
+         "int main() { #{x}; }"
+         ].join("\n")
+        @decls[x] = @cc.test_compile(source)
+        if @decls[x]
+          puts 'yes'
+        else
+          puts 'no'
+          rc = false
+        end
       end
+
+      rc
   end
 
   # Check if a function is available in the standard C library
   # TODO: probably should add :ldadd when checking..
-  def check_func(func)
+  def check_function(func, *arg)
       func = [ func ] if func.kind_of? String
       throw ArgumentError unless func.kind_of? Array
+      rc = true
 
-       @cc ||= CCompiler.new() #FIXME: stop this
       func.each do |x|
         next if @funcs.has_key? x
         printf "checking for #{x}... "
         @funcs[x] = @cc.test_link "void *#{x}();\nint main() { void *p;\np = &#{x}; }"
-        puts @funcs[x] ? 'yes' : 'no'
+        if @funcs[x] 
+          puts 'yes'
+        else
+          puts 'no'
+          rc = false
+        end
       end
+
+      rc
+  end
+
+  # Define a C preprocessor symbol 
+  def define(id,value)
+    @defs[id] = value
   end
 
   def add_binary(options)
@@ -343,6 +398,7 @@ class BaseProject
     @header.keys.sort.each { |k| buf["HAVE_#{k}".upcase] = @header[k] }
     @decls.keys.sort.each { |x| buf["HAVE_DECL_#{x}".upcase] = @decls[x] }
     @funcs.keys.sort.each { |x| buf["HAVE_#{x}".upcase] = @funcs[x] }
+    @defs.keys.sort.each { |x| buf[x] = @defs[x] }
 
     puts 'creating ' + ofile
     f = File.open(ofile, 'w')
@@ -353,7 +409,7 @@ class BaseProject
       if v == true
         f.printf "#define #{id} 1\n"
       else
-        f.printf "#undef  #{id}\n" 
+        f.printf "/* #undef  #{id} */\n" 
       end
     end
     f.close
@@ -382,5 +438,4 @@ class BaseProject
     end
     return false
   end    
-
 end

data/lib/makeconf/buildable.rb

@@ -180,7 +180,7 @@ class Buildable
       @ldadd = [ @ldadd ] if @ldadd.kind_of?(String)
       @ldadd.each { |lib| ld.library lib }
 
-      makefile.add_target(obj, [src, localdep[src]].flatten, cc.rule)
+      makefile.add_target(obj, [@project.config_h, src, localdep[src]].flatten, cc.rule)
       makefile.clean(obj)
       objs.push obj
     end

data/lib/makeconf/compiler.rb

@@ -4,7 +4,7 @@ class Compiler
 
   require 'tempfile'
 
-  attr_accessor :sysroot
+  attr_accessor :sysroot, :output
   attr_reader :ld
 
   def initialize(language, extension)
@@ -55,11 +55,6 @@ class Compiler
     @quiet = b
   end
 
-  def output=(s)
-    @output = s
-    ld.output = s
-  end
-
   def makefile
     m = Makefile.new
     m.define_variable('CC', ':=', @path)
@@ -69,7 +64,7 @@ class Compiler
 
   # Return the command formatted as a Makefile rule
   def rule
-    [ '$(CC)', '-c', flags, '$(CFLAGS)', @sources ].flatten.join(' ')
+    [ '$(CC)', '-DHAVE_CONFIG_H', flags, '$(CFLAGS)', '-c', @sources ].flatten.join(' ')
   end
 
   # Return the complete command line to compile an object
@@ -99,7 +94,7 @@ class Compiler
 # return [ @path, cflags, '-combine', ldflags, inputs, ldadd ].flatten.join(' ')
 #
     
-    cmd = [ @path, '-c', flags, @sources ].flatten.join(' ')
+    cmd = [ @path, '-DHAVE_CONFIG_H', flags, '-c', @sources ].flatten.join(' ')
 
     cmd += Platform.dev_null if @quiet
 
@@ -197,31 +192,49 @@ class Compiler
   # Run the compilation command
   def compile
     cmd = self.command
+#puts ' + ' + cmd
     log.debug "Invoking the compiler"
     rc = Platform.execute cmd
     log.debug "Compilation complete; rc=#{rc.to_s}"
+    rc
+  end
+
+  # Run the link command
+  def link
+    throw 'Invalid linker' unless @ld.is_a?(Linker)
+    throw 'One or more source files are required' unless @sources.length > 0
+    cmd = @ld.command
+    log.debug "Invoking the linker: " + cmd
+    rc = Platform.execute cmd
+    log.debug "Linking complete; rc=#{rc.to_s}"
+    rc
   end
 
   # Compile a test program
   def test_compile(code, stage = :compile)
+    log.debug "Testing compilation of:\n" + code
 
     # Write the code to a temporary source file
     f = Tempfile.new(['test_compile', @extension]);
     f.print code
     f.flush
-###objfile = f.path + '.out'
 
     # Run the compiler
     cc = self.clone
     cc.sources = f.path
-###    cc.output = objfile
-    cc.flags += '-o /dev/null' #FIXME: /dev/null not portable
+    cc.output = f.path.sub(/\.c$/, '.o')
     cc.quiet = true
     rc = cc.compile
 
-    # Delete the object file
-    objfile = File.basename( f.path.sub(@extension, '.o') )
-    File.unlink(objfile) if File.exist? objfile
+    # (Optional) Run the linker
+    if (rc == true and stage == :combined)
+      cc.ld.quiet = true
+      rc = cc.link
+      File.unlink(cc.ld.output) if File.exist? cc.ld.output
+    end
+
+    # Delete the output file(s)
+    File.unlink(cc.output) if File.exist? cc.output
 
     return rc
   end

data/lib/makeconf/linker.rb

@@ -8,7 +8,7 @@ class Linker
   def initialize
     @flags = []
     @objects = []
-    @output = nil
+    @output = 'a.out'
     @shared_library = false
     @ldadd = []
     @quiet = false          # If true, output will be suppressed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makeconf
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies: []
 description: An alternative to GNU autoconf/automake/libtool/etc
 email: mark@heily.com
@@ -37,7 +37,7 @@ files:
 - lib/makeconf/externalproject.rb
 - lib/makeconf/systemtype.rb
 - lib/makeconf/androidproject.rb
-homepage: http://mark.heily.com/project/makeconf
+homepage: http://sourceforge.net/p/makeconf
 licenses: []
 post_install_message: 
 rdoc_options: []