build-tool 0.5.7 → 0.6.0.rc1

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+require 'mj/tools/subprocess'
 require 'build-tool/build-system/make'
 
 module BuildTool; module BuildSystem
@@ -91,14 +93,6 @@ def configure
             rc
         end
 
-        def install( fast )
-            make( "install" )
-        end
-
-        def install_fast_supported?
-            true
-        end
-
         def make( target = nil )
             Make.make( "#{target ? target : "" }", build_directory, self.module.environment.values )
         end

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

@@ -1,4 +1,7 @@
+# -*- coding: UTF-8 -*-
+
 require 'build-tool/errors'
+require 'mj/logging'
 
 module BuildTool; module BuildSystem
 
@@ -250,7 +253,11 @@ def recipe
         end
 
         def remove_build_directory
-            self.class.execute "rm -rf #{build_directory}"
+            FileUtils.rm_rf( build_directory, :noop => $noop )
+        end
+
+        def remove_source_directory
+            FileUtils.rm_rf( source_directory, :noop => $noop )
         end
 
     end # class Base
@@ -270,14 +277,15 @@ def write( event )
                     @pbar = nil
                     @oldlogger.append( event )
                 rescue Exception => e
-                    puts e
+                    logger.error( e )
+                    logger.verbose( e.backtrace.join( "\n" ) )
                 end
             else
                 begin
                     grep_progress( message )
                 rescue Exception => e
-                    puts e
-                    puts e.backtrace
+                    logger.error( e )
+                    logger.verbose( e.backtrace.join( "\n" ) )
                 end
             end
             self

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'mj/tools/subprocess'
 require 'build-tool/build-system/base'
 require 'build-tool/build-system/make'

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'mj/tools/subprocess'
 require 'build-tool/build-system/base'
 

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'mj/tools/subprocess'
 require 'build-tool/build-system/base'
 

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'mj/tools/subprocess'
 
 

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'mj/tools/subprocess'
 require 'build-tool/build-system/base'
 

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

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'mj/tools/subprocess'
 require 'build-tool/build-system/base'
 require 'build-tool/build-system/make'

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

@@ -1,3 +1,7 @@
+# -*- coding: UTF-8 -*-
+
+require 'mj/tools/subprocess.rb'
+
 require 'build-tool/build-system/make'
 
 module BuildTool; module BuildSystem

data/lib/build-tool/cfg/lexer.rex

@@ -40,8 +40,9 @@ macro
     COMMENT     \#[^\r\n]*
     INHERITANCE <
 
-    STRING       "([^\"\r\n]*)"
-    STRINGERROR  "([^\"\r\n]*)$
+    STRING              "([^\"\r\n]*)"
+    STRINGERROR         "([^\"\r\n]*)$"
+    MULTILINE_STRING    """
 
     TOKEN           [a-zA-Z][A-Za-z_0-9-]*
 
@@ -160,12 +161,15 @@ rule
     #
     ### GIT_SVN
     #
+    :GIT_SVN track\b        { [:TRACK, text]; }
+    :GIT_SVN {INHERITANCE}  { [:INHERITANCE, text] }
+    :GIT_SVN option\b       { [:OPTION, text]; }
+    :GIT_SVN global\b       { [:GLOBAL, text]; }
     :GIT_SVN external\b     { [:EXTERNAL, text]; }
+    :GIT_SVN remote-path\b  { [:REMOTE_PATH,    text]; }
     :GIT_SVN use\b          { @states.push @state; @state = :USE;     [:USE,     text]; }
-    :GIT_SVN track\b        { [:TRACK, text]; }
     :GIT_SVN ssh-key\b      { @states.push @state; @state = :SSH_KEY; [:SSH_KEY, text]; }
     :GIT_SVN repository\b   { @states.push @state; @state = :REPOSITORY;   [:REPOSITORY,   text]; }
-    :GIT_SVN remote-path\b  { [:REMOTE_PATH,    text]; }
     :GIT_SVN remote\b       { @states.push @state; @state = :GIT_REMOTE; [:REMOTE, text]; }
     :GIT_SVN end\b          { @state = @states.pop; [ :END, text ]; }
     # COMMON
@@ -180,12 +184,15 @@ rule
     #
     ### GIT
     #
-    :GIT url\b          { [:URL, text]; }
     :GIT track\b        { [:TRACK, text]; }
+    :GIT {INHERITANCE}  { [:INHERITANCE, text] }
+    :GIT option\b       { [:OPTION, text]; }
+    :GIT global\b       { [:GLOBAL, text]; }
+    :GIT url\b          { [:URL, text]; }
     :GIT push\b         { [:PUSH, text]; }
-    :GIT ssh-key\b { @states.push @state; @state = :SSH_KEY; [:SSH_KEY, text]; }
-    :GIT remote\b { @states.push @state; @state = :GIT_REMOTE; [:REMOTE, text]; }
-    :GIT end\b    { @state = @states.pop; [ :END, text ]; }
+    :GIT ssh-key\b      { @states.push @state; @state = :SSH_KEY; [:SSH_KEY, text]; }
+    :GIT remote\b       { @states.push @state; @state = :GIT_REMOTE; [:REMOTE, text]; }
+    :GIT end\b          { @state = @states.pop; [ :END, text ]; }
     # COMMON
     :GIT {STRING}      { [:STRING,  @ss[1]]; }
     :GIT {TOKEN}       { [:TOKEN,   text];   }
@@ -211,6 +218,24 @@ rule
     :GIT_REMOTE {STRINGERROR} { [:GARBAGE, text];   }
     :GIT_REMOTE .             { [:GARBAGE, text];   }
 
+    #
+    ### MERCURIAL
+    #
+    :MERCURIAL track\b        { [:TRACK, text]; }
+    :MERCURIAL {INHERITANCE}  { [:INHERITANCE, text] }
+    :MERCURIAL url\b          { [:URL, text]; }
+    :MERCURIAL push\b         { [:PUSH, text]; }
+    :MERCURIAL ssh-key\b      { @states.push @state; @state = :SSH_KEY; [:SSH_KEY, text]; }
+    :MERCURIAL end\b          { @state = @states.pop; [ :END, text ]; }
+    # COMMON
+    :MERCURIAL {STRING}      { [:STRING,  @ss[1]]; }
+    :MERCURIAL {TOKEN}       { [:TOKEN,   text];   }
+    :MERCURIAL {COMMENT}     { [:COMMENT, text];   }
+    :MERCURIAL {BLANK}       { [:IGNORE,  text];   }
+    :MERCURIAL {LF}          { [:IGNORE,  text];   }
+    :MERCURIAL {STRINGERROR} { [:GARBAGE, text];   }
+    :MERCURIAL .             { [:GARBAGE, text];   }
+
     #
     ### MODULE
     #
@@ -231,6 +256,7 @@ rule
 
     :MODULE end\b          { @state = @states.pop; [:END, text]; }
     # COMMON
+    :MODULE {MULTILINE_STRING} { @states.push @state; @state = :MULTILINE_STRING; [:MULTILINE_STRING, text]; }
     :MODULE {STRING}      { [:STRING,  @ss[1]]; }
     :MODULE {TOKEN}       { [:TOKEN,   text];   }
     :MODULE {COMMENT}     { [:COMMENT, text];   }
@@ -239,6 +265,10 @@ rule
     :MODULE {STRINGERROR} { [:GARBAGE, text];   }
     :MODULE .             { [:GARBAGE, text];   }
 
+    :MULTILINE_STRING {MULTILINE_STRING} { @state = @states.pop; [:MULTILINE_STRING, text]; }
+    :MULTILINE_STRING [^\"]+             { [:TEXT, text]; }
+    :MULTILINE_STRING .                  { [:TEXT, text]; }
+
     #
     ### REPOSITORY
     #
@@ -293,6 +323,7 @@ rule
     ### SVN
     #
     :SVN only\b         { [:ONLY, text]; }
+    :SVN {INHERITANCE}  { [:INHERITANCE, text] }
     :SVN end\b          { @state = @states.pop; [ :END, text ]; }
     :SVN repository\b   { @states.push @state; @state = :REPOSITORY;   [:REPOSITORY,   text]; }
     :SVN use\b          { @states.push @state; @state = :USE;     [:USE,     text]; }
@@ -331,6 +362,7 @@ rule
     :VCS git\b      { @state = :GIT; [:GIT, text]; }
     :VCS svn\b      { @state = :SVN; [:SVN, text]; }
     :VCS archive\b  { @state = :ARCHIVE; [:ARCHIVE, text]; }
+    :VCS mercurial  { @state = :MERCURIAL; [:MERCURIAL, text]; }
     # COMMON
     :VCS {STRING}      { [:STRING,  @ss[1]]; }
     :VCS {TOKEN}       { [:TOKEN,   text];   }

data/lib/build-tool/cfg/lexer_base.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'racc/parser'
 
 module BuildTool; module Cfg;
@@ -37,7 +39,7 @@ def pre_match
         def next_token
             begin
                 token = rex_next_token
-                # puts "#{state.inspect}##{token.inspect} #{lineno}"
+                # logger.debug2( "#{state.inspect}##{token.inspect} #{lineno}" )
                 case token[0]
                 when :IGNORE;  redo
                 when :COMMENT; redo

data/lib/build-tool/cfg/node.rb

@@ -1,3 +1,5 @@
+# -*- coding: UTF-8 -*-
+
 require 'mj/visitor'
 
 module BuildTool; module Cfg;
@@ -8,14 +10,22 @@ module BuildTool; module Cfg;
     class Node < MJ::Visitable
 
         attr_accessor :values
+        attr_accessor :args
+        attr_accessor :options
 
         def value
             values
             #raise StandardError, "1 Value expected.#{values.length} values found!."
         end
 
-        def initialize(values = nil)
+        def initialize(values = nil, *args )
             @values = values
+            @args = *args
+            if !@args.empty? && @args[-1].kind_of?( Hash )
+                @options = @args.pop
+            else
+                @options = {}
+            end
         end
 
     end # class Node
@@ -43,6 +53,8 @@ def initialize(values = nil)
         GitSvnDeclaration
 
         GitDeclaration
+        GitOption
+        GitOptionsDeclaration
         GitRemotePath
         GitRemoteUrl
         GitRemoteDeclaration
@@ -56,6 +68,10 @@ def initialize(values = nil)
 
         LogDirectory
 
+        MercurialDeclaration
+        MercurialTrack
+        MercurialUrl
+
         ModuleBuildPrefix
         ModuleDeclaration
         ModuleInstallPrefix

data/lib/build-tool/cfg/parser.y

@@ -15,6 +15,7 @@ class BuildTool::Cfg::Parser < BuildTool::Cfg::Lexer
     token FILE
     token GIT
     token GIT_SVN
+    token GLOBAL
     token HOST
     token INCLUDE
     token INHERITANCE
@@ -23,6 +24,8 @@ class BuildTool::Cfg::Parser < BuildTool::Cfg::Lexer
     token LOCAL_PATH
     token LOG_DIRECTORY
     token LONG
+    token MERCURIAL
+    token MULTILINE_STRING
     token MODULE
     token ONLY
     token OPTION
@@ -41,6 +44,7 @@ class BuildTool::Cfg::Parser < BuildTool::Cfg::Lexer
     token STRING
     token SVN
     token TEMPLATE
+    token TEXT
     token TOKEN
     token TRACK
     token URL
@@ -78,8 +82,14 @@ rule
 
     top_level_statement
         : LOG_DIRECTORY STRING       { result = LogDirectoryNode.new( val[1] ); }
-        | DISABLE FEATURE identifier { result = DisableFeatureNode.new( val[2] ); }
-        | ENABLE  FEATURE identifier { result = EnableFeatureNode.new( val[2] ); }
+        | DISABLE FEATURE identifier {
+                result = DisableFeatureNode.new( val[2], :global => @global );
+                deprecated( "Enabling/Disabling feature %s from override file!" % ( val[2] ) ) if not @global;
+                }
+        | ENABLE  FEATURE identifier {
+                result = EnableFeatureNode.new( val[2], :global => @global );
+                deprecated( "Enabling/Disabling feature %s from override file!" % ( val[2] ) ) if not @global;
+                }
         | statement                  { result = val[0]; }
         ;
 
@@ -96,8 +106,15 @@ rule
         | ssh_key_declaration      { result = val[0]; }
         | include_directive        { result = val[0]; }
         | feature_declaration      { result = val[0]; }
-        | DISABLE MODULE  identifier { result = DisableModuleNode.new( val[2] ); }
-        | ENABLE  MODULE  identifier { result = EnableModuleNode.new( val[2] ); }
+        | vcs_options_declaration  { result = val[0]; }
+        | DISABLE MODULE  identifier {
+                result = DisableModuleNode.new( val[2], :global => @global );
+                deprecated( "Enabling/Disabling module %s from override file!" % ( val[2] ) ) if not @global;
+                }
+        | ENABLE  MODULE  identifier {
+                result = EnableModuleNode.new( val[2], :global => @global );
+                deprecated( "Enabling/Disabling module %s from override file!" % ( val[2] ) ) if not @global;
+                }
         ;
 
     vcs_declaration
@@ -105,10 +122,15 @@ rule
         | svn_declaration          { result = val[0]; }
         | git_svn_declaration      { result = val[0]; }
         | archive_declaration      { result = val[0]; }
+        | mercurial_declaration    { result = val[0]; }
+        ;
+
+    vcs_options_declaration
+        : git_options_declaration  { result = val[0]; }
         ;
 
     #
-    ### GIT-SVN CONFIGURATION
+    ###  CONFIGURATION
     #
     archive_declaration
         : VCS ARCHIVE archive_statements END { result = ArchiveDeclarationNode.new( val[2] ); }
@@ -183,11 +205,32 @@ rule
         | SHORT DESCRIPTION STRING  { result = ShortDescriptionNode.new( val[2] ); }
         ;
 
+    #
+    ### GIT OPTION DECLARATION
+    #
+    git_options_declaration
+        : VCS GIT git_global_option_statements END { result = GitOptionsDeclarationNode.new( val[2] ); }
+
+    git_global_option_statements
+        : /* EMPTY */
+        | git_global_option_statement git_global_option_statements   { result = val.flatten; }
+        ;
+
+    git_global_option_statement
+        : GLOBAL OPTION identifier STRING   { result = GitOptionNode.new( val[2..-1], :GLOBAL ); }
+        | git_option_statement
+        ;
+
+    git_option_statement
+        : OPTION identifier STRING          { result = GitOptionNode.new( val[1..-1], :LOCAL ); }
+        ;
+
     #
     ### GIT CONFIGURATION
     #
     git_declaration
         : VCS GIT git_statements END { result = GitDeclarationNode.new( val[2] ); }
+        | VCS GIT inheritance git_statements END { result = GitDeclarationNode.new( val[3] ); result.options[:inheritance] = true; }
         ;
 
     git_remote_statements
@@ -211,6 +254,7 @@ rule
         : REMOTE STRING git_remote_statements END { result = GitRemoteDeclarationNode.new( val[1..-1]); }
         | TRACK STRING                    { result = GitTrackNode.new( val[1] ); }
         | git_remote_statement            { result = val[0]; }
+        | git_option_statement            { result = val[0]; }
         ;
 
     #
@@ -218,6 +262,7 @@ rule
     #
     git_svn_declaration
         : VCS GIT_SVN git_svn_statements END { result = GitSvnDeclarationNode.new( val[2] ); }
+        | VCS GIT_SVN inheritance git_svn_statements END { result = GitSvnDeclarationNode.new( val[3] ); result.options[:inheritance] = true; }
         ;
 
     git_svn_statements
@@ -240,6 +285,24 @@ rule
         : INCLUDE STRING { result = IncludeNode.new( val[1] ) };
         ;
 
+    #
+    ### MERCURIAL CONFIGURATION
+    #
+    mercurial_declaration
+        : VCS MERCURIAL mercurial_statements END              { result = MercurialDeclarationNode.new( val[2] ); }
+        | VCS MERCURIAL inheritance mercurial_statements END  { result = MercurialDeclarationNode.new( val[3] ); result.options[:inheritance] = true; }
+        ;
+
+    mercurial_statements
+        : /* empty */
+        | mercurial_statement mercurial_statements      { result = val.flatten; }
+        ;
+
+    mercurial_statement
+        : TRACK STRING                                  { result = MercurialTrackNode.new( val[1] ); }
+        | URL   STRING                                  { result = MercurialUrlNode.new( val[1..-1] ); }
+        ;
+
     #
     ### MODULE DECLARATION
     #
@@ -331,6 +394,7 @@ rule
     #
     svn_declaration
         : VCS SVN svn_statements END { result = SvnDeclarationNode.new( val[2] ); }
+        | VCS SVN inheritance svn_statements END { result = SvnDeclarationNode.new( val[3] ); result.options[:inheritance] = true; }
         ;
 
     svn_statements
@@ -348,11 +412,17 @@ rule
     #
     ### HELPER
     #
-    multiline_string
+    multiline_text
         : /* empty */
-        | multiline_string STRING  { result = val[0] ? val[0] + "\n" + val[1] : val[1]; } 
+        | multiline_text TEXT      { result = val[0] ? val[0] + "\n" + val[1] : val[1]; }
+        ;
+
+    multiline_string
+        : STRING                                        { result = val[0]; }
+        | MULTILINE_STRING multiline_text MULTILINE_STRING { result = val[1]; }
         ;
 
+
 end # class BuildTool::Cfg::GitParser
 
 ---- header ----
@@ -362,6 +432,8 @@ end # class BuildTool::Cfg::GitParser
 require 'build-tool/cfg/lexer'
 require 'build-tool/cfg/node'
 require 'build-tool/cfg/visitor'
+require 'build-tool/configuration'
+require 'build-tool/errors'
 
 
 ---- inner ----
@@ -370,18 +442,28 @@ require 'build-tool/cfg/visitor'
 #
 attr_accessor :configuration
 
-def initialize( configuration = Configuration.new)
+def initialize( configuration, global = true)
     super()
+    @global = global
     @configuration = configuration
 end
 
 def parse_string( string, file = "<string>" )
-    tree = super
-    visitor = Cfg::ConfigurationFileVisitor.new( configuration )
+    begin
+        tree = super
+        visitor = Cfg::ConfigurationFileVisitor.new( configuration )
+    rescue Racc::ParseError => e
+        debug( e.backtrace.join( "\n" ) )
+        raise BuildTool::ParseError( e.message )
+    end
     conf = tree.accept( visitor )
     return configuration
 end
 
+def deprecated( message )
+    logger.warn "[%s:%d]:deprecation warning:%s" % [ filename, lineno, message ]
+end
+
 ---- footer ----
 #
 ### FOOTER