build-tool 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,15 @@
+== 0.0.1 2009-06-14
+* Improved example configuration file
+    * Checkout the 4.5 version by default. Not trunk.
+* Some bugfixes
+    * Make sure the build directory exists, THEN call bootstrap.
+    * Show the options for subcommands in the help texts
+* Improvement
+    * Add option "remote-branch" for git-svn. Default to master
+    * Break out of the program on SIGBREAK. Not only out of the currently
+    * build module.
+
+
 == 0.0.1 2009-06-04
 
 * 1 major enhancement:

data/lib/kde-build.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module KdeBuild
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end
 
 module Kernel

data/lib/kde-build/application.rb

@@ -63,7 +63,7 @@ module BuildTool
                 true    # Allow partial command matching
                 )
             @command.program_name = "kde4svn-build"
-            @command.program_version = [ 0, 1, 1 ]
+            @command.program_version = KdeBuild::VERSION
             @command.options = CmdParse::OptionParserWrapper.new do |opt|
                 opt.separator "Global Options"
                 opt.on( "--verbose", "Verbose output" ) { |t|
@@ -88,8 +88,8 @@ module BuildTool
                     mc
                 }
 
-            @command.add_command( BuildCommand.new, true )
-            @command.add_command( InfoCommand.new, true )
+            @command.add_command( BuildCommand.new )
+            @command.add_command( InfoCommand.new )
 
             @command.add_command( HelpCommand.new )
             @command.add_command( VersionCommand.new )

data/lib/kde-build/build_system.rb

@@ -16,9 +16,11 @@ def available
     @mapping.keys
 end
 
+class UnknownBuildSystemError < Exception; end
+
 def get( name )
     if !available.include? name
-        throw :todo
+        raise UnknownBuildSystemError, "Buildsystem '#{name}' is not supported"
     end
     @mapping[name]
 end

data/lib/kde-build/build_system/autoconf.rb

@@ -37,10 +37,7 @@ module BuildTool
 
 
             def bootstrap_with_autogen
-                # First check if autogen contains a configure call
-                puts configuration.class
-                puts configuration.methods(false).inspect
-                rc = self.class.execute( "#{source_directory}/autogen.sh #{configuration.autogen_options}", env )
+                self.class.execute( "#{source_directory}/autogen.sh #{configuration.autogen_options}", build_directory, env )
             end
 
             def bootstrap_with_bootstrap
@@ -67,15 +64,17 @@ module BuildTool
                 throw :AUTOCONF_FAILED_TO_BOOTSTRAP
             end
 
-            def reconfigure
-                make "clean"
-                bootstrap true
+            def reconfigure( clean )
+                if clean
+                    return false if make( "clean" ) != 0
+                    return false if !bootstrap( true ) != 0
+                end
                 configure
             end
 
             def configure
-                bootstrap
                 check_build_directory( true )
+                bootstrap
                 opt = options || ""
                 opt += " --prefix=#{prefix}" if prefix
                 rc = self.class.execute( "#{source_directory}/configure #{opt}", build_directory, env )
@@ -83,7 +82,7 @@ module BuildTool
             end
 
             def configured?
-                File.exist? "#{build_directory}/config.cache"
+                File.exist? "#{build_directory}/config.status"
             end
 
             def make( command, wd = build_directory )

data/lib/kde-build/build_system/base.rb

@@ -33,7 +33,8 @@ module BuildTool
             include MJ::Configuration::Configurable
 
             option( 'name', "Name" )
-            option( 'inplace', 'Do not use out of source build' )
+            option( 'inplace', 'Do not use out of source build' ).
+                default = false
 
         end
 
@@ -48,6 +49,12 @@ module BuildTool
                 @module = mod
             end
 
+            def info
+                puts "Build System:      #{name}"
+                puts "  Out Of Source Build: #{!inplace}"
+                puts "  Options:             #{options}"
+            end
+
             def source_directory
                 @module.source_directory
             end

data/lib/kde-build/build_system/cmake.rb

@@ -34,10 +34,15 @@ module BuildTool
 
             # Execute a cmake command in the context of the build directory
             def cmake( command, wd = build_directory )
-                ENV['CMAKE_PREFIX_PATH'] = configuration.cmake_prefix_path
+                myenv = env
+                myenv['CMAKE_PREFIX_PATH'] = cmake_prefix_path
                 self.class.execute "cmake #{command}", wd, env
             end
 
+            def cmake_prefix_path
+                @configuration.cmake_prefix_path
+            end
+
             def make( command, wd = build_directory )
                 BuildTool::Make.new.make "#{command}", wd
             end
@@ -48,8 +53,10 @@ module BuildTool
             end
 
             def reconfigure( clean )
-                make "clean" if clean
-                self.class.execute "rm #{build_directory}/CMakeCache.txt" if clean
+                if clean
+                    return false if make( "clean" ) != 0
+                end
+                return false if self.class.execute( "rm #{build_directory}/CMakeCache.txt" ) != 0
                 configure
             end
 
@@ -65,6 +72,11 @@ module BuildTool
                 File.exist? "#{build_directory}/Makefile"
             end
 
+            def info
+                super
+                puts "  CMAKE_PREFIX_PATH:   #{cmake_prefix_path}"
+            end
+
             def name
                 "CMake"
             end

data/lib/kde-build/build_system/qtcopy.rb

@@ -74,18 +74,20 @@ module BuildTool
                     $log.info("Creating configure.new")
                     return
                 end
-                confnew = File.new( "#{source_directory}/configure.new", "w" )
-                conf    = File.new( "#{source_directory}/configure", "r" )
-                conf.each do |line|
-                    confnew.write(
-                        line.
-                            sub("read acceptance", "acceptance=yes").
-                            sub("read commercial", "commercial=o") )
+                begin
+                    confnew = File.new( "#{source_directory}/configure.new", "w" )
+                    conf    = File.new( "#{source_directory}/configure", "r" )
+                    conf.each do |line|
+                        confnew.write(
+                            line.
+                                sub("read acceptance", "acceptance=yes").
+                                sub("read commercial", "commercial=o") )
+                    end
+                    confnew.chmod( 0744 )
+                ensure
+                    conf.close
+                    confnew.close
                 end
-                confnew.chmod( 0744 )
-            ensure
-                conf.close
-                confnew.close
             end
 
             def create_configure_new_if_necessary

data/lib/kde-build/command.rb

@@ -9,11 +9,21 @@ module BuildTool
 
 
         def show_help
-            puts "#{name}: #{short_desc}"
-            puts description if description
+            puts usage
+            puts
+            if description
+                puts description
+            else
+                puts short_desc
+            end
             if has_commands?
+                puts
                 list_commands
             end
+            if has_arguments=
+                puts
+                puts options.summarize
+            end
         end
 
         def complete( args )

data/lib/kde-build/command/build.rb

@@ -11,21 +11,25 @@ module BuildTool
 
         def initialize
             super( 'build', false )
-            self.short_desc = "build [options] [:package|module|path/]..."
-            self.description = "fetch, rebase, build and install the specified modules."
+            self.short_desc = "Build a module."
+            self.description = "Fetch, rebase, build and install the specified modules."
             @update = true
             @configure = false
+            @clean = false
             @reconfigure = false
             @install = true
             @from_scratch = false
             self.options = CmdParse::OptionParserWrapper.new do |opt|
-                opt.separator "Global Options"
+                opt.separator "Options:"
                 opt.on( "--no-update", "Do not update from the repository" ) { |t|
                     @update = false
                     }
-                opt.on( "--configure", "Run the configuration step again" ) { |t|
+                opt.on( "-c", "--configure", "Run the configuration step again" ) { |t|
                     @configure = true
                     }
+                opt.on( "--[no-]clean", "Make clean before building." ) { |t|
+                    @clean = t
+                    }
                 opt.on( "--reconfigure", "Remove old configuration then run configuration again" ) { |t|
                     @reconfigure = true
                     }
@@ -89,7 +93,7 @@ module BuildTool
                     end
 
                     if @reconfigure
-                        mod.reconfigure( true )
+                        mod.reconfigure( @clean.nil? ? true : @clean )
 
                     elsif @configure
                         if mod.configured?
@@ -102,8 +106,11 @@ module BuildTool
                         mod.configure
                     end
 
+                    mod.build( @install, @clean )
 
-                    mod.build( @install )
+                rescue Interrupt => e
+                    $log.info("SIGBREAK recieved.")
+                    return
 
                 rescue Exception => e
                     $log.info("error: #{e.class}: #{e.message}")

data/lib/kde-build/command/info.rb

@@ -9,11 +9,21 @@ module BuildTool
 
         def initialize
             super( 'info', false )
-            self.short_desc = "Information about a module"
-            self.description = "Retrieve Information aboud modules"
+            self.short_desc = "Information about a module."
+            self.description = "Retrieve detailed information about module(s)."
+        end
+
+        def usage
+            "Usage: #{commandparser.program_name} info [module]..."
         end
 
         def execute( args )
+
+            if args.length == 0
+                show_help
+                return
+            end
+
             args.each do |modname|
                 mod = ModuleRegistry.get_modules( modname ) do |mod|
                     if mod == nil
@@ -21,16 +31,9 @@ module BuildTool
                         return
                     end
 
-                    puts "Building: #{modname}"
-                    puts "Repository:  #{mod.repository}"
-                    puts "Remote Path: #{mod.remote_path}"
-                    puts "Stage:       #{mod.workdir}"
-                    puts "Build Directory: #{mod.build_directory}"
-                    puts "Source Directory: #{mod.source_directory}"
+                    mod.info
+                    puts ""
 
-                    puts "VCS:              #{mod.vcs.name}"
-                    puts "                  #{mod.vcs.configuration.externals}"
-                    puts "  checkedout:     #{mod.vcs.checkedout?}"
                 end
             end
         end

data/lib/kde-build/configuration.rb

@@ -12,19 +12,26 @@ module MJ;
 
         class Option
 
-            attr_accessor :name, :attribute, :description
+            attr_accessor :name, :attribute, :description, :default
 
             def initialize( obj, name, description )
                 @name = name
                 @attribute =self.class.sanitize name
                 @description = description
+                @default = nil
                 @one_of = nil
                 @on_read = nil
                 @on_write = nil
                 @required = false
+
                 install obj
             end
 
+            def default=( value )
+                @default = value
+                self
+            end
+
             def self.sanitize( name )
                 name.gsub( /[^a-zA-Z_]/, '_' )
             end
@@ -35,7 +42,6 @@ module MJ;
                 obj.class_def( attribute ) do
                     opt = self.class.__options__[attribute]
                     value = self.values[attribute]
-                    opt.read(value)
                 end
 
                 obj.class_def( "#{attribute}=" ) do
@@ -45,6 +51,7 @@ module MJ;
                     if !opt
                         puts self
                         puts self.class.__options__.inspect
+                        raise Exception, "????"
                     end
                     # First validate the value
                     opt.validate(value)
@@ -111,7 +118,7 @@ module MJ;
             else
                 puts o.class
                 puts o.inspect
-                exit( -1 )
+                raise Exception, "??????????"
             end
         end
         module_function :flatten_values
@@ -141,18 +148,34 @@ module MJ;
 
 
             def values
-                @values ||= Hash.new
+                return @values if @values
+                @values = Hash.new
+                self.class.__options__.each_pair do |name, opt|
+                    @values[name] = opt.default
+                end
+                @values
             end
 
             def set( key, val )
-                # puts "Options = #{self.class.options.inspect}"
-                self.send( "#{Option.sanitize( key )}=", val )
+                begin
+                    # puts "Options = #{self.class.options.inspect}"
+                    self.send( "#{Option.sanitize( key )}=", val )
+                rescue BuildTool::VCS::UnknownVcsError => e
+                    $log.warn( "Unknown vcs '#{key}' configured for #{self.name}:#{self.class}" )
+                    raise e
+                rescue NameError => e
+                    $log.warn( "Unknown option #{key} configured for #{self.name}:#{self.class}" )
+                    raise e
+                rescue Exception => e
+                    $log.warn( "Caught exception #{e.message} for #{self.inspect}:#{self.class} while setting #{key} to #{val.inspect}" )
+                    raise e
+                end
             end
 
             def validate
                 begin
                     self.class.__options__.each_pair do |name, opt|
-                        opt.validate( @values[opt.attribute] )
+                        opt.validate( self.values[opt.attribute] )
                     end
                 rescue ConfigurationError => e
                     $log.error( "Validation for #{self.class} (#{self.to_s}) failed: #{e}" )
@@ -176,7 +199,7 @@ module MJ;
                         end
                     }
                 else
-                    throw "TODO"
+                    raise Exception, "FIXME"
                 end
                 self
             end

data/lib/kde-build/module.rb

@@ -42,9 +42,18 @@ module BuildTool
             @local_path = @config.local_path || @config.remote_path
         end
 
-        def build( install )
+        def build( install, clean = false )
             $log.info("Compiling")
             rc = nil
+            if clean
+                while_logging_to( name, "50_build" ) do
+                    if build_system.make( "clean" ) != 0
+                        raise BuildError, "make returned error code #{rc}"
+                    end
+                    $log.info( "make clean was successful" )
+                end
+            end
+
             while_logging_to( name, "50_build" ) do
                 rc =
                     if install
@@ -56,7 +65,7 @@ module BuildTool
                 if rc != 0
                     raise BuildError, "make returned error code #{rc}"
                 end
-                $log.info( "successfully built" )
+                $log.info( "build was  successful" )
             end
         end
 
@@ -142,6 +151,21 @@ module BuildTool
             end
         end
 
+        def info
+            puts "############### Module #{name}"
+            puts "Repository:        #{remote_path}"
+            puts "SSH Key:           #{ssh_file}" if ssh_file
+            puts "Local Checkout:    #{workdir}/#{local_path} #{configured? ? '(EXISTS)' : '' }"
+            puts "Build Directory:   #{build_directory} #{checkedout? ? '(EXISTS)' : '' }"
+            puts "Prefix:            #{prefix}"
+            puts "Environment:"
+            env.each do |var, val|
+                puts "  %-20s %s" % [ var + ":", val ]
+            end if env
+            vcs.info
+            build_system.info
+        end
+
         def ssh_key
             return @config.ssh_key
         end

data/lib/kde-build/module_configuration.rb

@@ -39,7 +39,7 @@ module BuildTool
                     val = VCS::get(a['name']).config.new
                     val.parse(a)
                 else
-                    throw :todo
+                    raise Exception, "Don't know how to handle #{val.inspect}"
                 end
                 val
             }
@@ -62,7 +62,7 @@ module BuildTool
                     val = BuildSystem::get(a['name']).config.new
                     val.parse(a)
                 else
-                    throw :todo
+                    raise Exception, "FIXME"
                 end
                 val
             }

data/lib/kde-build/subprocess.rb

@@ -50,6 +50,7 @@ module MJ; module Tools
                 if env
                     env.each do |var, value|
                         oldenv[var] = ENV[var]
+                        $log.debug "#{var} = #{value}"
                         ENV[var] = value
                     end
                 end

data/lib/kde-build/vcs.rb

@@ -16,9 +16,11 @@ def available
     @mapping.keys
 end
 
+class UnknownVcsError < Exception; end
+
 def get( name )
     if !available.include? name
-        throw :todo
+        raise VcsError, "VCS '#{name}' is not supported"
     end
     @mapping[name]
 end

data/lib/kde-build/vcs/base.rb

@@ -35,6 +35,10 @@ module BuildTool; module VCS
             @path = path
         end
 
+        def info
+            puts "Version Control:   #{name}"
+        end
+
         # Check if the local checkout exists.
         #
         # This method only checks it the local checkout path exists and is

data/lib/kde-build/vcs/git-svn.rb

@@ -22,6 +22,7 @@ module BuildTool; module VCS
                         val = Hash[*a]
                     else
                         throw :todo
+                    raise Exception, "FIXME"
                     end
                     val
                 }
@@ -110,6 +111,11 @@ module BuildTool; module VCS
                 update_externals
             end
 
+            def info
+                super
+                puts "  Externals:           #{configuration.externals.inspect}" if configuration.externals
+            end
+
             # Returns Git-SVN
             def name
                 "Git-SVN"

data/lib/kde-build/vcs/git.rb

@@ -18,6 +18,9 @@ module BuildTool; module VCS
                 self.name = "git"
             end
 
+            option( "remote-branch", "The remote branch to checkout" ).
+                default = "master"
+
         end
 
 
@@ -37,6 +40,10 @@ module BuildTool; module VCS
                 self.class.execute "git #{command}", wd
             end
 
+            def remote_branch
+                @configuration.remote_branch
+            end
+
             def self.config
                 GitConfiguration
             end
@@ -78,13 +85,31 @@ module BuildTool; module VCS
                 # Create the directory
                 FileUtils.mkdir_p( File.split(path)[0] ) if !$noop
 
-                # Init the repository
-                if !git( "clone #{repository} #{path}", File.split(path)[0] )
-                    raise GitError, "Error while initializing the repo `git clone '#{repository} #{path}'`: #{$?}"
+                # Initialize the repository
+                if !git( "clone --no-checkout #{repository} #{path}", Pathname.new(path).dirname )
+                    raise GitError, "Error while initializing the repo `git clone --no-checkout '#{repository} #{path}'`: #{$?}"
+                end
+
+                # Create the local checkout
+                if remote_branch != "master"
+                    if !git( "checkout --track -b #{remote_branch} origin/#{remote_branch}", path )
+                        raise GitError, "Error while initializing the repo `checkout --track -b '#{remote_branch} origin/#{remote_branch}'`: #{$?}"
+                    end
+                else
+                    if !git( "checkout #{remote_branch}", path )
+                        raise GitError, "Error while initializing the repo `git checkout #{remote_branch}'`: #{$?}"
+                    end
                 end
+
+
                 fetch()
             end
 
+            def info
+                super
+                puts "  Remote Branch:       #{remote_branch.inspect}"
+            end
+
             def rebase
                 return git "rebase origin"
             end

data/lib/kde-build/vcs/svn.rb

@@ -31,9 +31,6 @@ module BuildTool; module VCS
             end
 
             def svn( command, wd = path, &block )
-                puts self.class.inspect
-                puts self.inspect
-                puts self.methods(false).inspect
                 self.class.svn command, wd, &block
             end
 

data/test.yaml.tmpl

@@ -15,21 +15,18 @@
     # ADAPT THE FOLLOWING LINES TO YOU NEEDS
     #########################################################################
 
+    #
+    ### LOCAL PATH
+    #
+
     # qt installation directory
-    QTDIR    = "/opt/qt/master"
+    QTDIR = "/opt/qt/master"
 
     # kdesupport and 3rd party installation directory
     EXTRADIR = "/opt/kde/trunk/extra"
 
     # kde installation directory
-    KDEDIR   = "/opt/kde/trunk/kde"
-
-    # kde svn server
-    # KDESVNSERVER = "svn+ssh://<your_username>@svn.kde.org/home"
-    KDESVNSERVER = "svn://anonsvn.kde.org/home/kde"
-
-    # gitorius server. qt is hosted there ( http://qt.gitorious.org )
-    GITORIOUS    = "git://gitorious.org"
+    KDEDIR = "/opt/kde/trunk/kde"
 
     # The build directory
     #    <dir>/src/... The checkouts
@@ -37,15 +34,67 @@
     #    <dir>/log/... The logfiles
     WORK_DIRECTORY = "~/kde/trunk"
 
-    # The c++ compile flags to use
+    #
+    ### REPOSITORY SERVERS
+    #
+
+    # kde svn server
+    # KDESVNSERVER = "svn+ssh://<your_username>@svn.kde.org/home"
+    KDESVNSERVER = "svn://anonsvn.kde.org/home"
+
+    # gitorius server. qt is hosted there ( http://qt.gitorious.org )
+    GITORIOUS = "git://gitorious.org"
+
+    #
+    ### COMMON BUILD SETTINGS
+    #
+
+    # Set to the lib suffix used by your distro. Check for /usr/lib(?). Added
+    # automatically to CMAKE_OPTION below. AutoConf doesn't need it apparently
+    LIB_SUFFIX = "64" # (64|32|"")
+
+    # The c++ compile flags to use. Added automatically to CMAKE_OPTION and
+    # AUTOCONF_OPTIONS below.
     CXXFLAGS= "-Wall -pipe -O0"
 
+    # Set to "number of cores you processor has" + 1 for optimal performance with modest system load
+    MAKE_OPTIONS = "-j2"
+
+    # The cmake options to use (see http://cmake.org/cmake/documentation.html)
+    # CMAKE_OPTIONS="debug"   -> Compile with debugging symbols
+    # CMAKE_VERBOSE_MAKEFILE  -> Print out the executed commands.
+    cmake_options = "-DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=DEBUG"
+
+    # The autoconf options
+    autoconf_options = ""
+
     #########################################################################
     # YOU SHOULDN'T HAVE TO CHANGE THE NEXT LINES
     #########################################################################
 
+    #
+    ### add some additional settings to cmake_options
+    #
+    if LIB_SUFFIX
+        cmake_options += " -DLIB_SUFFIX='#{LIB_SUFFIX}'"
+    end
+    if CXXFLAGS
+        cmake_options += " -DCMAKE_CXX_FLAGS='#{CXXFLAGS}'"
+    end
+    # Variables in all uppercase are Constants in ruby
+    CMAKE_OPTIONS = cmake_options
+
+    #
+    ### add some additional settings to autoconf_options
+    #
+    if CXXFLAGS
+        autoconf_options += " CXXFLAGS='#{CXXFLAGS}'"
+    end
+    # Variables in all uppercase are Constants in ruby
+    AUTOCONF_OPTIONS = autoconf_options
+
     # Provided to kde packages when configuring
-    KDEDIRS  = "#{EXTRADIR}:#{KDEDIR}"
+    KDEDIRS = "#{EXTRADIR}:#{KDEDIR}"
 
 %>
 
@@ -60,7 +109,7 @@
 ############################
 - :make: !michael-jansen.biz,2009/MakeConfiguration
     # executable: "/usr/bin/make"
-    options:  "-j16"
+    options:  <%= MAKE_OPTIONS %>
 
 ############################
 # CTAGS - <TODO>           #
@@ -86,7 +135,7 @@
 #
 - :tags: !michael-jansen.biz,2009/Packages
     - default: kdelibs kdepimlibs kdebase/ kdepim
-    - plasma:  playground/nepomuk-kde kdeplasma-addons playground/plasma-applets
+    - plasma:  playground/nepomuk-kde kdeplasma-addons playground/plasma-applets/
     - devel:   kdesdk kdev/
     - graphics: extra/lensfun kdegraphics extragear/graphics/
     - multimedia: kdemultimedia qtscriptgenerator amarok
@@ -96,6 +145,65 @@
     - complete: :default
 
 
+############################
+# MODULE DEFINITIONS DOKU  #
+############################
+#
+### THE BLOCK BELOW IS NOT PART OF THE CONFIGURATION. IT'S ONLY DOCUMENTATION
+#
+<% if false # ERB will remove it %>
+- !michael-jansen.biz,2009/ModuleConfiguration
+    # The module name. 
+    - name: kdesupport/automoc
+    # Some example constants
+    - *env
+    - *sshkey
+    # The repository to fetch from.
+    - repository: <%= KDESVNSERVER %>/kde/trunk
+    # The remote directory for fetch from relative to repository
+    - remote-path: kdesupport/automoc
+    # The installation directory
+    - prefix: <%= EXTRADIR %>
+    # The ssh key needed to talk to the repository (optional). Will be
+    # loaded with ssh-add if necessary. Make sure ssh-agent is running
+    - ssh-file: ~/.ssh/id_dsa
+    - ssh-key: "1024 aa:8b:12:f4:67:8d:c4:6d:4d:d3:1d:cc:15:ee:ce:e8"
+    # Whatever environment variables should be set before the configuration
+    # script is run.
+    - env:
+        - PATH: <%= "#{QTDIR}:#{KDEDIRS}".split(":").collect { |d| d+"/bin" }.join(":")%>:/usr/X11R6/bin:/usr/bin:/bin
+        - KDEDIRS: <%= KDEDIRS %>
+    # The version controls system to use. Currently svn, git and git-svn are
+    # supported
+    - vcs: (git|svn|git-svn)
+    # It's also possible to specify some more options to the vcs system.
+    - vcs
+        # The build system to use
+        - name: git-svn
+        # Branch to checkout (GIT)
+        - remote-branch: 4.5
+        # Fetch some externals (GIT-SVN)
+        - externals:
+            - kget/transfer-plugins/bittorrent/libbtcore: <%= KDESVNSERVER %>/kde/branches/stable/extragear-kde4/network/ktorrent/libbtcore
+    # The build system to use. Currently autoconf(partially), cmake, qmake are
+    # supported
+    - build-system: (cmake|qmake|autoconf)
+    # It's also possible to specify some more options to the build system.
+    - build-system
+        # The build system to use
+        - name: cmake
+        # Make an in source build (ALL)
+        - inplace: true
+        # Options to supply to the configuration script (ALL)
+        - options: <%= CMAKE_OPTIONS %>
+        - options: "--enable-debug"
+        # CMAKE_PREFIX_PATH (CMAKE)
+        - cmake-prefix-path: /my/local/install
+        # Build-tool knows how to use autogen.sh. Supply some options (AUTOCONF)
+        - autogen-options: --noconfigure
+<% end %>
+
+
 
 ############################
 # YAML CONSTANTS           #
@@ -125,62 +233,9 @@
     - prefix: <%= KDEDIR %>
     - build-system:
         - name: cmake
-        - options: "-DCMAKE_BUILD_TYPE=DEBUG -DLIB_SUFFIX=64 -DCMAKE_CXXFLAGS='<%=CXXFLAGS%>'"
+        - options: <%= CMAKE_OPTIONS %>
         - cmake-prefix-path: "<%= QTDIR %>:<%= KDEDIRS %>:<%= EXTRADIR %>"
 
-############################
-# MODULE DEFINITIONS       #
-############################
-# - !michael-jansen.biz,2009/ModuleConfiguration
-#     # The module name. 
-#     - name: kdesupport/automoc
-#     # Some example constants
-#     - *env
-#     - *sshkey
-#     # The repository to fetch from.
-#     - repository: <%= KDESVNSERVER %>/kde/trunk
-#     # The remote directory for fetch from relative to repository
-#     - remote-path: kdesupport/automoc
-#     # The installation directory
-#     - prefix: <%= EXTRADIR %>
-#     # The ssh key needed to talk to the repository (optional). Will be
-#     # loaded with ssh-add if necessary. Make sure ssh-agent is running
-#     - ssh-file: ~/.ssh/id_dsa
-#     - ssh-key: "1024 aa:8b:12:f4:67:8d:c4:6d:4d:d3:1d:cc:15:ee:ce:e8"
-#     # Whatever environment variables should be set before the configuration
-#     # script is run.
-#     - env:
-#         - PATH: <%= "#{QTDIR}:#{KDEDIRS}".split(":").collect { |d| d+"/bin" }.join(":")%>:/usr/X11R6/bin:/usr/bin:/bin
-#         - KDEDIRS: <%= KDEDIRS %>
-#     # The version controls system to use. Currently svn, git and git-svn are
-#     # supported
-#     - vcs: (git|svn|git-svn)
-#     # It's also possible to specify some more options to the vcs system.
-#     - vcs
-#         # The build system to use
-#         - name: git-svn
-#         # Fetch some externals
-#         - externals: 
-#             - kget/transfer-plugins/bittorrent/libbtcore: <%= KDESVNSERVER %>/kde/branches/stable/extragear-kde4/network/ktorrent/libbtcore
-#     # The build system to use. Currently autoconf(partially), cmake, qmake are
-#     # supported
-#     - build-system: (cmake|qmake|autoconf)
-#     # It's also possible to specify some more options to the build system.
-#     - build-system
-#         # The build system to use
-#         - name: cmake
-#         # Make an in source build (ALL)
-#         - inplace: true
-#         # Options to supply to the configuration script (ALL)
-#         - options: "-DCMAKE_BUILD_TYPE=DEBUG -DLIB_SUFFIX=64 -DCMAKE_CXXFLAGS='<%=CXXFLAGS%>'"
-#         - options: "--enable-debug"
-#         # CMAKE_PREFIX_PATH (CMAKE)
-#         - cmake-prefix-path: /my/local/install
-#         # Build-tool knows how to use autogen.sh. Supply some options (AUTOCONF)
-#         - autogen-options: --noconfigure
-
-
-
 ############################
 # KDESUPPORT               #
 ############################
@@ -190,12 +245,12 @@
     - *env
     - *sshkey
     - repository: <%= KDESVNSERVER %>/kde/trunk
-    - vcs:
-        - name: git-svn
+    - vcs: git-svn
     - prefix: <%= EXTRADIR %>
     - build-system:
         - name: cmake
-        - options: "-DCMAKE_BUILD_TYPE=DEBUG -DLIB_SUFFIX=64 -DCMAKE_CXXFLAGS='<%=CXXFLAGS%>'"
+        - options: <%= CMAKE_OPTIONS %>
+        - cmake-prefix-path: "<%= QTDIR %>:<%= EXTRADIR %>"
     - remote-path: kdesupport/<%= mod %>
 <% end %>
 
@@ -206,12 +261,11 @@
     - name: kdesupport/networkmanager
     - remote-path: NetworkManager/NetworkManager.git
     - local-path: kdesupport/networkmanager
-    - vcs:
-        - name: git
+    - vcs: git
     - prefix: <%= EXTRADIR %>
     - build-system:
         - name: autoconf
-        - options: "CXXFLAGS=-g"
+        - options: "<%= AUTOCONF_OPTIONS %>"
         - inplace: true
         - autogen-options: -test
 
@@ -225,7 +279,11 @@
     - local-path: qtmaster
     - remote-path: qt/qt.git
     - repository: <%= GITORIOUS %>
-    - vcs: git
+    - vcs: 
+        - name: git
+        # Checkout qt's 4.5 branch. master points to the work in progress
+        # version 4.6
+        - remote-branch: 4.5
     - build-system:
         - name: qtcopy
         # -qt-gif ............ Compile the plugin for GIF reading support. 
@@ -244,11 +302,10 @@
     - remote-path: kdesupport/qca
     - local-path: qca
     - repository: <%= KDESVNSERVER %>/kde/trunk
-    - vcs:
-        - name: git-svn
+    - vcs: git-svn
     - build-system:
         - name: cmake
-        - options: "-DCMAKE_BUILD_TYPE=DEBUG -DLIB_SUFFIX=64 -DCMAKE_CXXFLAGS='<%=CXXFLAGS%>'"
+        - options: <%= CMAKE_OPTIONS %>
 
 - !michael-jansen.biz,2009/ModuleConfiguration
     - *qt
@@ -259,7 +316,7 @@
     - vcs: git-svn
     - build-system:
         - name: cmake
-        - options: "-DCMAKE_BUILD_TYPE=DEBUG -DLIB_SUFFIX=64 -DCMAKE_CXXFLAGS='<%=CXXFLAGS%>'"
+        - options: <%= CMAKE_OPTIONS %>
 
 ############################
 # KDE CORE                 #
@@ -298,7 +355,6 @@
     - vcs: git-svn
 <% end %>
 
-
 ############################
 # KDEVELOP                 #
 ############################
@@ -315,7 +371,7 @@
     - prefix: <%= KDEDIR %>
     - build-system:
         - name: cmake
-        - options: "-DCMAKE_BUILD_TYPE=DEBUG -DLIB_SUFFIX=64 -DCMAKE_CXXFLAGS='<%=CXXFLAGS%>'"
+        - options: <%= CMAKE_OPTIONS %>
         - cmake-prefix-path: "<%= QTDIR %>:<%= KDEDIRS %>:<%= EXTRADIR %>"
 <% end %>
 
@@ -487,10 +543,10 @@
     'windowlist',
     'windows-startmenu' ] %>
 - !michael-jansen.biz,2009/ModuleConfiguration
-    - name: playground/plasma-applets-<%= mod %>
+    - name: playground/plasma-applets/<%= mod %>
     - *kde
     - remote-path: playground/base/plasma/applets/<%= mod %>
-    - local-path:  playground/plasma-applets-<%= mod %>
+    - local-path:  playground/plasma-applets/<%= mod %>
     - vcs: git-svn
 <% end %>
 
@@ -525,6 +581,7 @@
         - name: autoconf
         # Lensfun build system (only autoconf compatibel requires an inplace
         # build
+        - options: "<%= AUTOCONF_OPTIONS %>"
         - inplace: true
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Michael Jansen
@@ -30,7 +30,7 @@ cert_chain:
   M3zOaQdtTmiQPBqNIsE=
   -----END CERTIFICATE-----
 
-date: 2009-06-10 00:00:00 +02:00
+date: 2009-06-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency