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

Commits: b9e0b5f5 by Raymond Toy at 2024-08-27T16:03:56-07:00 Add better usage info for make-main-dist and make-extra-dist

The usage message for make-main-dist.sh and make-extra-dist.sh were pretty inadequate. Make it better.

- - - - - 376c4ce6 by Raymond Toy at 2024-08-27T16:10:13-07:00 Update what's actually in the main and extra tarballs

Remove the debugging `set -x` too.

- - - - -

2 changed files:

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

Changes:

===================================== bin/make-extra-dist.sh ===================================== @@ -1,7 +1,23 @@ #!/bin/sh

+usage() { + echo "make-extra-dist.sh [-t tar] [-I destdir] [-G group] [-O owner]" + echo " -h This help" + echo " -? This help" + echo " -t tar Tar program to use" + 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." + exit 1 +} + GTAR=tar -set -x while getopts "G:O:I:t:h?" arg do case $arg in @@ -17,8 +33,7 @@ shift `expr $OPTIND - 1`

if [ "$1" = "" -o "$2" = "" -o "$3" = "" -o "$4" = "" ] then - echo "Usage: $0 target-directory version arch os" - exit 1 + usage fi

if [ ! -d "$1" ]

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

+usage() { + echo "make-main-dist.sh [-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 " -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." + exit 1 +} + GTAR=tar -set -x while getopts "G:O:I:M:t:h?" arg do case $arg in @@ -18,8 +37,7 @@ shift `expr $OPTIND - 1`

if [ "$1" = "" -o "$2" = "" -o "$3" = "" -o "$4" = "" ] then - echo "Usage: $0 target-directory version arch os" - exit 1 + usage fi

if [ ! -d "$1" ]

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