- cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl] Pushed new branch issue-355-solaris-x86-fp-trap-handler
by Raymond Toy (＠rtoy) 28 Aug '24

28 Aug '24

Raymond Toy pushed new branch issue-355-solaris-x86-fp-trap-handler at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-355-solaris-x86-fp-… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-352-new-compression-for-dist] 5 commits: Clean up usage message
by Raymond Toy (＠rtoy) 27 Aug '24

27 Aug '24

Raymond Toy pushed to branch issue-352-new-compression-for-dist at cmucl / cmucl Commits: 48cabd23 by Raymond Toy at 2024-08-27T16:18:25-07:00 Clean up usage message We don't support `-b` and `-g` options anymore so remove them from the usage message. Add note about `version` being optional and the default value. - - - - - c21d6a97 by Raymond Toy at 2024-08-27T16:22:33-07:00 More cleanups for usage message and compression code Remove the `-b` and `-g` options from the usage options and add `-?`. Also don't recognize these as command-line options. Finally, remove the code that handled the these options. - - - - - 3a98c0ab by Raymond Toy at 2024-08-27T16:39:25-07:00 Add -C and -E options to specify compression info for sub-scripts Use the `-C` and `-E` options to set the appropriate tar compression option and the corresponding extension. These are set in make-dist.sh to tell make-main-dist.sh, make-extra-dist.sh, and make-src-dist.sh how to compress the tarball with the appropriate extension. - - - - - d7825bf9 by Raymond Toy at 2024-08-27T16:40:11-07:00 Remove code for old -b and -g options These aren't used anymore so remove the code for that. - - - - - 2b4e1278 by Raymond Toy at 2024-08-27T16:46:57-07:00 More cleanups Forgot tell make-src-dist.sh that -C and -E are valid options. And also forgot to supply these options when make-dist.sh calls make-src-dist.sh. Enforce the requirement that -C and -E are required for make-main-dist.sh and friends. - - - - - 4 changed files: - bin/make-dist.sh - bin/make-extra-dist.sh - bin/make-main-dist.sh - bin/make-src-dist.sh Changes: ===================================== bin/make-dist.sh ===================================== @@ -114,7 +114,6 @@ fi COMPRESS=-J COMPRESS_EXT=xz COMPRESS_NAME=xz -export COMPRESS COMPRESS_EXT COMPRESS_NAME while getopts "C:G:O:I:M:hSA:o:V:?" arg do @@ -198,7 +197,7 @@ fi echo cmucl-$VERSION-$ARCH-$OS ROOT=`dirname $0` -GTAR_OPTS="-t ${GTAR:-gtar}" +GTAR_OPTS="-t ${GTAR:-tar}" EXTRA_OPTS="${GROUP:+ -G ${GROUP}} ${OWNER:+ -O ${OWNER}}" INSTALL_OPTS="${INSTALL_DIR:+ -I ${INSTALL_DIR}}" MANDIR="${MANDIR:+ -M ${MANDIR}}" @@ -206,9 +205,9 @@ OPTIONS="${GTAR_OPTS} ${EXTRA_OPTS} ${INSTALL_OPTS} ${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 +$ROOT/make-main-dist.sh -C $COMPRESS -E $COMPRESS_EXT $OPTIONS ${MANDIR} $TARGET $VERSION $ARCH $OS || exit 1 +$ROOT/make-extra-dist.sh -C $COMPRESS -E $COMPRESS_EXT $OPTIONS $TARGET $VERSION $ARCH $OS || exit 2 if [ X"$MAKE_SRC_DIST" = "Xyes" ]; then - $ROOT/make-src-dist.sh ${GTAR_OPTS} ${INSTALL_OPTS} $VERSION + $ROOT/make-src-dist.sh -C $COMPRESS -E $COMPRESS_EXT ${GTAR_OPTS} ${INSTALL_OPTS} $VERSION fi ===================================== bin/make-extra-dist.sh ===================================== @@ -1,10 +1,13 @@ #!/bin/sh usage() { - echo "make-extra-dist.sh [-t tar] [-I destdir] [-G group] [-O owner]" + 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" @@ -18,9 +21,11 @@ usage() { } GTAR=tar -while getopts "G:O:I:t:h?" arg +while getopts "C:E:G:O:I:t:h?" arg do case $arg in + C) COMPRESS=$OPTARG ;; + E) COMPRESS_EXT=$OPTARG ;; G) GROUP="-g $OPTARG" ;; O) OWNER="-o $OPTARG" ;; I) INSTALL_DIR=$OPTARG ;; @@ -31,6 +36,17 @@ done shift `expr $OPTIND - 1` +# -C and -E options are required +if [ -z "$COMPRESS" ]; then + echo "-C option is required" + exit 2 +fi + +if [ -z "$COMPRESS_EXT" ]; then + echo "-E option is required" + exit 2 +fi + if [ "$1" = "" -o "$2" = "" -o "$3" = "" -o "$4" = "" ] then usage ===================================== bin/make-main-dist.sh ===================================== @@ -1,11 +1,14 @@ #!/bin/sh usage() { - echo "make-main-dist.sh [-h?] [-t tar] [-I destdir] [-G group] [-O owner] [-M mandir]" + 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" @@ -21,9 +24,11 @@ usage() { } GTAR=tar -while getopts "G:O:I:M:t:h?" arg +while getopts "C:E:G:O:I:M:t:h?" arg do case $arg in + C) COMPRESS=$OPTARG ;; + E) COMPRESS_EXT=$OPTARG ;; G) GROUP="-g $OPTARG" ;; O) OWNER="-o $OPTARG" ;; I) INSTALL_DIR=$OPTARG ;; @@ -35,6 +40,17 @@ done shift `expr $OPTIND - 1` +# -C and -E options are required +if [ -z "$COMPRESS" ]; then + echo "-C option is required" + exit 2 +fi + +if [ -z "$COMPRESS_EXT" ]; then + echo "-E option is required" + exit 2 +fi + if [ "$1" = "" -o "$2" = "" -o "$3" = "" -o "$4" = "" ] then usage ===================================== bin/make-src-dist.sh ===================================== @@ -1,22 +1,26 @@ #!/bin/sh usage() { - echo "make-src-dist.sh: [-bgh] [-t gnutar] [-I destdir] version" + echo "make-src-dist.sh: -C option -E ext [-h?] [-t gnutar] [-I destdir] [version]" echo " -h This help" - echo " -b Use bzip2 compression" - echo " -g Use gzip compression" + 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 'Create a tar ball of the cmucl sources. The tarball is named ' - echo 'cmucl-src-$version.tar.bz2 (or gz if using gzip compression)' + 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." } -while getopts "bgh?t:I:" arg +while getopts "C:E:h?t:I:" arg do case $arg in - b) ENABLE_BZIP=-b ;; - g) ENABLE_GZIP=-g ;; + C) COMPRESS=$OPTARG ;; + E) COMPRESS_EXT=$OPTARG ;; t) GTAR=$OPTARG ;; I) INSTALL_DIR=$OPTARG ;; h | \?) usage; exit 1 ;; @@ -25,10 +29,15 @@ done shift `expr $OPTIND - 1` -# If no compression given, default to gzip (on the assumption that -# that is available everywhere.) -if [ -z "$ENABLE_BZIP" -a -z "$ENABLE_GZIP" ]; then - ENABLE_GZIP=-b +# -C and -E options are required +if [ -z "$COMPRESS" ]; then + echo "-C option is required" + exit 2 +fi + +if [ -z "$COMPRESS_EXT" ]; then + echo "-E option is required" + exit 2 fi # If no version is given, default to today's date @@ -39,15 +48,6 @@ else fi echo Creating source distribution -if [ -n "$ENABLE_GZIP" ]; then - ZIP="gzip -c" - ZIPEXT="gz" -fi -if [ -n "$ENABLE_BZIP" ]; then - ZIP="bzip2" - ZIPEXT="bz2" -fi - GTAR_OPTIONS="--exclude=.git --exclude='*.pot.~*~'" if [ -z "$INSTALL_DIR" ]; then # echo " Compressing with $ZIP" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/376c4ce694508d94f9e134… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/376c4ce694508d94f9e134… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-352-new-compression-for-dist] 2 commits: Add better usage info for make-main-dist and make-extra-dist
by Raymond Toy (＠rtoy) 27 Aug '24

27 Aug '24

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/c653d8ef9fd9f92e5a9739… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/c653d8ef9fd9f92e5a9739… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-352-new-compression-for-dist] Regroup options envvar
by Raymond Toy (＠rtoy) 27 Aug '24

27 Aug '24

Raymond Toy pushed to branch issue-352-new-compression-for-dist at cmucl / cmucl Commits: c653d8ef by Raymond Toy at 2024-08-27T15:43:40-07:00 Regroup options envvar Break up the `OPTIONS` variable into separate pieces: * Option for gtar * Uncommon extra options like -G and -O * Installation directory (-I) Then concatenate these all together to create one `OPTIONS` value to use for make-main-dist.sh and make-extra-dist.sh. make-src-dist.sh can reuse the gtar option and the install option, instead of figuring it out again. - - - - - 1 changed file: - bin/make-dist.sh Changes: ===================================== bin/make-dist.sh ===================================== @@ -198,8 +198,11 @@ fi echo cmucl-$VERSION-$ARCH-$OS ROOT=`dirname $0` -OPTIONS="-t ${GTAR:-tar} ${GROUP:+ -G ${GROUP}} ${OWNER:+ -O ${OWNER}} ${INSTALL_DIR:+ -I ${INSTALL_DIR}}" +GTAR_OPTS="-t ${GTAR:-gtar}" +EXTRA_OPTS="${GROUP:+ -G ${GROUP}} ${OWNER:+ -O ${OWNER}}" +INSTALL_OPTS="${INSTALL_DIR:+ -I ${INSTALL_DIR}}" MANDIR="${MANDIR:+ -M ${MANDIR}}" +OPTIONS="${GTAR_OPTS} ${EXTRA_OPTS} ${INSTALL_OPTS} ${MANDIR}" set -x echo Creating distribution for $ARCH $OS @@ -207,6 +210,5 @@ $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 - OPTIONS="${INSTALL_DIR:+ -I ${INSTALL_DIR}}" - $ROOT/make-src-dist.sh $OPTIONS -t ${GTAR:-tar} $VERSION + $ROOT/make-src-dist.sh ${GTAR_OPTS} ${INSTALL_OPTS} $VERSION fi View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c653d8ef9fd9f92e5a97393… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c653d8ef9fd9f92e5a97393… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-352-new-compression-for-dist] 2 commits: Remove the -b and -g options
by Raymond Toy (＠rtoy) 27 Aug '24

27 Aug '24

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/3ba7ef8b3e1e31bf38a388… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/3ba7ef8b3e1e31bf38a388… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-352-new-compression-for-dist] Add -t option for the tar program to use
by Raymond Toy (＠rtoy) 27 Aug '24

27 Aug '24

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/3ba7ef8b3e1e31bf38a388a… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3ba7ef8b3e1e31bf38a388a… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-354-add-executable-test-to-ci
by Raymond Toy (＠rtoy) 23 Aug '24

23 Aug '24

Raymond Toy pushed new branch issue-354-add-executable-test-to-ci at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-354-add-executable-… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-352-new-compression-for-dist] Some cleanups and fixes.
by Raymond Toy (＠rtoy) 23 Aug '24

23 Aug '24

Raymond Toy pushed to branch issue-352-new-compression-for-dist at cmucl / cmucl Commits: db03eb76 by Raymond Toy at 2024-08-23T11:54:35-07:00 Some cleanups and fixes. Export `GTAR` so that make-main-dist.sh and make-extra-dist.sh use the right version of tar. (These scripts should probably be updated to be consistent with make-src-dist.sh which takes an option for tar program.) Add usage message for the -C option. Also change the valid values to be `bzip2`, `xz`, and `gzip` instead of `-j`, `-J`, and `-z`. The names are much more informative. - - - - - 1 changed file: - bin/make-dist.sh Changes: ===================================== bin/make-dist.sh ===================================== @@ -12,10 +12,12 @@ # $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] [-G group] [-O owner] [-I destdir] [-M mandir] [-A arch] [-V version] [-o OS] dir" + echo "make-dist.sh: [-hbg] [-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" echo " -O owner Owner to use" echo " -I destdir Install directly to given directory instead of creating a tarball" @@ -52,6 +54,7 @@ usage() { exit 1 } +export GTAR def_arch_os () { case `uname -s` in SunOS) @@ -144,17 +147,19 @@ fi # Verify that the -C option is valid if [ -n "$COMPRESS_ARG" ]; then case $COMPRESS_ARG in - -j) COMPRESS=-j + bzip2) + COMPRESS=-j COMPRESS_EXT=bz2 COMPRESS_NAME=bzip2 ;; - -J) # Defaults work + xz) # Defaults work ;; - -z) COMPRESS=-z + gzip) + COMPRESS=-z COMPRESS_EXT=gz COMPRESS_NAME=gzip ;; - *) echo '-C option "'$COMPRESS_ARG'" must be on of -j, -J or -z' + *) echo '-C option "'$COMPRESS_ARG'" must be one of bzip2, xz or gzip' exit 1 ;; esac View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/db03eb7658f4d35ef6bbcc0… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/db03eb7658f4d35ef6bbcc0… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-352-new-compression-for-dist
by Raymond Toy (＠rtoy) 23 Aug '24

23 Aug '24

Raymond Toy pushed new branch issue-352-new-compression-for-dist at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-352-new-compression… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #350: Fix export warnings on Solaris
by Raymond Toy (＠rtoy) 23 Aug '24

23 Aug '24

Raymond Toy pushed to branch master at cmucl / cmucl Commits: ef3716d7 by Raymond Toy at 2024-08-23T13:37:06+00:00 Fix #350: Fix export warnings on Solaris - - - - - 66dab205 by Raymond Toy at 2024-08-23T13:37:08+00:00 Merge branch 'issue-350-solaris-export-warnings' into 'master' Fix #350: Fix export warnings on Solaris Closes #350 See merge request cmucl/cmucl!247 - - - - - 1 changed file: - src/code/exports.lisp Changes: ===================================== src/code/exports.lisp ===================================== @@ -548,6 +548,7 @@ "TTY-TANDEM" "TTY-XCASE" "UNIX-TIMES" + "UNIX-DUP2" "UTSNAME" "WRITEGRP" "WRITEOTH" @@ -1988,6 +1989,7 @@ "ALPHA-FASL-FILE-IMPLEMENTATION" "SGI-FASL-FILE-IMPLEMENTATION" "AMD64-FASL-FILE-IMPLEMENTATION" + "ARM-FASL-FILE-IMPLEMENTATION" "MAKE-UNBOUND-MARKER" "RETURN-SINGLE" "BACKEND-PAGE-SIZE" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/186fb776f5c9d7d84bb03b… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/186fb776f5c9d7d84bb03b… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0