RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ .cvsignore devtool.bashrc devtool.conf

From: Ralf S. Engelschall <rse@rpm5.org>
Date: Mon 16 Jul 2007 - 18:06:51 CEST
Message-Id: <20070716160651.DA6AE3484F3@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   16-Jul-2007 18:06:51
  Branch: HEAD                             Handle: 2007071617065100

  Added files:
    rpm                     devtool.bashrc
  Modified files:
    rpm                     .cvsignore devtool.conf

  Log:
    initial support for a very convenient way for RPM developers to build
    RPM on a cluster of machines

  Summary:
    Revision    Changes     Path
    1.37        +1  -1      rpm/.cvsignore
    2.1         +34 -0      rpm/devtool.bashrc
    2.33        +7  -2      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/.cvsignore
  ============================================================================
  $ cvs diff -u -r1.36 -r1.37 .cvsignore
  --- rpm/.cvsignore	16 Jul 2007 13:01:23 -0000	1.36
  +++ rpm/.cvsignore	16 Jul 2007 16:06:51 -0000	1.37
  @@ -2,7 +2,7 @@
   .depend
   .depend-done
   .libs
  -devtool.log.*
  +.devtool
   ABOUT-NLS
   Doxyfile
   Doxytags
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.bashrc
  ============================================================================
  $ cvs diff -u -r0 -r2.1 devtool.bashrc
  --- /dev/null	2007-07-16 18:05:21 +0200
  +++ devtool.bashrc	2007-07-16 18:06:51 +0200
  @@ -0,0 +1,34 @@
  +##
  +##  devtool.bashrc -- Development Tool GNU Bash convenience function
  +##  Copyright (c) 2001-2007 Ralf S. Engelschall <rse@engelschall.com>
  +##
  +
  +devtool () {
  +    workdir=`pwd`
  +    basedir=$workdir
  +    while [ ".$basedir" != . ]; do
  +        if [ -f "$basedir/devtool" ]; then
  +            break
  +        else
  +            basedir=`echo "${basedir}" | sed -e 's;[^/]*$;;' -e 's;/*$;;'`
  +        fi
  +    done
  +    if [ ".$basedir" = . ]; then
  +        echo "devtool: sorry, you are staying outside any \"devtool\" controlled area"
  +    else
  +        platform=`(shtool platform -n -L -S "" -C "+" -F '%<ap>-%<sp>' || uname -s) 2>/dev/null`
  +        if [ ".$1" = ".setup-platform" ]; then
  +            if [ ! -d "${basedir}/.devtool/${platform}" ]; then
  +                shtool mkdir -f -p -m 755 "${basedir}/.devtool/${platform}"
  +            fi
  +        else
  +            subdir=`echo "$workdir" | sed -e "s;^$basedir/*;;"`
  +            (   if [ -d "${basedir}/.devtool/${platform}/${subdir}" ]; then
  +                    cd "${basedir}/.devtool/${platform}/${subdir}"
  +                fi
  +                $basedir/devtool "$@"
  +            ) || return $?
  +        fi
  +    fi
  +}
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.32 -r2.33 devtool.conf
  --- rpm/devtool.conf	16 Jul 2007 15:28:30 -0000	2.32
  +++ rpm/devtool.conf	16 Jul 2007 16:06:51 -0000	2.33
  @@ -41,6 +41,11 @@
           --verbose \
           "$@"
   
  +%make
  +    #   intentionally just a pass-through target
  +    #   (important for use with devtool.bashrc)
  +    make "$@" 
  +
   %prepare
       %checkout
       %autogen
  @@ -200,7 +205,7 @@
       dist="${dist} http://cvs.openpkg.org/openpkg-src/popt/popt.patch"
   
       #   third-party base directory, installation default prefix and platform
  -    base3rd="../3rd"
  +    base3rd="${DEVTOOL_SRCDIR}/../3rd"
       prefix="/tmp/rpm"
       platform=`shtool platform -n -L -S "" -C "+" -F '%<ap>-%<sp>'`
   
  @@ -559,7 +564,7 @@
       if [ $# -eq 0 ]; then
           set -- all
       fi
  -    ( eval ${1+"$@"} ) 2>&1 | tee devtool.log.$platform
  +    ( eval ${1+"$@"} ) 2>&1
   
   %tarball
       %checkout
  @@ .
Received on Mon Jul 16 18:06:51 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.