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 Add -t option for the tar program to use

Like make-src-dist.sh, add a `-t` option to make-main-dist.sh and make-extra-dist.sh to specify the tar program to use. (Generally it's `tar` except on Solaris where we want to use `gtar`.)

This means make-dist.sh has to determine the tar program to use and sets the `-t` option when calling the other scripts.

- - - - -

3 changed files:

- bin/make-dist.sh - bin/make-extra-dist.sh - bin/make-main-dist.sh

Changes:

===================================== bin/make-dist.sh ===================================== @@ -54,7 +54,6 @@ usage() { exit 1 }

-export GTAR def_arch_os () { case `uname -s` in SunOS) @@ -208,9 +207,10 @@ if [ -z "$ENABLE_GZIP" -a -z "$ENABLE_BZIP" ]; then ENABLE_BZIP="-b" fi

-OPTIONS="${GROUP:+ -G ${GROUP}} ${OWNER:+ -O ${OWNER}} ${INSTALL_DIR:+ -I ${INSTALL_DIR}} $ENABLE_GZIP $ENABLE_BZIP" +OPTIONS="-t ${GTAR:-tar} ${GROUP:+ -G ${GROUP}} ${OWNER:+ -O ${OWNER}} ${INSTALL_DIR:+ -I ${INSTALL_DIR}}" MANDIR="${MANDIR:+ -M ${MANDIR}}"

+set -x echo Creating distribution for $ARCH $OS $ROOT/make-main-dist.sh $OPTIONS ${MANDIR} $TARGET $VERSION $ARCH $OS || exit 1 $ROOT/make-extra-dist.sh $OPTIONS $TARGET $VERSION $ARCH $OS || exit 2

===================================== bin/make-extra-dist.sh ===================================== @@ -1,6 +1,8 @@ #!/bin/sh

-while getopts "G:O:I:bgh?" arg +GTAR=tar +set -x +while getopts "G:O:I:t:bgh?" arg do case $arg in G) GROUP="-g $OPTARG" ;; @@ -8,6 +10,7 @@ do I) INSTALL_DIR=$OPTARG ;; b) ENABLE_BZIP=-b ;; g) ENABLE_GZIP=-g ;; + t) GTAR=$OPTARG ;; h | ?) usage; exit 1 ;; esac done @@ -134,7 +137,7 @@ done if [ -z "$INSTALL_DIR" ]; then sync ; sleep 1 ; sync ; sleep 1 ; sync echo Tarring extra components - ${GTAR:-tar} -C $DESTDIR $COMPRESS -cf cmucl-$VERSION-$ARCH-$OS.extra.tar.$COMPRESS_EXT lib + $GTAR -C $DESTDIR $COMPRESS -cf cmucl-$VERSION-$ARCH-$OS.extra.tar.$COMPRESS_EXT lib

echo Cleaning $DESTDIR [ -d $DESTDIR ] && rm -rf $DESTDIR

===================================== bin/make-main-dist.sh ===================================== @@ -1,7 +1,8 @@ #!/bin/sh

-# set -x -while getopts "G:O:I:M:bgh?" arg +GTAR=tar +set -x +while getopts "G:O:I:M:t:bgh?" arg do case $arg in G) GROUP="-g $OPTARG" ;; @@ -10,6 +11,7 @@ do M) MANDIR=$OPTARG ;; b) ENABLE_BZIP=-b ;; g) ENABLE_GZIP=-g ;; + t) GTAR=$OPTARG ;; h | ?) usage; exit 1 ;; esac done @@ -178,7 +180,7 @@ fi if [ -z "$INSTALL_DIR" ]; then sync ; sleep 1 ; sync ; sleep 1 ; sync echo Tarring main components - ${GTAR:-tar} -C $DESTDIR $COMPRESS -cf cmucl-$VERSION-$ARCH-$OS.tar.$COMPRESS_EXT . + $GTAR -C $DESTDIR $COMPRESS -cf cmucl-$VERSION-$ARCH-$OS.tar.$COMPRESS_EXT .

echo Cleaning $DESTDIR [ -d $DESTDIR ] && rm -rf $DESTDIR

View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3ba7ef8b3e1e31bf38a388a5...