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

Commits:

3 changed files:

Changes:

  • bin/make-extra-dist.sh
    1 1
     #!/bin/sh
    
    2 2
     
    
    3 3
     usage() {
    
    4
    -    echo "make-extra-dist.sh -C option -E ext [-t tar] [-I destdir] [-G group] [-O owner]"
    
    5
    -    echo "  -h           This help"
    
    6
    -    echo "  -?           This help"
    
    7
    -    echo "  -t tar       Tar program to use"
    
    8
    -    echo "  -C option    Tar option for compressing the tarball; required."
    
    9
    -    echo "  -E ext       Extension to use for the tarball.  Must be consistent with"
    
    10
    -    echo "                 -C option.  Required."
    
    11
    -    echo "  -I destdir   Install directly to given directory instead of creating a tarball"
    
    12
    -    echo "  -G group     Group to use"
    
    13
    -    echo "  -O owner     Owner to use"
    
    14
    -    echo ""
    
    15
    -    echo "This is generally called by make-dist.sh and not normally invoked by the user"
    
    16
    -    echo ""
    
    17
    -    echo "Create a tarball of the extra components for cmucl.  This includes things like "
    
    18
    -    echo "CLX; Hemlock; CLM; contrib library not already included in the main"
    
    19
    -    echo "distribution; locale messages."
    
    4
    +    cat <<EOF
    
    5
    +`basename $0` -C option -E ext [-t tar] [-I destdir] [-G group] [-O owner]
    
    6
    +  -h           This help
    
    7
    +  -?           This help
    
    8
    +  -t tar       Tar program to use
    
    9
    +  -C option    Tar option for compressing the tarball; required.
    
    10
    +  -E ext       Extension to use for the tarball.  Must be consistent with
    
    11
    +                 -C option.  Required.
    
    12
    +  -I destdir   Install directly to given directory instead of creating a tarball
    
    13
    +  -G group     Group to use
    
    14
    +  -O owner     Owner to use
    
    15
    +
    
    16
    +This is generally called by make-dist.sh and not normally invoked by the user
    
    17
    +
    
    18
    +Create a tarball of the extra components for cmucl.  This includes things like 
    
    19
    +CLX; Hemlock; CLM; contrib library not already included in the main
    
    20
    +distribution; locale messages.
    
    21
    +EOF
    
    20 22
         exit 1
    
    21 23
     }
    
    22 24
     
    

  • bin/make-main-dist.sh
    1 1
     #!/bin/sh
    
    2 2
     
    
    3 3
     usage() {
    
    4
    -    echo "make-main-dist.sh  -C option -E ext [-h?] [-t tar][-I destdir] [-G group] [-O owner] [-M mandir]"
    
    5
    -    echo "        target-directory version arch os"
    
    6
    -    echo "  -h           This help"
    
    7
    -    echo "  -?           This help"
    
    8
    -    echo "  -t tar       Tar program to use"
    
    9
    -    echo "  -C option    Tar option for compressing the tarball; required."
    
    10
    -    echo "  -E ext       Extension to use for the tarball.  Must be consistent with"
    
    11
    -    echo "                 -C option.  Required."
    
    12
    -    echo "  -I destdir   Install directly to given directory instead of creating a tarball"
    
    13
    -    echo "  -G group     Group to use"
    
    14
    -    echo "  -O owner     Owner to use"
    
    15
    -    echo "  -M mandir    Install manpages in this subdirectory.  Default is man/man1"
    
    16
    -    echo ""
    
    17
    -    echo "This is generally called by make-dist.sh and not normally invoked by the user"
    
    18
    -    echo ""
    
    19
    -    echo "Create a tarball consisting of the main components needed to distribute"
    
    20
    -    echo "a binary installation of cmucl.  This includes the C executable and support"
    
    21
    -    echo "libraries; the subsystems like Gray streams, and simple streams; external"
    
    22
    -    echo "formats; contribs like asdf and defsystem; manpages and READMEs."
    
    4
    +    cat <<EOF
    
    5
    +`basename $0`  -C option -E ext [-h?] [-t tar][-I destdir] [-G group] [-O owner] [-M mandir]
    
    6
    +        target-directory version arch os
    
    7
    +  -h           This help
    
    8
    +  -?           This help
    
    9
    +  -t tar       Tar program to use
    
    10
    +  -C option    Tar option for compressing the tarball; required.
    
    11
    +  -E ext       Extension to use for the tarball.  Must be consistent with
    
    12
    +                 -C option.  Required.
    
    13
    +  -I destdir   Install directly to given directory instead of creating a tarball
    
    14
    +  -G group     Group to use
    
    15
    +  -O owner     Owner to use
    
    16
    +  -M mandir    Install manpages in this subdirectory.  Default is man/man1
    
    17
    +
    
    18
    +This is generally called by make-dist.sh and not normally invoked by the user
    
    19
    +
    
    20
    +Create a tarball consisting of the main components needed to distribute
    
    21
    +a binary installation of cmucl.  This includes the C executable and support
    
    22
    +libraries; the subsystems like Gray streams, and simple streams; external
    
    23
    +formats; contribs like asdf and defsystem; manpages and READMEs."
    
    24
    +EOF
    
    23 25
         exit 1
    
    24 26
     }
    
    25 27
         
    

  • bin/make-src-dist.sh
    1 1
     #!/bin/sh
    
    2 2
     
    
    3 3
     usage() {
    
    4
    -    echo "make-src-dist.sh: -C option -E ext [-h?] [-t gnutar] [-I destdir] [version]"
    
    5
    -    echo "  -h           This help"
    
    6
    -    echo "  -?           This help"
    
    7
    -    echo "  -t tar       Name/path to GNU tar"
    
    8
    -    echo "  -C option    Tar option for compressing the tarball; required."
    
    9
    -    echo "  -E ext       Extension to use for the tarball.  Must be consistent with"
    
    10
    -    echo "                 -C option.  Required."
    
    11
    -    echo "  -I destdir   Install directly to given directory instead of creating a tarball"
    
    12
    -    echo "   version     The version.  Defaults to the current date"
    
    13
    -    echo ""
    
    14
    -    echo "This is generally called by make-dist.sh and not normally invoked by the user"
    
    15
    -    echo ""
    
    16
    -    echo "Create a tar ball of the cmucl sources."
    
    4
    +    cat <<EOF
    
    5
    +`basename $0` -C option -E ext [-h?] [-t gnutar] [-I destdir] [version]
    
    6
    +  -h           This help
    
    7
    +  -?           This help
    
    8
    +  -t tar       Name/path to GNU tar
    
    9
    +  -C option    Tar option for compressing the tarball; required.
    
    10
    +  -E ext       Extension to use for the tarball.  Must be consistent with
    
    11
    +                 -C option.  Required.
    
    12
    +  -I destdir   Install directly to given directory instead of creating a tarball
    
    13
    +   version     The version.  Defaults to the current date
    
    14
    +
    
    15
    +This is generally called by make-dist.sh and not normally invoked by the user
    
    16
    +
    
    17
    +Create a tar ball of the cmucl sources."
    
    18
    +EOF
    
    19
    +    exit 1
    
    17 20
     }
    
    18 21
     
    
    22
    +GTAR=tar
    
    23
    +
    
    19 24
     while getopts "C:E:h?t:I:" arg
    
    20 25
     do
    
    21 26
         case $arg in
    
    ... ... @@ -51,8 +56,8 @@ echo Creating source distribution
    51 56
     GTAR_OPTIONS="--exclude=.git --exclude='*.pot.~*~'"
    
    52 57
     if [ -z "$INSTALL_DIR" ]; then
    
    53 58
         # echo "  Compressing with $ZIP"
    
    54
    -    ${GTAR:-tar} ${GTAR_OPTIONS} ${COMPRESS} -cf cmucl-src-$VERSION.tar.$COMPRESS_EXT bin src tests
    
    59
    +    ${GTAR} ${GTAR_OPTIONS} ${COMPRESS} -cf cmucl-src-$VERSION.tar.$COMPRESS_EXT bin src tests
    
    55 60
     else
    
    56 61
         # Install in the specified directory
    
    57
    -    ${GTAR:-tar} ${GTAR_OPTIONS} -cf - bin src tests | (cd $INSTALL_DIR; ${GTAR:-tar} xf -)
    
    62
    +    ${GTAR} ${GTAR_OPTIONS} -cf - bin src tests | (cd $INSTALL_DIR; ${GTAR:-tar} xf -)
    
    58 63
     fi