build-tool 0.1.4 → 0.2

data/lib/build-tool/recipe.rb

@@ -40,6 +40,11 @@ module BuildTool
             return nil
         end
 
+        def include_file( filename, configuration )
+            logger.debug "Including #{global_config_file_path( filename )}"
+            load_from_file( global_config_file_path( filename ), configuration )
+        end
+
         def long_description
             return @long_description if @metainfo_loaded
             load_metainfo

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

@@ -0,0 +1,140 @@
+require 'open-uri'
+
+require 'build-tool/vcs/base'
+require 'fileutils'
+
+
+module BuildTool; module VCS
+
+    class ArchiveConfiguration < BaseConfiguration
+
+        def name
+            "archive"
+        end
+
+        def vcs( mod )
+            @module = mod
+            Archive.new( self )
+        end
+
+    end # class ArchiveConfiguration
+
+
+    class Archive < Base
+
+        class ArchiveError < BuildTool::Error; end
+
+        #
+        ### Attributes
+        #
+        def name
+            "archive"
+        end
+
+        def fetching_supported?
+            true
+        end
+
+        def archive_local_path
+            "#{File.dirname( local_path )}/#{archive_name}"
+        end
+
+        def archive_name
+            File.basename( archive_url )
+        end
+
+        def archive_url
+            "#{repository.url}/#{remote_path}"
+        end
+
+        #
+        ### METHODS
+        #
+
+        def checkedout?
+            File.exist? archive_local_path
+        end
+
+        def clone
+            # Check if the archive is already downloaded
+            if File.exist? archive_local_path
+                logger.debug "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."
+                FileUtils.rm_rf local_path if !$noop
+            end
+
+            # Create the directories parent dir.
+            FileUtils.mkdir_p( File.dirname( local_path ) ) if !$noop
+
+            # Download the archive
+            logger.trace "get #{archive_name} from #{archive_url} to #{archive_local_path}"
+            if !$noop
+                target = open( archive_local_path, "wb" )
+                open( archive_url ) { |file|
+                    while c = file.getc
+                        target.putc c
+                    end
+                }
+                target.close()
+            end
+
+            # Determine if the archive has a top level directory
+            topdir = guess_top_level_directory()
+
+            if archive_name =~ /(\.tgz|\.tar\.gz)$/
+                if self.class.execute( "gunzip -c #{archive_local_path} | tar xf -", File.dirname(local_path) ) != 0
+                    raise StandardError, "Failed to unpack the archive: $?"
+                end
+            else
+                raise NotImplementedError, "No idea how to unpack the archive"
+            end
+
+            # Rename the top level directory to our desired path
+            logger.trace "mv #{File.dirname(local_path)}/#{topdir}  #{local_path}"
+            if !$noop
+                FileUtils.move( "#{File.dirname(local_path)}/#{topdir}", local_path )
+            end
+            0
+        end
+
+        def fetch()
+            if !checkedout?
+               clone
+            else
+                # No update for archives
+            end
+            return true
+        end
+
+        def guess_top_level_directory
+            return "<topdir>" if $noop
+            topdir = nil
+            if archive_name =~ /(\.tgz|\.tar\.gz)$/
+                if self.class.execute( "gunzip -c #{archive_local_path} | tar tf -" ) { |line| 
+                    rc = /^([^\/]*)\//.match( line )
+                    if topdir and topdir != rc[1]
+                        raise StandardError, "Unable to determine toplevel directory for archive #{archive_name}!"
+                    end
+                    topdir = rc[1]
+                } != 0 
+                    raise StandardError, "Failed to unpack the archive: $?"
+                end
+            else
+                raise NotImplementedError, "No idea how to unpack the archive"
+            end
+            return topdir
+        end
+
+        def rebase
+            0
+        end
+
+    end # class Archive
+
+end; end

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

@@ -24,10 +24,6 @@ module BuildTool; module VCS
             @module.source_directory
         end
 
-        def module
-            @module
-        end
-
     end
 
     #
@@ -49,6 +45,10 @@ module BuildTool; module VCS
         #
         attr_reader :config
 
+        # Collect garbage, do maintenance ...
+        def gc
+        end
+
         def local_path
             local_path = @config.local_path
             raise ConfigurationError, "#{self.class}.local_path not set" if local_path.nil?
@@ -95,7 +95,7 @@ module BuildTool; module VCS
         ] do
             class_eval <<-EOS
                 def #{method}
-                    raise NotImplementedError, "Method #{method} is not implemented for class #{self}"
+                    raise NotImplementedError, "Method #{method} is not implemented for class %s" % self.class
                 end
             EOS
         end

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

@@ -97,6 +97,10 @@ module BuildTool; module VCS
             update_externals
         end
 
+        def gc
+            git.git( "gc" )
+        end
+
         def git
             if @git.nil?
                 @git = Git.new( config )

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

@@ -118,6 +118,10 @@ best chance you have is issuing the command manually!
 
         end
 
+        def gc
+            git( "gc" )
+        end
+
         def remote?( name )
             found = false
             git( "remote" ) do |line|

data/lib/mj/logging.rb

@@ -28,4 +28,15 @@ module MJ; module Logging;
 
     end # class BasicLayout
 
+    class LoggerAdapter
+
+        def initialize( prefix )
+            @prefix = prefix.upcase
+        end
+
+        def info( string )
+            logger.trace( "<#{@prefix}> #{string}" )
+        end
+    end
+
 end; end

data/recipes/kde/custom/scripting/pyqt4/compile.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Uncomment this line if you want to debug the script
+# set -x 
+
+source_directory=$1
+build_directory=$(pwd)
+
+echo "  - calling make"
+make

data/recipes/kde/custom/scripting/pyqt4/configure.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Uncomment this line if you want to debug the script
+# set -x 
+
+source_directory=$1
+build_directory=$(pwd)
+
+python ${source_directory}/configure.py \
+    --confirm-license \
+    --bindir=$INSTALL_PREFIX/bin \
+    --destdir=$INSTALL_PREFIX/lib$LIB_SUFFIX/python$PYTHON_VERSION/site-packages \
+    --sipdir=$INSTALL_PREFIX/share/sip \
+    --plugin-destdir=$INSTALL_PREFIX/lib$LIB_SUFFIX/plugins

data/recipes/kde/custom/scripting/pyqt4/install.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Uncomment this line if you want to debug the script
+# set -x 
+
+source_directory=$1
+build_directory=$(pwd)
+
+echo "- making install"
+make install

data/recipes/kde/custom/scripting/sip/compile.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Uncomment this line if you want to debug the script
+# set -x 
+
+source_directory=$1
+build_directory=$(pwd)
+
+echo "  - calling make"
+make

data/recipes/kde/custom/scripting/sip/configure.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Uncomment this line if you want to debug the script
+# set -x 
+
+source_directory=$1
+build_directory=$(pwd)
+
+python ${source_directory}/configure.py \
+    -b $INSTALL_PREFIX/bin \
+    -d $INSTALL_PREFIX/lib$LIB_SUFFIX/python$PYTHON_VERSION/site-packages \
+    -v $INSTALL_PREFIX/share/sip \
+    -e $INSTALL_PREFIX/include/python$PYTHON_VERSION

data/recipes/kde/custom/scripting/sip/install.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Uncomment this line if you want to debug the script
+# set -x 
+
+source_directory=$1
+build_directory=$(pwd)
+
+echo "- making install"
+make install

data/recipes/kde/files/xsession

@@ -1,3 +1,4 @@
+#!/bin/sh
 # vim:ft=sh
 # A script to start the kde workspace.
 #
@@ -48,21 +49,23 @@ function path_add
 # your shell login files (bash_profile, profile ...). We override any setting
 # made there!
 CMAKE_PREFIX_PATH="<%= settings['CMAKE_PREFIX_PATH'] %>"
-unset KDEDIRS
 LD_LIBRARY_PATH="<%= settings['LD_LIBRARY_PATH'] %>"
 PATH="<%= settings['PATH'] %>"
 PKG_CONFIG_PATH="<%= settings['PKG_CONFIG_PATH'] %>"
-unset STRIGI_PLUGIN_PATH
+PYTHONPATH="<%= settings['PYTHONPATH'] %>"
 XDG_DATA_DIRS="<%= settings['XDG_DATA_DIRS'] %>"
+unset STRIGI_PLUGIN_PATH
+unset KDEDIRS
 
 # Now add the necessary directories from the recipe. If they exist.
-for path in "<%= settings['KOFFICE_PREFIX'] %>" "<%= settings['KDEDEVEL_PREFIX'] %>" "<%= settings['KDE_PREFIX'] %>" "<%= settings['KDESUPPORT_PREFIX'] %>" ; do
+for path in "<%= settings['QT_PREFIX'] %>" "<%= settings['KOFFICE_PREFIX'] %>" "<%= settings['KDEDEVEL_PREFIX'] %>" "<%= settings['KDE_PREFIX'] %>" "<%= settings['KDESUPPORT_PREFIX'] %>" ; do
     if test -d $path  ; then
         path_add "CMAKE_PREFIX_PATH"  $path;
         path_add "KDEDIRS"            $path;
-        path_add "LD_LIBRARY_PATH"    $path/lib<%= settings['LIB_SUFFIX'] %>
+        path_add "LD_LIBRARY_PATH"    $path/lib<%= settings['LIB_SUFFIX'] %>;
         path_add "PATH"               $path/bin;
         path_add "PKG_CONFIG_PATH"    $path/lib<%= settings['LIB_SUFFIX'] %>/pkgconfig;
+        path_add "PYTHONPATH"         $path/lib<%= settings['LIB_SUFFIX'] %>/python<%= settings['PYTHON_VERSION'] %>/site-packages;
         path_add "STRIGI_PLUGIN_PATH" $path/lib<%= settings['LIB_SUFFIX'] %>/strigi;
         path_add "XDG_DATA_DIRS"      $path/share;
     fi
@@ -74,6 +77,7 @@ export KDEDIRS
 export LD_LIBRARY_PATH
 export PATH
 export PKG_CONFIG_PATH
+export PYTHONPATH
 export STRIGI_PLUGIN_PATH
 export XDG_DATA_DIRS
 

data/recipes/kde/kde-bindings.recipe

@@ -0,0 +1,22 @@
+#############################################################################
+# KDEBINDINGS
+#############################################################################
+environment kdebindings < kde
+    var PYTHON_PATH       set "<%= settings['KDE_PREFIX'] %>/lib<%= settings['LIB_SUFFIX'] %>/python2.6/site_packages"
+end
+
+module kdebindings < kde
+    use environment kdebindings
+    build-system cmake
+        # Currently onto2vocabulary crashes for me.
+        option BUILD_csharp "false"
+        option BUILD_ruby   "true"
+        option BUILD_python "true"
+        option BUILD_php    "false"
+        option BUILD_falcon "false"
+        option BUILD_java   "false"
+        option BUILD_smoke  "true"
+        option WITH_Nepomuk "false"
+    end
+end
+

data/recipes/kde/kde-core.recipe

@@ -0,0 +1,104 @@
+#############################################################################
+# KDE
+#############################################################################
+environment kde < kdesupport
+    var CMAKE_PREFIX_PATH  prepend "<%= settings['KDE_PREFIX'] %>"
+    var KDEDIRS            prepend "<%= settings['KDE_PREFIX'] %>"
+    var LD_LIBRARY_PATH    prepend "<%= settings['KDE_PREFIX'] %>/lib<%= settings['LIB_SUFFIX'] %>"
+    var MANPATH            prepend "<%= settings['KDE_PREFIX'] %>/share/man"
+    var PATH               prepend "<%= settings['KDE_PREFIX'] %>/bin"
+    var PKG_CONFIG_PATH    prepend "<%= settings['KDE_PREFIX'] %>/lib<%= settings['LIB_SUFFIX'] %>/pkgconfig"
+    var STRIGI_PLUGIN_PATH prepend "<%= settings['KDE_PREFIX'] %>/lib<%= settings['LIB_SUFFIX'] %>/strigi"
+    var XDG_DATA_DIRS      prepend "<%= settings['KDE_PREFIX'] %>"
+end
+
+module kde TEMPLATE
+    build-prefix   "<%= settings['BUILD_DIR'] %>"
+    install-prefix "<%= settings['KDE_PREFIX'] %>"
+    use build-system cmake
+    use environment  kde
+    use repository   kde-core
+    use vcs          git-svn
+end
+
+module kde-core < kde TEMPLATE
+end
+
+#############################################################################
+# KDELIBS
+#############################################################################
+module "kdesupport/oxygen-icons" < kdesupport
+    # It's part part of KDE and it's not. That's why i put it here for now.
+    # Don't use a KDE/ prefix before it is not necessary to update it very
+    # often.
+    remote-path "oxygen-icons"
+    use repository "kde-icons"
+end
+
+
+module "KDE/kdelibs" < "kde-core"
+    # We use the default environment here to make sure kdelibs is able to
+    # bootstrap
+    use environment kdesupport
+    remote-path "kdelibs"
+end
+
+
+feature webkit
+    short description "WebKit related modules"
+
+    module "KDE/kwebkitpart" < kde
+        use repository  kde
+        remote-path     "extragear/base/kwebkitpart"
+    end
+
+end # feature webkit
+
+module "KDE/kdepimlibs" < "kde-core"
+    remote-path "kdepimlibs"
+end
+
+
+#############################################################################
+# PyKDE4
+#############################################################################
+# The module is needed for plasmas python support.
+
+feature "scripting"
+
+    feature "python"
+
+        module "KDE/pykde4" < kde
+            remote-path "kdebindings/python/pykde4"
+            build-system cmake
+              # option BUILD_Nepomuk            "false"
+              option PYTHON_LIBS_WITH_KDE_LIBS  "true"
+              option SIP_DEFAULT_SIP_DIR        "<%= settings['KDE_PREFIX'] %>/share/sip"
+              option SIP_INCLUDES               "<%= settings['SIP_INCLUDES'] %>"
+            end
+        end
+    end
+
+end
+
+#############################################################################
+# KDEBASE/...
+#############################################################################
+module "KDE/kdebase/runtime"     < "kde-core"
+    remote-path     "kdebase/runtime"
+end
+
+module "KDE/kdebase/workspace"   < "kde-core"
+    remote-path     "kdebase/workspace"
+    build-system cmake
+      option PYTHON_LIBS_WITH_KDE_LIBS  "true"
+    end
+end
+
+module "KDE/kdebase/apps"        < "kde-core"
+    remote-path     "kdebase/apps"
+end
+
+module "KDE/kdepim"              < kde
+    remote-path     "kdepim"
+end