Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
0ae28101
Commit
0ae28101
authored
Sep 20, 2011
by
Davis King
Browse files
Changed the makedocs script so it puts -RC onto the version if it isn't
invoked from the makerel script.
parent
e6a151e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
docs/makedocs
docs/makedocs
+7
-2
docs/makerel
docs/makerel
+1
-1
No files found.
docs/makedocs
View file @
0ae28101
...
...
@@ -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
...
...
docs/makerel
View file @
0ae28101
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment