build-tool 0.1.4 → 0.2

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

@@ -1,22 +1,31 @@
 module BuildTool; module BuildSystem
 
-
     #
     #
     #
-    class Autoconf < Base
+    class AutoConf < Base
+
+        include MJ::Tools::SubProcess
+
+        class MakeError < BuildTool::Error; end
+        class AutoConfError < BuildTool::Error; end
 
-        #
-        ### ATTRIBUTES
-        #
         def intitialize( *args )
             super( *args )
         end
 
+        #
+        ### ATTRIBUTES
+        #
         def name
             "autoconf"
         end
 
+        # Check if the module is configured
+        def configured?
+            Pathname.new( build_directory ).join( 'Makefile' ).exist?
+        end
+
         #
         ### METHODS
         #
@@ -24,7 +33,7 @@ module BuildTool; module BuildSystem
         def[]( var )
             case var
 
-            when 'CMAKE_CXXFLAGS'
+            when 'CXXFLAGS'
                 return @options[var]
 
             else
@@ -46,6 +55,11 @@ module BuildTool; module BuildSystem
 
         end
 
+        # Configure the module
+        def reconfigure()
+            configure
+        end
+
         def install( fast )
             make( "install" )
         end
@@ -54,6 +68,55 @@ module BuildTool; module BuildSystem
             false
         end
 
+        def bootstrap
+            if File.exist?( "#{source_directory}/configure" )
+                return
+            end
+
+            logger.trace "Project has to be bootstrapped."
+            if File.exist?( "#{source_directory}/Makefile.cvs" )
+                rc = self.class.execute "make -f Makefile.cvs", source_directory, env
+                if rc != 0
+                    raise AutoConfError, "'make -f Makefile.cvs' failed with error #{rc}!"
+                end
+                rc
+            else
+                raise AutoConfError, "No idea how to bootstrap this project!"
+            end
+        end
+
+        def configure
+            check_build_directory( true )
+            bootstrap
+            opt = ""
+            opt += " --prefix=#{install_prefix.to_s}" if install_prefix
+            rc = self.class.execute "#{source_directory}/configure #{opt}", build_directory, env
+            if rc != 0
+                raise AutoConfError, "configure failed with error #{rc}!"
+            end
+            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?
+            true
+        end
+
+        def make( target = nil )
+            do_make( target )
+        end
+
     end # class Autoconf
 
 end; end # module BuildTool::BuildSystem

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

@@ -90,7 +90,7 @@ module BuildTool; module BuildSystem
                     if !File.symlink?( build_directory )
                        logger.warn( "Could not link build directory to source directory for inplace build of #{@module.name}." )
                     end
-                else
+                elsif !$noop
                     FileUtils.mkdir_p( Pathname.new( build_directory ).parent )
                     File.symlink( source_directory, build_directory )
                 end
@@ -102,7 +102,7 @@ module BuildTool; module BuildSystem
                         raise ConfigurationError, "Build directory #{build_directory} exists and is no directory!"
                     end
                 elsif create
-                    FileUtils.mkdir_p( build_directory )
+                    FileUtils.mkdir_p( build_directory ) if !$noop
                     return true
                 else
                     return false
@@ -116,27 +116,4 @@ module BuildTool; module BuildSystem
 
     end # class Base
 
-    require 'build-tool/build-system/cmake'
-    require 'build-tool/build-system/custom'
-    require 'build-tool/build-system/qt'
-
-
-    def self.create( name )
-        case name
-
-        when 'cmake'
-            return CMake.new
-
-        when 'qt'
-            return Qt.new
-
-        when 'custom'
-            return Custom.new
-
-        else
-            raise ConfigurationError, "Buildsystem #{name} is not supported!"
-        end
-    end
-
-
 end; end # module BuildTool::BuildSystem

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

@@ -39,27 +39,11 @@ module BuildTool; module BuildSystem
             if @options.has_key? var
                 return @options[var]
             end
-
-            # case var
-
-            # else
-                # *TODO* raise correct exception
-                raise NotImplementedError
-
-            # end
+            raise NotImplementedError
         end
 
         def[]=( var, val )
-            # case var
-
-            # else
-            #     if var.start_with?( 'WITH_' )
-            #         @options[var] = val
-            #     else
-                    # *TODO* raise correct exception
-                    raise NotImplementedError
-                # end
-            # end
+            @options[var] = val
         end
 
         # Configure the module
@@ -82,7 +66,10 @@ module BuildTool; module BuildSystem
             end
             return self.module.environment.execute(
                 "%s %s" % [ path.to_s, source_directory ],
-                build_directory )
+                build_directory,
+                {
+                    'INSTALL_PREFIX' => install_prefix.to_s,
+                }.merge(Hash[@options]))
         end
 
         def install( fast )

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

@@ -0,0 +1,39 @@
+require 'mj/tools/subprocess'
+require 'build-tool/build-system/base'
+
+module BuildTool; module BuildSystem
+
+
+    class KdeL10nError < BuildTool::BuildSystem::CMake::CMakeError; end
+    #
+    # Custom Build system.
+    #
+    # Uses scripts do to the actual work.
+    #
+    class KdeL10n < CMake
+
+        def name
+            "kdel10n"
+        end
+
+        def initialize( *args )
+            super( *args )
+        end
+
+        def configure
+            if ! File.directory? "#{source_directory}/../scripts"
+                raise KdeL10nError, "You have to enable/checkout l10n too."
+            end
+
+            dirname = File.basename source_directory
+            rc = self.class.execute( "./scripts/autogen.sh #{dirname}", source_directory + "/..", self.module.environment.values )
+            if rc != 0
+                raise KdeL10nError, "Call to autogen.sh failed!";
+            end
+            super
+        end
+
+    end # class KdeL10n
+
+end; end # module BuildTool::BuildSystem
+

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

@@ -0,0 +1,82 @@
+require 'mj/tools/subprocess'
+require 'build-tool/build-system/base'
+
+module BuildTool; module BuildSystem
+
+
+    #
+    # 
+    #
+    class None < Base
+
+        include MJ::Tools::SubProcess
+
+        def initialize( *args )
+            super( *args )
+        end
+
+        #
+        ### ATTRIBUTES
+        #
+
+        # Check if the module is configured
+        def configured?
+            true
+        end
+
+        def name
+            "none"
+        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()
+            0
+        end
+
+        # Execute a cmake command in the context of the build directory
+        def cmake( command, wd = build_directory )
+            0
+        end
+
+        def configure
+            0
+        end
+
+        def install( fast )
+            0
+        end
+
+        def install_fast_supported?
+            true
+        end
+
+        def make( target = nil )
+            0
+        end
+
+    end # class CMake
+
+
+end; end # module BuildTool::BuildSystem

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

@@ -61,6 +61,30 @@ class Lexer < Racc::Parser
       when (text = @ss.scan(/log-directory\b/))
          action { [ :LOG_DIRECTORY, text ]; }
 
+      when (text = @ss.scan(/include\b/))
+         action { [ :INCLUDE, text ]; }
+
+      when (text = @ss.scan(/feature\b/))
+         action { [ :FEATURE,       text ]; }
+
+      when (text = @ss.scan(/long\b/))
+         action { [ :LONG,          text ]; }
+
+      when (text = @ss.scan(/short\b/))
+         action { [ :SHORT,         text ]; }
+
+      when (text = @ss.scan(/description\b/))
+         action { [ :DESCRIPTION,   text ]; }
+
+      when (text = @ss.scan(/end\b/))
+         action { [ :END,           text ]; }
+
+      when (text = @ss.scan(/enable\b/))
+         action { @states.push @state; @state = :ENABLE;       [:ENABLE,       text]; }
+
+      when (text = @ss.scan(/disable\b/))
+         action { @states.push @state; @state = :DISABLE;      [:DISABLE,      text]; }
+
       when (text = @ss.scan(/vcs\b/))
          action { @states.push @state; @state = :VCS;          [:VCS,          text]; }
 
@@ -108,6 +132,37 @@ class Lexer < Racc::Parser
         raise  ScanError, "can not match: '" + text + "'"
       end  # if
 
+    when :ARCHIVE
+      case
+      when (text = @ss.scan(/end\b/))
+         action { @state = @states.pop; [ :END, text ]; }
+
+      when (text = @ss.scan(/"([^\"\r\n]*)"/))
+         action { [:STRING,  @ss[1]]; }
+
+      when (text = @ss.scan(/[a-zA-Z][A-Za-z_0-9-]*/))
+         action { [:TOKEN,   text];   }
+
+      when (text = @ss.scan(/\#[^\r\n]*/))
+         action { [:COMMENT, text];   }
+
+      when (text = @ss.scan(/[ \t]+/))
+         action { [:IGNORE,  text];   }
+
+      when (text = @ss.scan(/[\r\n]/))
+         action { [:IGNORE,  text];   }
+
+      when (text = @ss.scan(/"([^\"\r\n]*)$/))
+         action { [:GARBAGE, text];   }
+
+      when (text = @ss.scan(/./))
+         action { [:GARBAGE, text];   }
+
+      else
+        text = @ss.string[@ss.pos .. -1]
+        raise  ScanError, "can not match: '" + text + "'"
+      end  # if
+
     when :BUILD_SYSTEM
       case
       when (text = @ss.scan(/option/))
@@ -145,6 +200,74 @@ class Lexer < Racc::Parser
         raise  ScanError, "can not match: '" + text + "'"
       end  # if
 
+    when :DISABLE
+      case
+      when (text = @ss.scan(/feature\b/))
+         action { @state = @states.pop; [:FEATURE, text]; }
+
+      when (text = @ss.scan(/module\b/))
+         action { @state = @states.pop; [:MODULE, text]; }
+
+      when (text = @ss.scan(/"([^\"\r\n]*)"/))
+         action { [:STRING,  @ss[1]]; }
+
+      when (text = @ss.scan(/[a-zA-Z][A-Za-z_0-9-]*/))
+         action { [:TOKEN,   text];   }
+
+      when (text = @ss.scan(/\#[^\r\n]*/))
+         action { [:COMMENT, text];   }
+
+      when (text = @ss.scan(/[ \t]+/))
+         action { [:IGNORE,  text];   }
+
+      when (text = @ss.scan(/[\r\n]/))
+         action { [:IGNORE,  text];   }
+
+      when (text = @ss.scan(/"([^\"\r\n]*)$/))
+         action { [:GARBAGE, text];   }
+
+      when (text = @ss.scan(/./))
+         action { [:GARBAGE, text];   }
+
+      else
+        text = @ss.string[@ss.pos .. -1]
+        raise  ScanError, "can not match: '" + text + "'"
+      end  # if
+
+    when :ENABLE
+      case
+      when (text = @ss.scan(/feature\b/))
+         action { @state = @states.pop; [:FEATURE, text]; }
+
+      when (text = @ss.scan(/module\b/))
+         action { @state = @states.pop; [:MODULE, text]; }
+
+      when (text = @ss.scan(/"([^\"\r\n]*)"/))
+         action { [:STRING,  @ss[1]]; }
+
+      when (text = @ss.scan(/[a-zA-Z][A-Za-z_0-9-]*/))
+         action { [:TOKEN,   text];   }
+
+      when (text = @ss.scan(/\#[^\r\n]*/))
+         action { [:COMMENT, text];   }
+
+      when (text = @ss.scan(/[ \t]+/))
+         action { [:IGNORE,  text];   }
+
+      when (text = @ss.scan(/[\r\n]/))
+         action { [:IGNORE,  text];   }
+
+      when (text = @ss.scan(/"([^\"\r\n]*)$/))
+         action { [:GARBAGE, text];   }
+
+      when (text = @ss.scan(/./))
+         action { [:GARBAGE, text];   }
+
+      else
+        text = @ss.string[@ss.pos .. -1]
+        raise  ScanError, "can not match: '" + text + "'"
+      end  # if
+
     when :ENVIRONMENT
       case
       when (text = @ss.scan(/var\b/))
@@ -337,22 +460,22 @@ class Lexer < Racc::Parser
 
     when :REPOSITORY
       case
-      when (text = @ss.scan(/server\b/))
-         action { [:SERVER,  text]; }
-
       when (text = @ss.scan(/path\b/))
-         action { [:PATH,    text]; }
+         action { [:PATH, text]; }
 
       when (text = @ss.scan(/user\b/))
-         action { [:USER,    text]; }
+         action { [:USER, text]; }
+
+      when (text = @ss.scan(/server\b/))
+         action { @states.push @state; @state = :SERVER;  [:SERVER,  text]; }
 
-      when (text = @ss.scan(/ssh-key/))
+      when (text = @ss.scan(/ssh-key\b/))
          action { @states.push @state; @state = :SSH_KEY; [:SSH_KEY, text]; }
 
       when (text = @ss.scan(/use\b/))
          action { @states.push @state; @state = :USE;     [:USE,     text]; }
 
-      when (text = @ss.scan(/end/))
+      when (text = @ss.scan(/end\b/))
          action { @state = @states.pop; [:END, text]; }
 
       when (text = @ss.scan(/"([^\"\r\n]*)"/))
@@ -512,6 +635,9 @@ class Lexer < Racc::Parser
       when (text = @ss.scan(/git\b/))
          action { @state = :GIT; [:GIT, text]; }
 
+      when (text = @ss.scan(/archive\b/))
+         action { @state = :ARCHIVE; [:ARCHIVE, text]; }
+
       when (text = @ss.scan(/"([^\"\r\n]*)"/))
          action { [:STRING,  @ss[1]]; }