[Git][cmucl/cmucl][issue-352-new-compression-for-dist] 2 commits: Remove the -b and -g options

27 Aug 2024


      Raymond Toy pushed to branch issue-352-new-compression-for-dist at cmucl / cmucl


Commits:
6cc35905 by Raymond Toy at 2024-08-27T07:41:18-07:00
Remove the -b and -g options

We do compression in a different way now so we don't need the `-b` and
`-g` options anymore.  Thus, remove these from all the relevant
scripts.  Remove the supporting code as well.

- - - - -
6c4f5004 by Raymond Toy at 2024-08-27T07:43:12-07:00
Forgot to remove -b and -g from make-dist.sh

- - - - -


3 changed files:

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


Changes:

=====================================
bin/make-dist.sh
=====================================
@@ -12,10 +12,8 @@
 # $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/make-dist.sh,v 1.20 2011/04/11 16:34:49 rtoy Exp $
 
 usage() {
-    echo "make-dist.sh: [-hbg] [-C compress] [-G group] [-O owner] [-I destdir] [-M mandir] [-A arch] [-V version] [-o OS] dir"
+    echo "make-dist.sh: [-h] [-C compress] [-G group] [-O owner] [-I destdir] [-M mandir] [-A arch] [-V version] [-o OS] dir"
     echo "  -h           This help"
-    echo "  -b           Use bzip2 compression"
-    echo "  -g           Use gzip compression"
     echo "  -C compress  Compression method to use for the tar archives.  Must be one of"
     echo "                 bzip2, xz, or gzip.  The default depends on the OS"
     echo "  -G group     Group to use"
@@ -118,7 +116,7 @@ COMPRESS_EXT=xz
 COMPRESS_NAME=xz
 export COMPRESS COMPRESS_EXT COMPRESS_NAME
 
-while getopts "C:G:O:I:M:bghSA:o:V:?" arg
+while getopts "C:G:O:I:M:hSA:o:V:?" arg
 do
     case $arg in
 	C) COMPRESS_ARG=$OPTARG ;;
@@ -126,8 +124,6 @@ do
 	O) OWNER=$OPTARG ;;
         I) INSTALL_DIR=$OPTARG ;;
         M) MANDIR=$OPTARG ;;
-	b) ENABLE_BZIP=-b ;;
-	g) ENABLE_GZIP=-g  ;;
         S) MAKE_SRC_DIST=yes ;;
         A) ARCH=$OPTARG ;;
         o) OS=$OPTARG ;;
@@ -202,11 +198,6 @@ fi
 echo cmucl-$VERSION-$ARCH-$OS
 ROOT=`dirname $0`
 
-# If no compression options given, default to bzip
-if [ -z "$ENABLE_GZIP" -a -z "$ENABLE_BZIP" ]; then
-    ENABLE_BZIP="-b"
-fi
-
 OPTIONS="-t ${GTAR:-tar} ${GROUP:+ -G ${GROUP}} ${OWNER:+ -O ${OWNER}} ${INSTALL_DIR:+ -I ${INSTALL_DIR}}"
 MANDIR="${MANDIR:+ -M ${MANDIR}}"
 
@@ -216,8 +207,6 @@ $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
 
 if [ X"$MAKE_SRC_DIST" = "Xyes" ]; then
-    # If tar is not GNU tar, set the environment variable GTAR toy
-    # point to GNU tar.
-    OPTIONS="${INSTALL_DIR:+ -I ${INSTALL_DIR}} $ENABLE_GZIP $ENABLE_BZIP"
+    OPTIONS="${INSTALL_DIR:+ -I ${INSTALL_DIR}}"
     $ROOT/make-src-dist.sh $OPTIONS -t ${GTAR:-tar} $VERSION
 fi


=====================================
bin/make-extra-dist.sh
=====================================
@@ -2,14 +2,12 @@
 
 GTAR=tar
 set -x
-while getopts "G:O:I:t:bgh?" arg
+while getopts "G:O:I:t:h?" arg
 do
     case $arg in
 	G) GROUP="-g $OPTARG" ;;
 	O) OWNER="-o $OPTARG" ;;
         I) INSTALL_DIR=$OPTARG ;;
-	b) ENABLE_BZIP=-b ;;
-	g) ENABLE_GZIP=-g  ;;
 	t) GTAR=$OPTARG ;;
 	h | \?) usage; exit 1 ;;
     esac


=====================================
bin/make-main-dist.sh
=====================================
@@ -2,15 +2,13 @@
 
 GTAR=tar
 set -x
-while getopts "G:O:I:M:t:bgh?" arg
+while getopts "G:O:I:M:t:h?" arg
 do
     case $arg in
 	G) GROUP="-g $OPTARG" ;;
 	O) OWNER="-o $OPTARG" ;;
         I) INSTALL_DIR=$OPTARG ;;
         M) MANDIR=$OPTARG ;;
-	b) ENABLE_BZIP=-b ;;
-	g) ENABLE_GZIP=-g  ;;
 	t) GTAR=$OPTARG ;;
 	h | \?) usage; exit 1 ;;
     esac



View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/3ba7ef8b3e1e31bf38a388a...

-- 
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/3ba7ef8b3e1e31bf38a388a...
You're receiving this email because of your account on gitlab.common-lisp.net.

    

Raymond Toy (＠rtoy)

tags

participants (1)