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

[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

[Git][cmucl/cmucl][issue-350-solaris-export-warnings] Add "ARM-FASL-FILE-IMPLEMENTATION" to C package exports
by Raymond Toy (＠rtoy) 22 Aug '24

22 Aug '24

Raymond Toy pushed to branch issue-350-solaris-export-warnings at cmucl / cmucl Commits: 532bc06b by Raymond Toy at 2024-08-22T16:06:24-07:00 Add "ARM-FASL-FILE-IMPLEMENTATION" to C package exports Solaris14 complains about this. Don't know why Linux or OSX don't, but we should export this since it is exported in src/compiler/generic/vm-macs.lisp. - - - - - 1 changed file: - src/code/exports.lisp Changes: ===================================== src/code/exports.lisp ===================================== @@ -1989,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/-/commit/532bc06bcd2c33da1faa8dd… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/532bc06bcd2c33da1faa8dd… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #353: Use gtar on Solaris
by Raymond Toy (＠rtoy) 22 Aug '24

22 Aug '24

Raymond Toy pushed to branch master at cmucl / cmucl Commits: adf29820 by Raymond Toy at 2024-08-22T20:29:32+00:00 Fix #353: Use gtar on Solaris - - - - - 186fb776 by Raymond Toy at 2024-08-22T20:29:36+00:00 Merge branch 'issue-353-solaris-use-gtar' into 'master' Fix #353: Use gtar on Solaris Closes #353 See merge request cmucl/cmucl!250 - - - - - 1 changed file: - bin/make-dist.sh Changes: ===================================== bin/make-dist.sh ===================================== @@ -59,7 +59,8 @@ def_arch_os () { sun*) ARCH=sparc ;; i*) - ARCH=x86 ;; + ARCH=x86 + GTAR=gtar ;; esac uname_r=`uname -r` case $uname_r in View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/e4b82cb4e97cd29203c7a9… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/e4b82cb4e97cd29203c7a9… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #351: Use grep instead of egrep and update patterns
by Raymond Toy (＠rtoy) 22 Aug '24

22 Aug '24

Raymond Toy pushed to branch master at cmucl / cmucl Commits: ea1f0b32 by Raymond Toy at 2024-08-22T20:20:51+00:00 Fix #351: Use grep instead of egrep and update patterns - - - - - e4b82cb4 by Raymond Toy at 2024-08-22T20:20:54+00:00 Merge branch 'issue-351-solaris-grep' into 'master' Fix #351: Use grep instead of egrep and update patterns Closes #351 See merge request cmucl/cmucl!249 - - - - - 1 changed file: - bin/make-extra-dist.sh Changes: ===================================== bin/make-extra-dist.sh ===================================== @@ -93,13 +93,15 @@ install ${GROUP} ${OWNER} -m 0755 $TARGET/motif/server/motifd \ $DESTDIR/lib/cmucl/lib/ # Install the contrib stuff. Create the directories and then copy the files. - -for d in `(cd src; find contrib -type d -print | grep -E -v "CVS|asdf|defsystem")` +# +# asdf, defsystem and unix are part of the main distribution, so skip +# these directories. +for d in `(cd src; find contrib -type d -print | grep -v "asdf\|defsystem")` do install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/$d done -for f in `(cd src/contrib; find . -type f -print | grep -E -v "CVS|asdf|defsystem|unix")` +for f in `(cd src/contrib; find . -type f -print | grep -v "asdf\|defsystem\|unix")` do FILE=`basename $f` DIR=`dirname $f` @@ -108,13 +110,13 @@ done # Install all the locale data. -for d in `(cd src/i18n/; find locale -type d -print | grep -E -v CVS)` +for d in `(cd src/i18n/; find locale -type d -print)` do install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/$d done -# Install mo files. -for f in `(cd $TARGET/i18n; find locale -type f -print | grep -E -v 'CVS|~.*~|.*~')` +# Install mo files. Ignore any emacs-style backup files. +for f in `(cd $TARGET/i18n; find locale -type f -print | grep -v '~.*~\|.*~')` do FILE=`basename $f` DIR=`dirname $f` @@ -122,7 +124,7 @@ do done # Install po files. (Do we really need to distribute the po files?) -#for f in `(cd $TARGET/i18n; find locale -type f -print | grep -E -v 'CVS|~.*~|.*~')` +#for f in `(cd $TARGET/i18n; find locale -type f -print | grep -v '~.*~\|.*~')` #do # FILE=`basename $f` # DIR=`dirname $f` View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/0243097544980dde9def2a… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/0243097544980dde9def2a… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0