build-tool 0.4.3 → 0.4.4

data.tar.gz.sig

@@ -1,2 +1 @@
-Q#^F��Ox�����C<�7���j�1|(%r��f�Re#���7�����"��eQ]��m)�G�߼9���	/$�rEl<|�|j�����
ǯ�t��^߀���A!>�4N>ss���?�^�h��+��x�+M/Xv���
-���g �	�A���t����d;���\�?�d�,�Q�V����=�|֟T��p��MA���i��h�+�F��$H;��N)��5%�D��Hr?���������YMd��ׄnDt�
+Cs�it���`x�=r�x��>DZ�����1I�4Ӿ�Y�	�6���Aq(
�eq袐@Y1=>2�t�`����Xǀ��NՌ11_�0�!_���^x���P�ѩ&t�q"*��fHg�"���L��� ���S�}�¤��j�j`x/öH
"�(

data/History.txt

@@ -1,3 +1,22 @@
+== 0.4.4
+- Enhancements
+  - More ways to specify a module on the command line.
+    - foo matches any module foo disregarding namespaces as long as only one matching module is
+      found. ( kdelibs -> KDE/kdelibs )
+    - foo/ matches any module that has foo/ as a namespace part. 
+      ( kdebase/ -> kdebase/(runtime, workspace, apps )
+  - Implement kdesrc-builds --resume-from feature. Skips all modules before the module specified is
+    found.
+    - kde-build build --resume-from kdebase/runtime KDE/
+    - kde-build build --resume-from runtime KDE/
+  - Build System Qt: Print a message when running bin/synqt after each rebase.
+  - Build System Autotools: Try autoconf to bootstrap. May fail.
+  - Build System Package: Be more verbose about what we do.
+  - CMD: build - If a module is not checked out ignore it when --update is not given on the command line.
+- Bugfix
+  - The command "environment set [env] did set a wrong shell var to the name of the environment
+    set. Use the documented BUILD_TOOL_ENV instead.
+
 == 0.4.3
 - Ruby 1.9 Compatibility.
 

data/Manifest.txt

@@ -19,11 +19,9 @@ 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
 lib/build-tool/cfg/lexer_base.rb
 lib/build-tool/cfg/node.rb
-lib/build-tool/cfg/parser.rb
 lib/build-tool/cfg/parser.y
 lib/build-tool/cfg/visitor.rb
 lib/build-tool/command_actions.rb
@@ -76,7 +74,6 @@ lib/mj/tools/ssh.rb
 lib/mj/tools/subprocess.rb
 lib/mj/vcs/git.rb
 lib/mj/visitor.rb
-tasks/genfiles.rake
 tasks/rspec.rake
 test/commands/test_build.rb
 test/test_build_system.rb

data/Rakefile

@@ -7,6 +7,7 @@ require './lib/build-tool'
 Hoe.plugin :git
 Hoe.plugin :doofus
 Hoe.plugin :debugging
+Hoe.plugin :racc
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
@@ -40,6 +41,8 @@ Hoe.spec( 'build-tool' ) do
     ['racc', ">= 1.4.6"] <<
     ['rexical', ">= 1.0.5"]
 
+  self.rex_flags = ""
+
 end
 
 Dir['tasks/**/*.rake'].each { |t| load t }

data/lib/build-tool.rb

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

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

@@ -69,7 +69,12 @@ def bootstrap
                 end
                 rc
             else
-                raise AutoConfError, "No idea how to bootstrap this project!"
+                logger.trace "Trying autoconf. May fail!!"
+                rc = self.class.execute "autoconf", source_directory, env
+                if rc != 0
+                    raise AutoConfError, "'autoconf' failed with error #{rc}!"
+                end
+                rc
             end
         end
 

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

@@ -43,6 +43,7 @@ def _configure( command, wd = build_directory )
 
         def after_rebase
             if configured?
+                logger.info "Running bin/syncqt"
                 rc = self.class.execute( "bin/syncqt", build_directory, self.module.environment.values )
             end
         end

data/lib/build-tool/commands.rb

@@ -378,7 +378,7 @@ def complete_modules( name, include_templates = false )
                 #   1. name  = mod.name
                 #   2. name/ matches beginning of mod.name
                 #   3. name equals last part of mod.name (behind /) and is unique
-                if name.end_with?('/') and mod.name.index "/#{name}" or mod.name.start_with? name
+                if name.end_with?('/') and ( mod.name.index "/#{name}" or mod.name.start_with? name )
                     found = true
                     # Now check if it is active.
                     next if !( mod.active? || @all )
@@ -413,6 +413,15 @@ def complete_modules( name, include_templates = false )
             return res
         end
 
+        def complete_module( name, include_templates = false )
+            modules = complete_modules( name, include_templates )
+            case modules.size 
+            when 0 then return nil
+            when 1 then return modules[0]
+            else raise UsageError, "#{name} is ambiguous. Please be more specific"
+            end
+        end
+
         def while_logging_to( dir, fname, level, &block )
             got_exception = false
             # Only create a logfile if we do real work
@@ -479,6 +488,15 @@ class ModuleBasedCommand < Standard
         def initialize( *args )
             super( *args )
             @failed_modules = []
+            @resume_from  = nil
+        end
+
+        def initialize_options
+            options.on( "--resume-from [module]", "Skip all module before module." ) { |t|
+                @resume_from = complete_module( t )
+                }
+
+            super
         end
 
         def is_module_ready?( mod )
@@ -521,7 +539,17 @@ def do_execute( args )
 
                     modules.each_with_index do |mod, index|
 
+                        if not @resume_from.nil?
+                            if mod.name == @resume_from.name
+                                @resume_from = nil
+                            else
+                                logger.info "Skipping module #{mod.name} (#{index+1}/#{modules.size})"
+                                next
+                            end
+                        end
+
                         begin
+
                             logger.info ""
                             logger.info "#### Module #{mod.name} (#{index+1}/#{modules.size})"
                             do_execute_module( mod )

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

@@ -74,6 +74,14 @@ def is_module_ready?( mod )
         end # is_module_ready
 
         def do_execute_module( mod )
+
+            if not ( $noop or mod.checkedout? or @update )
+                # If the module is not checked out or $noop is active skip the module
+                logger.warn "Module is not checked out! Use -u to check it out."
+                logger.warn "skipped!"
+                return 0
+            end
+
             if @from_scratch or @clean
                 clean( mod, @from_scratch )
             end
@@ -87,29 +95,21 @@ def do_execute_module( mod )
                 end
             end
 
-            if $noop or mod.checkedout?
-                if @configure or @reconfigure or !mod.configured?
-                    if @reconfigure
-                        reconfigure( mod )
-                    else
-                        # See outer if. @configure or !mod.configured?
-                        configure( mod )
-                    end
-                end
-
-                if @build
-                    make( mod )
-                end
-
-                if @install
-                    install( mod, true )
+            if @configure or @reconfigure or !mod.configured?
+                if @reconfigure
+                    reconfigure( mod )
+                else
+                    # See outer if. @configure or !mod.configured?
+                    configure( mod )
                 end
+            end
 
-            else
-
-                logger.warn "Module is not checked out! Use -u to check it out."
-                logger.warn "skipped!"
+            if @build
+                make( mod )
+            end
 
+            if @install
+                install( mod, true )
             end
 
         end # do_execute_module

data/lib/build-tool/environment.rb

@@ -74,7 +74,7 @@ def set( name, value )
         # the prompt.
         def shell( wd = nil )
             begin
-                ENV['JAM_PROJECT'] = name
+                ENV['BUILD_TOOL_ENV'] = name
                 self.class.adjust_environment( wd, values ) {
                     logger.info "Starting #{ENV['SHELL']}"
                     system( ENV['SHELL'] )
@@ -82,7 +82,7 @@ def shell( wd = nil )
                     return 0;
                 }
             ensure
-                ENV['JAM_PROJECT'] = nil
+                ENV['BUILD_TOOL_ENV'] = nil
             end
         end
 

data/lib/build-tool/vcs/archive.rb

@@ -89,14 +89,14 @@ def clone
         def fetch()
             # Check if the archive is already downloaded
             if File.exist? archive_local_path
-                logger.debug "Archive already fetched. Skipping."
+                logger.trace "Archive already fetched. Skipping."
                 return 0
             end
 
             # If the archive doesn't exist we assume the unpacked archive
             # should not exist too.
             if local_path_exist?
-                logger.debug "We fetch a new archive. Remove the old sources."
+                logger.trace "We fetch a new archive. Remove the old sources."
                 FileUtils.rm_rf local_path if !$noop
             end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  hash: 9
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 3
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Michael Jansen
@@ -36,7 +31,7 @@ cert_chain:
   M3zOaQdtTmiQPBqNIsE=
   -----END CERTIFICATE-----
 
-date: 2011-01-04 00:00:00 +01:00
+date: 2011-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,11 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 4
-        - 3
         version: 1.4.3
   type: :runtime
   version_requirements: *id001
@@ -63,11 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 79
-        segments: 
-        - 3
-        - 18
-        - 0
         version: 3.18.0
   type: :runtime
   version_requirements: *id002
@@ -79,11 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
         version: 1.3.1
   type: :runtime
   version_requirements: *id003
@@ -95,110 +75,86 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
         version: 1.2.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hoe-debugging
+  name: racc
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
-        version: 1.0.1
+        version: 1.4.7
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: hoe-doofus
+  name: hoe-debugging
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 1.0.1
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: hoe-git
+  name: hoe-doofus
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+        version: 1.0.0
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: racc
+  name: hoe-git
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
+        version: 1.3.0
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rexical
+  name: racc
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 0
-        - 5
-        version: 1.0.5
+        version: 1.4.6
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rexical
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
+        version: 1.0.5
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.9.0
+  type: :development
+  version_requirements: *id011
 description: |-
   This project is inspired by kdesrc-build[http://kdesrc-build.kde.org/].
   
@@ -236,11 +192,9 @@ files:
 - 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
 - lib/build-tool/cfg/lexer_base.rb
 - lib/build-tool/cfg/node.rb
-- lib/build-tool/cfg/parser.rb
 - lib/build-tool/cfg/parser.y
 - lib/build-tool/cfg/visitor.rb
 - lib/build-tool/command_actions.rb
@@ -293,7 +247,6 @@ files:
 - lib/mj/tools/subprocess.rb
 - lib/mj/vcs/git.rb
 - lib/mj/visitor.rb
-- tasks/genfiles.rake
 - tasks/rspec.rake
 - test/commands/test_build.rb
 - test/test_build_system.rb
@@ -310,6 +263,7 @@ files:
 - test/test_ssh_key.rb
 - test/test_svn_parser.rb
 - test/test_vcs.rb
+- .gemtest
 has_rdoc: true
 homepage: http://michael-jansen.biz/build-tool
 licenses: []
@@ -325,23 +279,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: build-tool
-rubygems_version: 1.4.1
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: This project is inspired by kdesrc-build[http://kdesrc-build.kde.org/]