mirror of https://github.com/davisking/dlib.git
Changed the makedocs script so it puts -RC onto the version if it isn't
invoked from the makerel script.
This commit is contained in:
parent
e6a151e7f2
commit
0ae2810178
|
@ -64,7 +64,12 @@ makedocs ()
|
|||
|
||||
MAJOR_NUM=`cat $COUNTER_FILE`
|
||||
MINOR_NUM=`cat $MINOR_COUTNER_FILE`
|
||||
RELEASE=${MAJOR_NUM}.${MINOR_NUM}
|
||||
if [ "$1" = "makerel" ]
|
||||
then
|
||||
RELEASE=${MAJOR_NUM}.${MINOR_NUM}
|
||||
else
|
||||
RELEASE=${MAJOR_NUM}.`echo ${MINOR_NUM}+1|bc`-RC
|
||||
fi;
|
||||
|
||||
# get XML versions of the change logs
|
||||
BASE_LOGGER_REVNUM=`echo $LOGGER_REVNUM - 1000 | bc`
|
||||
|
@ -202,7 +207,7 @@ makedocs ()
|
|||
|
||||
|
||||
# build all the html documentation
|
||||
makedocs
|
||||
makedocs $1
|
||||
|
||||
# now make the table of contents for the chm file
|
||||
echo Generating the table of contents for the chm file
|
||||
|
|
|
@ -33,7 +33,7 @@ else
|
|||
echo $MINOR_NUM > $MINOR_COUTNER_FILE
|
||||
fi;
|
||||
|
||||
./makedocs || exit 1
|
||||
./makedocs makerel || exit 1
|
||||
|
||||
rm -rf release || report_failure
|
||||
mkdir release || report_failure
|
||||
|
|
Loading…
Reference in New Issue