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

Commits: 12fb0ea3 by Raymond Toy at 2024-09-01T06:31:51-07:00 Apply review suggestions.

- - - - -

3 changed files:

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

Changes:

===================================== bin/make-extra-dist.sh ===================================== @@ -1,22 +1,24 @@ #!/bin/sh

usage() { - echo "make-extra-dist.sh -C option -E ext [-t tar] [-I destdir] [-G group] [-O owner]" - echo " -h This help" - echo " -? This help" - echo " -t tar Tar program to use" - echo " -C option Tar option for compressing the tarball; required." - echo " -E ext Extension to use for the tarball. Must be consistent with" - echo " -C option. Required." - echo " -I destdir Install directly to given directory instead of creating a tarball" - echo " -G group Group to use" - echo " -O owner Owner to use" - echo "" - echo "This is generally called by make-dist.sh and not normally invoked by the user" - echo "" - echo "Create a tarball of the extra components for cmucl. This includes things like " - echo "CLX; Hemlock; CLM; contrib library not already included in the main" - echo "distribution; locale messages." + cat <<EOF +`basename $0` -C option -E ext [-t tar] [-I destdir] [-G group] [-O owner] + -h This help + -? This help + -t tar Tar program to use + -C option Tar option for compressing the tarball; required. + -E ext Extension to use for the tarball. Must be consistent with + -C option. Required. + -I destdir Install directly to given directory instead of creating a tarball + -G group Group to use + -O owner Owner to use + +This is generally called by make-dist.sh and not normally invoked by the user + +Create a tarball of the extra components for cmucl. This includes things like +CLX; Hemlock; CLM; contrib library not already included in the main +distribution; locale messages. +EOF exit 1 }

===================================== bin/make-main-dist.sh ===================================== @@ -1,25 +1,27 @@ #!/bin/sh

usage() { - echo "make-main-dist.sh -C option -E ext [-h?] [-t tar][-I destdir] [-G group] [-O owner] [-M mandir]" - echo " target-directory version arch os" - echo " -h This help" - echo " -? This help" - echo " -t tar Tar program to use" - echo " -C option Tar option for compressing the tarball; required." - echo " -E ext Extension to use for the tarball. Must be consistent with" - echo " -C option. Required." - echo " -I destdir Install directly to given directory instead of creating a tarball" - echo " -G group Group to use" - echo " -O owner Owner to use" - echo " -M mandir Install manpages in this subdirectory. Default is man/man1" - echo "" - echo "This is generally called by make-dist.sh and not normally invoked by the user" - echo "" - echo "Create a tarball consisting of the main components needed to distribute" - echo "a binary installation of cmucl. This includes the C executable and support" - echo "libraries; the subsystems like Gray streams, and simple streams; external" - echo "formats; contribs like asdf and defsystem; manpages and READMEs." + cat <<EOF +`basename $0` -C option -E ext [-h?] [-t tar][-I destdir] [-G group] [-O owner] [-M mandir] + target-directory version arch os + -h This help + -? This help + -t tar Tar program to use + -C option Tar option for compressing the tarball; required. + -E ext Extension to use for the tarball. Must be consistent with + -C option. Required. + -I destdir Install directly to given directory instead of creating a tarball + -G group Group to use + -O owner Owner to use + -M mandir Install manpages in this subdirectory. Default is man/man1 + +This is generally called by make-dist.sh and not normally invoked by the user + +Create a tarball consisting of the main components needed to distribute +a binary installation of cmucl. This includes the C executable and support +libraries; the subsystems like Gray streams, and simple streams; external +formats; contribs like asdf and defsystem; manpages and READMEs." +EOF exit 1 }

===================================== bin/make-src-dist.sh ===================================== @@ -1,21 +1,26 @@ #!/bin/sh

usage() { - echo "make-src-dist.sh: -C option -E ext [-h?] [-t gnutar] [-I destdir] [version]" - echo " -h This help" - echo " -? This help" - echo " -t tar Name/path to GNU tar" - echo " -C option Tar option for compressing the tarball; required." - echo " -E ext Extension to use for the tarball. Must be consistent with" - echo " -C option. Required." - echo " -I destdir Install directly to given directory instead of creating a tarball" - echo " version The version. Defaults to the current date" - echo "" - echo "This is generally called by make-dist.sh and not normally invoked by the user" - echo "" - echo "Create a tar ball of the cmucl sources." + cat <<EOF +`basename $0` -C option -E ext [-h?] [-t gnutar] [-I destdir] [version] + -h This help + -? This help + -t tar Name/path to GNU tar + -C option Tar option for compressing the tarball; required. + -E ext Extension to use for the tarball. Must be consistent with + -C option. Required. + -I destdir Install directly to given directory instead of creating a tarball + version The version. Defaults to the current date + +This is generally called by make-dist.sh and not normally invoked by the user + +Create a tar ball of the cmucl sources." +EOF + exit 1 }

+GTAR=tar + while getopts "C:E:h?t:I:" arg do case $arg in @@ -51,8 +56,8 @@ echo Creating source distribution GTAR_OPTIONS="--exclude=.git --exclude='*.pot.~*~'" if [ -z "$INSTALL_DIR" ]; then # echo " Compressing with $ZIP" - ${GTAR:-tar} ${GTAR_OPTIONS} ${COMPRESS} -cf cmucl-src-$VERSION.tar.$COMPRESS_EXT bin src tests + ${GTAR} ${GTAR_OPTIONS} ${COMPRESS} -cf cmucl-src-$VERSION.tar.$COMPRESS_EXT bin src tests else # Install in the specified directory - ${GTAR:-tar} ${GTAR_OPTIONS} -cf - bin src tests | (cd $INSTALL_DIR; ${GTAR:-tar} xf -) + ${GTAR} ${GTAR_OPTIONS} -cf - bin src tests | (cd $INSTALL_DIR; ${GTAR:-tar} xf -) fi

View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/12fb0ea3d2c6e7dfd093fb9d...