Raymond Toy pushed to branch issue-352-new-compression-for-dist at cmucl / cmucl
Commits:
-
3ba7ef8b
by Raymond Toy at 2024-08-27T07:35:22-07:00
3 changed files:
Changes:
| ... | ... | @@ -54,7 +54,6 @@ usage() { |
| 54 | 54 | exit 1
|
| 55 | 55 | }
|
| 56 | 56 | |
| 57 | -export GTAR
|
|
| 58 | 57 | def_arch_os () {
|
| 59 | 58 | case `uname -s` in
|
| 60 | 59 | SunOS)
|
| ... | ... | @@ -208,9 +207,10 @@ if [ -z "$ENABLE_GZIP" -a -z "$ENABLE_BZIP" ]; then |
| 208 | 207 | ENABLE_BZIP="-b"
|
| 209 | 208 | fi
|
| 210 | 209 | |
| 211 | -OPTIONS="${GROUP:+ -G ${GROUP}} ${OWNER:+ -O ${OWNER}} ${INSTALL_DIR:+ -I ${INSTALL_DIR}} $ENABLE_GZIP $ENABLE_BZIP"
|
|
| 210 | +OPTIONS="-t ${GTAR:-tar} ${GROUP:+ -G ${GROUP}} ${OWNER:+ -O ${OWNER}} ${INSTALL_DIR:+ -I ${INSTALL_DIR}}"
|
|
| 212 | 211 | MANDIR="${MANDIR:+ -M ${MANDIR}}"
|
| 213 | 212 | |
| 213 | +set -x
|
|
| 214 | 214 | echo Creating distribution for $ARCH $OS
|
| 215 | 215 | $ROOT/make-main-dist.sh $OPTIONS ${MANDIR} $TARGET $VERSION $ARCH $OS || exit 1
|
| 216 | 216 | $ROOT/make-extra-dist.sh $OPTIONS $TARGET $VERSION $ARCH $OS || exit 2
|
| 1 | 1 | #!/bin/sh
|
| 2 | 2 | |
| 3 | -while getopts "G:O:I:bgh?" arg
|
|
| 3 | +GTAR=tar
|
|
| 4 | +set -x
|
|
| 5 | +while getopts "G:O:I:t:bgh?" arg
|
|
| 4 | 6 | do
|
| 5 | 7 | case $arg in
|
| 6 | 8 | G) GROUP="-g $OPTARG" ;;
|
| ... | ... | @@ -8,6 +10,7 @@ do |
| 8 | 10 | I) INSTALL_DIR=$OPTARG ;;
|
| 9 | 11 | b) ENABLE_BZIP=-b ;;
|
| 10 | 12 | g) ENABLE_GZIP=-g ;;
|
| 13 | + t) GTAR=$OPTARG ;;
|
|
| 11 | 14 | h | \?) usage; exit 1 ;;
|
| 12 | 15 | esac
|
| 13 | 16 | done
|
| ... | ... | @@ -134,7 +137,7 @@ done |
| 134 | 137 | if [ -z "$INSTALL_DIR" ]; then
|
| 135 | 138 | sync ; sleep 1 ; sync ; sleep 1 ; sync
|
| 136 | 139 | echo Tarring extra components
|
| 137 | - ${GTAR:-tar} -C $DESTDIR $COMPRESS -cf cmucl-$VERSION-$ARCH-$OS.extra.tar.$COMPRESS_EXT lib
|
|
| 140 | + $GTAR -C $DESTDIR $COMPRESS -cf cmucl-$VERSION-$ARCH-$OS.extra.tar.$COMPRESS_EXT lib
|
|
| 138 | 141 | |
| 139 | 142 | echo Cleaning $DESTDIR
|
| 140 | 143 | [ -d $DESTDIR ] && rm -rf $DESTDIR
|
| 1 | 1 | #!/bin/sh
|
| 2 | 2 | |
| 3 | -# set -x
|
|
| 4 | -while getopts "G:O:I:M:bgh?" arg
|
|
| 3 | +GTAR=tar
|
|
| 4 | +set -x
|
|
| 5 | +while getopts "G:O:I:M:t:bgh?" arg
|
|
| 5 | 6 | do
|
| 6 | 7 | case $arg in
|
| 7 | 8 | G) GROUP="-g $OPTARG" ;;
|
| ... | ... | @@ -10,6 +11,7 @@ do |
| 10 | 11 | M) MANDIR=$OPTARG ;;
|
| 11 | 12 | b) ENABLE_BZIP=-b ;;
|
| 12 | 13 | g) ENABLE_GZIP=-g ;;
|
| 14 | + t) GTAR=$OPTARG ;;
|
|
| 13 | 15 | h | \?) usage; exit 1 ;;
|
| 14 | 16 | esac
|
| 15 | 17 | done
|
| ... | ... | @@ -178,7 +180,7 @@ fi |
| 178 | 180 | if [ -z "$INSTALL_DIR" ]; then
|
| 179 | 181 | sync ; sleep 1 ; sync ; sleep 1 ; sync
|
| 180 | 182 | echo Tarring main components
|
| 181 | - ${GTAR:-tar} -C $DESTDIR $COMPRESS -cf cmucl-$VERSION-$ARCH-$OS.tar.$COMPRESS_EXT .
|
|
| 183 | + $GTAR -C $DESTDIR $COMPRESS -cf cmucl-$VERSION-$ARCH-$OS.tar.$COMPRESS_EXT .
|
|
| 182 | 184 | |
| 183 | 185 | echo Cleaning $DESTDIR
|
| 184 | 186 | [ -d $DESTDIR ] && rm -rf $DESTDIR
|