| ... |
... |
@@ -12,10 +12,8 @@ |
|
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 $
|
|
13
|
13
|
|
|
14
|
14
|
usage() {
|
|
15
|
|
- echo "make-dist.sh: [-hbg] [-C compress] [-G group] [-O owner] [-I destdir] [-M mandir] [-A arch] [-V version] [-o OS] dir"
|
|
|
15
|
+ echo "make-dist.sh: [-h] [-C compress] [-G group] [-O owner] [-I destdir] [-M mandir] [-A arch] [-V version] [-o OS] dir"
|
|
16
|
16
|
echo " -h This help"
|
|
17
|
|
- echo " -b Use bzip2 compression"
|
|
18
|
|
- echo " -g Use gzip compression"
|
|
19
|
17
|
echo " -C compress Compression method to use for the tar archives. Must be one of"
|
|
20
|
18
|
echo " bzip2, xz, or gzip. The default depends on the OS"
|
|
21
|
19
|
echo " -G group Group to use"
|
| ... |
... |
@@ -118,7 +116,7 @@ COMPRESS_EXT=xz |
|
118
|
116
|
COMPRESS_NAME=xz
|
|
119
|
117
|
export COMPRESS COMPRESS_EXT COMPRESS_NAME
|
|
120
|
118
|
|
|
121
|
|
-while getopts "C:G:O:I:M:bghSA:o:V:?" arg
|
|
|
119
|
+while getopts "C:G:O:I:M:hSA:o:V:?" arg
|
|
122
|
120
|
do
|
|
123
|
121
|
case $arg in
|
|
124
|
122
|
C) COMPRESS_ARG=$OPTARG ;;
|
| ... |
... |
@@ -126,8 +124,6 @@ do |
|
126
|
124
|
O) OWNER=$OPTARG ;;
|
|
127
|
125
|
I) INSTALL_DIR=$OPTARG ;;
|
|
128
|
126
|
M) MANDIR=$OPTARG ;;
|
|
129
|
|
- b) ENABLE_BZIP=-b ;;
|
|
130
|
|
- g) ENABLE_GZIP=-g ;;
|
|
131
|
127
|
S) MAKE_SRC_DIST=yes ;;
|
|
132
|
128
|
A) ARCH=$OPTARG ;;
|
|
133
|
129
|
o) OS=$OPTARG ;;
|
| ... |
... |
@@ -202,11 +198,6 @@ fi |
|
202
|
198
|
echo cmucl-$VERSION-$ARCH-$OS
|
|
203
|
199
|
ROOT=`dirname $0`
|
|
204
|
200
|
|
|
205
|
|
-# If no compression options given, default to bzip
|
|
206
|
|
-if [ -z "$ENABLE_GZIP" -a -z "$ENABLE_BZIP" ]; then
|
|
207
|
|
- ENABLE_BZIP="-b"
|
|
208
|
|
-fi
|
|
209
|
|
-
|
|
210
|
201
|
OPTIONS="-t ${GTAR:-tar} ${GROUP:+ -G ${GROUP}} ${OWNER:+ -O ${OWNER}} ${INSTALL_DIR:+ -I ${INSTALL_DIR}}"
|
|
211
|
202
|
MANDIR="${MANDIR:+ -M ${MANDIR}}"
|
|
212
|
203
|
|
| ... |
... |
@@ -216,8 +207,6 @@ $ROOT/make-main-dist.sh $OPTIONS ${MANDIR} $TARGET $VERSION $ARCH $OS || exit 1 |
|
216
|
207
|
$ROOT/make-extra-dist.sh $OPTIONS $TARGET $VERSION $ARCH $OS || exit 2
|
|
217
|
208
|
|
|
218
|
209
|
if [ X"$MAKE_SRC_DIST" = "Xyes" ]; then
|
|
219
|
|
- # If tar is not GNU tar, set the environment variable GTAR toy
|
|
220
|
|
- # point to GNU tar.
|
|
221
|
|
- OPTIONS="${INSTALL_DIR:+ -I ${INSTALL_DIR}} $ENABLE_GZIP $ENABLE_BZIP"
|
|
|
210
|
+ OPTIONS="${INSTALL_DIR:+ -I ${INSTALL_DIR}}"
|
|
222
|
211
|
$ROOT/make-src-dist.sh $OPTIONS -t ${GTAR:-tar} $VERSION
|
|
223
|
212
|
fi |