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