bootstrap.ci: stop playing with unused PACKAGE_VERSION_REVISION
PACKAGE_VERSION_REVISION is not used outside bootstrap.ci; remove everything that deals with it.
This commit is contained in:
parent
59a7478011
commit
8b3e53c730
31
bootstrap.ci
31
bootstrap.ci
|
@ -10,8 +10,6 @@ OPTIONS:
|
|||
-h Show this message
|
||||
-s Package suffix
|
||||
-S Use package suffix as 'g' appended with the date of last commit
|
||||
-r Package version revision
|
||||
-R Use package version revision as Git commit number from 'git describe' result
|
||||
-b Package branch
|
||||
-B Use package branch as current Git branch
|
||||
EOF
|
||||
|
@ -19,10 +17,9 @@ EOF
|
|||
|
||||
|
||||
SUFFIX=
|
||||
REVISION=
|
||||
VERBOSE=
|
||||
KEEPVERSION=
|
||||
while getopts “:hs:Sr:RK” OPTION
|
||||
while getopts “:hs:SK” OPTION
|
||||
do
|
||||
case $OPTION in
|
||||
h)
|
||||
|
@ -35,12 +32,6 @@ do
|
|||
S)
|
||||
SUFFIX=g`git log -1 --pretty=fuller --date=iso | grep CommitDate: | sed -E 's/^CommitDate:\s(.*)/\1/' | sed -E 's/(.*)-(.*)-(.*) (.*):(.*):(.*)\s+.*/\1\2\3\4\5\6/'`
|
||||
;;
|
||||
r)
|
||||
REVISION=$OPTARG
|
||||
;;
|
||||
R)
|
||||
REVISION=`git describe | perl -ne 'print $1 if /^[\.0-9]*([-~]rc[0-9]+)?-([0-9]*)-g[a-z0-9]*$/;'`
|
||||
;;
|
||||
?)
|
||||
usage
|
||||
exit
|
||||
|
@ -56,24 +47,10 @@ fi
|
|||
|
||||
rm -rf *~ *.cache config.guess config.log config.status config.sub depcomp ltmain.sh version.m4.ci
|
||||
|
||||
if [ -n "$SUFFIX" ] || [ -n "$REVISION" ]
|
||||
if [ -n "$SUFFIX" ]
|
||||
then
|
||||
cp -a version.m4 version.m4.tmp
|
||||
|
||||
if [ -n "$SUFFIX" ]
|
||||
then
|
||||
echo Set package suffix "$SUFFIX"
|
||||
sed 's/^define(\[PACKAGE_SUFFIX\],\s*\[\([-~]*[0-9a-zA-Z]*\)\])$/define(\[PACKAGE_SUFFIX\], \['$SUFFIX'\])/g' version.m4.tmp > version.m4.ci
|
||||
cp version.m4.ci version.m4.tmp
|
||||
fi
|
||||
|
||||
if [ -n "$REVISION" ]
|
||||
then
|
||||
echo Set package revision "$REVISION"
|
||||
sed 's/^define(\[PACKAGE_VERSION_REVISION\],\s*\[\([-~]*[0-9a-zA-Z]*\)\])$/define(\[PACKAGE_VERSION_REVISION\], \['$REVISION'\])/g' version.m4.tmp > version.m4.ci
|
||||
fi
|
||||
|
||||
rm -f version.m4.tmp
|
||||
echo Set package suffix "$SUFFIX"
|
||||
sed 's/^define(\[PACKAGE_SUFFIX\],\s*\[\([-~]*[0-9a-zA-Z]*\)\])$/define(\[PACKAGE_SUFFIX\], \['$SUFFIX'\])/g' < version.m4 > version.m4.ci
|
||||
fi
|
||||
|
||||
./bootstrap
|
||||
|
|
Loading…
Reference in New Issue