diff options
author | Eric Hameleers <alien@slackware.com> | 2008-05-22 12:59:41 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2008-05-22 12:59:41 +0000 |
commit | 5939b854ea787f21b711de864736a8ef37954a38 (patch) | |
tree | 2d3964d0ae672ec67e5f9ac2ed416f82def8f69b /scons | |
parent | bdb175a2a8a9b1545bea9dbf212260722b7599bd (diff) | |
download | asb-5939b854ea787f21b711de864736a8ef37954a38.tar.gz asb-5939b854ea787f21b711de864736a8ef37954a38.tar.xz |
Update for 0.98.4
Add TAG=alien; better SRCDIR determination; add SlackBuild to docdir
Diffstat (limited to 'scons')
-rwxr-xr-x | scons/build/scons.SlackBuild | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/scons/build/scons.SlackBuild b/scons/build/scons.SlackBuild index 2bf8350d..cac54fab 100755 --- a/scons/build/scons.SlackBuild +++ b/scons/build/scons.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2007 Eric Hameleers <alien@slackware.com> +# Copyright (c) 2007-2008 Eric Hameleers <alien@slackware.com> # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -32,6 +32,8 @@ # Changelog: # 0.97-1: 05/Nov/2007 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 0.98.4-1: 22/may/2008 by Eric Hameleers <alien@slackware.com> +# * Update. This is a candidate for scons 1.0 # # Run 'sh scons.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -42,25 +44,23 @@ # Set initial variables: PRGNAM=scons -VERSION=${VERSION:-0.97} +VERSION=${VERSION:-0.98.4} ARCH=noarch BUILD=${BUILD:-1} +TAG=${TAG:-alien} DOCS="CHANGES.txt LICENSE.txt README.txt RELEASE.txt" # Where do we look for sources? -CWD=$(pwd) -SRCDIR=$(dirname $0) -[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR} +SRCDIR=$(cd $(dirname $0); pwd) # Place to build (TMP) package (PKG) and output (OUTPUT) the program: TMP=${TMP:-/tmp/build} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Input URL: http://dl.sourceforge.net/scons/scons-0.97.tar.gz SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz" -SRCURL="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz" +SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz" ## ## --- with a little luck, you won't have to edit below this point --- ## @@ -81,9 +81,6 @@ else fi case "$ARCH" in - i386) SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; i486) SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; @@ -104,9 +101,9 @@ esac # Create working directories: mkdir -p $TMP/tmp-$PRGNAM # location to build the source rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build -mkdir -p $PKG # place for the package to be built -rm -rf $PKG/* # We always erase old package's contents: -mkdir -p $OUTPUT # place for the package to be saved +mkdir -p $PKG # place for the package to be built +rm -rf $PKG/* # erase old package's contents +mkdir -p $OUTPUT # place for the package to be saved # Source file availability: if ! [ -f ${SOURCE} ]; then @@ -115,7 +112,7 @@ if ! [ -f ${SOURCE} ]; then [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" echo "Source '$(basename ${SOURCE})' not available yet..." echo "Will download file to $(dirname $SOURCE)" - wget -nv --connect-timeout=30 -O "${SOURCE}" "${SRCURL}" || true + wget -nv -T 30 -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then echo "Downloading '$(basename ${SOURCE})' failed... aborting the build." mv -f "${SOURCE}" "${SOURCE}".FAIL @@ -158,7 +155,8 @@ python ./setup.py install --root=$PKG --symlink-scons \ # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true -chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/* +cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +find $PKG/usr/doc -type f -exec chmod 644 {} \; # Compress the man page(s): if [ -d $PKG/usr/man ]; then @@ -178,11 +176,11 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5 +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt +cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt # Clean up the extra stuff: if [ "$P1" = "--cleanup" ]; then |