# HG changeset patch # User John W. Eaton # Date 1357361437 18000 # Node ID 92d86e3e91734b692dc96e3d9561efbc796611c0 # Parent 484c88cf1ecf2d8d9df43dce2b65ee9892c267d6 improve mk-dist script diff -r 484c88cf1ecf -r 92d86e3e9173 mk-dist --- a/mk-dist Fri Jan 04 15:56:44 2013 -0500 +++ b/mk-dist Fri Jan 04 23:50:37 2013 -0500 @@ -2,8 +2,30 @@ set -e +jobs=9 + +while [ $# -gt 0 ]; do + case "$1" in + --jobs) + shift + if [ $# -gt 0 ]; then + jobs=$1 + shift + else + echo "mk-dist: expecting argument for --jobs option" 1>&2 + exit 1 + fi + ;; + *) + echo "mk-dist: unrecognized option: $1" 1>&2 + exit 1 + ;; + esac +done + TOPDIR=$(pwd) -PATH=/scratch/jwe/src/mxe-octave/usr/bin:$PATH +PATH=$TOPDIR/usr/bin:$PATH +PREFIX=/usr TARGET=i686-pc-mingw32 BUILD=x86_64-unwknown-linux-gnu STRIP=$TARGET-strip @@ -13,10 +35,12 @@ mkdir -p dist/octave echo "building octave and dependencies..." -make octave native-gcc native-binutils JOBS=9 +make octave native-gcc native-binutils JOBS=$jobs + +exit 1 echo "copying files..." -cd $TOPDIR/cross-tools/$PREFIX/$TARGET +cd $TOPDIR/cross-tools/$TOPDIR/$PREFIX/$TARGET find . -type f -o -type l | sed "s,./,," > $TOPDIR/excluded-gcc-files cd $TOPDIR/usr/$TARGET tar -c -h -X $TOPDIR/excluded-gcc-files -f - . | ( cd $TOPDIR/dist/octave ; tar xpf - )