build-tool 0.3 → 0.3.1

data/History.txt

@@ -1,3 +1,11 @@
+== 0.3.1
+- Main Features
+  - BuildSystem: QMake support
+- Bugfixes
+  - Fix the gc command
+  - Fix the installation comment on gem update/install
+
+
 == 0.3
 - Main Features
   * Split the recipes from the gem

data/Manifest.txt

@@ -15,6 +15,7 @@ lib/build-tool/build-system/cmake.rb
 lib/build-tool/build-system/custom.rb
 lib/build-tool/build-system/kdel10n.rb
 lib/build-tool/build-system/none.rb
+lib/build-tool/build-system/qmake.rb
 lib/build-tool/build-system/qt.rb
 lib/build-tool/cfg/lexer.rb
 lib/build-tool/cfg/lexer.rex

data/Rakefile

@@ -14,8 +14,9 @@ Hoe.spec( 'build-tool' ) do |build_tool|
   build_tool.developer 'Michael Jansen', 'info@michael-jansen.biz'
   build_tool.post_install_message = <<-EOS
     To start with build-tool try the following commands:
+    > build-tool recipe add git://gitorious.org/build-tool/kde-trunk-recipe.git kde
     > build-tool recipe list
-    > build-tool recipe install <recipe>
+    > build-tool recipe install kde
 
     For documentation see http://michael-jansen.biz/build-tool
 

data/lib/build-tool.rb

@@ -2,6 +2,6 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module BuildTool
-  VERSION = '0.3'
+  VERSION = '0.3.1'
 end
 

data/lib/build-tool/build-system/qmake.rb

@@ -0,0 +1,110 @@
+require 'mj/tools/subprocess'
+require 'build-tool/build-system/base'
+
+module BuildTool; module BuildSystem
+
+    #
+    # QMake build system.
+    #
+    class QMake < Base
+
+        include MJ::Tools::SubProcess
+
+        class MakeError < BuildTool::Error; end
+        class QMakeError < BuildTool::Error; end
+
+        def initialize( *args )
+            super( *args )
+        end
+
+        #
+        ### ATTRIBUTES
+        #
+
+        # Check if the module is configured
+        def configured?
+            Pathname.new( build_directory ).join( 'Makefile' ).exist?
+        end
+
+        def name
+            "qmake"
+        end
+
+        #
+        ### METHODS
+        #
+
+        def[]( var )
+            if @options.has_key? var
+                return @options[var]
+            end
+
+            # case var
+
+
+            # else
+                # *TODO* raise correct exception
+                raise NotImplementedError
+
+            # end
+        end
+
+        def[]=( var, val )
+            @options[var] = val
+        end
+
+        # Configure the module
+        def reconfigure()
+            configure
+        end
+
+        # Execute a qmake command in the context of the build directory
+        def qmake( command, wd = build_directory )
+            rc = self.class.execute "qmake #{command}", wd, env
+            if rc != 0
+                raise QMakeError, "qmake failed with error #{rc}!"
+            end
+            rc
+        end
+
+        def configure
+            check_build_directory( true )
+            opt = option_string
+            opt += " PREFIX=#{install_prefix.to_s}" if install_prefix
+            rc = qmake "#{source_directory}/*.pro #{opt}"
+            rc
+        end
+
+        def do_make( target = nil )
+            rc = self.class.execute( "make #{target ? target : "" }", build_directory, self.module.environment.values )
+            if rc != 0
+                raise MakeError, "make #{target || "" } failed with error code #{rc}";
+            end
+            rc
+        end
+
+        def install( fast )
+            make( "install" )
+        end
+
+        def install_fast_supported?
+            false
+        end
+
+        def make( target = nil )
+            do_make( target )
+        end
+
+        def option_string
+            arr = []
+            @options.each do |var, val|
+                arr << "#{var}='#{val}'"
+            end
+            arr.join(" ")
+        end
+
+    end # class QMake
+
+
+end; end # module BuildTool::BuildSystem
+

data/lib/build-tool/commands/gc.rb

@@ -37,8 +37,8 @@ module BuildTool; module Commands;
                     if $noop
                         say "rm -rf #{cmd.logdir}"
                     else
-                        debug("Removing #{cmd.logdir}");
-                        File.rm_rf( cmd.logdir ) if File.exist?( cmd.logdir )
+                        logger.debug("Removing #{cmd.logdir}");
+                        FileUtils.rm_rf( cmd.logdir ) if File.exist?( cmd.logdir )
                     end
                 end
                 cmd.delete

data/lib/build-tool/commands/recipes/incoming.rb

@@ -7,7 +7,7 @@ module BuildTool; module Commands; module Recipes
     #
     # BuildCommand
     #
-    class Fetch < Standard
+    class Incoming < Standard
 
         name        "incoming"
         description "Show the incoming changes to the recipe from the repository."
@@ -41,7 +41,7 @@ module BuildTool; module Commands; module Recipes
 
             if @fetch
                 say "Fetching"
-                repo.fetch()
+                repo.fetch("origin")
             end
 
             repo.log("HEAD..origin/master").each do |line|

data/lib/build-tool/configuration.rb

@@ -10,6 +10,7 @@ require 'build-tool/build-system/autoconf'
 require 'build-tool/build-system/custom'
 require 'build-tool/build-system/none'
 require 'build-tool/build-system/kdel10n'
+require 'build-tool/build-system/qmake'
 
 
 module BuildTool

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  version: "0.3"
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Michael Jansen
@@ -35,7 +36,7 @@ cert_chain:
   M3zOaQdtTmiQPBqNIsE=
   -----END CERTIFICATE-----
 
-date: 2010-06-24 00:00:00 +02:00
+date: 2010-07-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -173,12 +174,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 2
         - 6
-        - 0
-        version: 2.6.0
+        - 1
+        version: 2.6.1
   type: :development
   version_requirements: *id009
 description: |-
@@ -214,6 +215,7 @@ files:
 - lib/build-tool/build-system/custom.rb
 - lib/build-tool/build-system/kdel10n.rb
 - lib/build-tool/build-system/none.rb
+- lib/build-tool/build-system/qmake.rb
 - lib/build-tool/build-system/qt.rb
 - lib/build-tool/cfg/lexer.rb
 - lib/build-tool/cfg/lexer.rex
@@ -293,7 +295,7 @@ has_rdoc: true
 homepage: http://michael-jansen.biz/build-tool
 licenses: []
 
-post_install_message: "    To start with build-tool try the following commands:\n    > build-tool recipe list\n    > build-tool recipe install <recipe>\n\n    For documentation see http://michael-jansen.biz/build-tool\n\n"
+post_install_message: "    To start with build-tool try the following commands:\n    > build-tool recipe add git://gitorious.org/build-tool/kde-trunk-recipe.git kde\n    > build-tool recipe list\n    > build-tool recipe install kde\n\n    For documentation see http://michael-jansen.biz/build-tool\n\n"
 rdoc_options: 
 - --main
 - README.txt