Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added space as safeguard for sed replacement

This commit is contained in:
Frank Celler 2018-08-28 17:27:34 +02:00
parent 4a65419090
commit ce1fe5cf66
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -93,23 +93,23 @@ if (NOT DEFINED ARANGODB_VERSION_PATCH)
set(ARANGODB_VERSION_RELEASE_TYPE "")
set(ARANGODB_VERSION_RELEASE_NUMBER "")
else()
unset(ARANGODB_VERSION_RELEASE_TYPE)
unset(ARANGODB_VERSION_RELEASE_NUMBER)
unset (ARANGODB_VERSION_RELEASE_TYPE) # do not remove space
unset (ARANGODB_VERSION_RELEASE_NUMBER) # do not remove space
endif()
# unset TYPE and NUMBER in case they are empty
if (DEFINED ARANGODB_VERSION_RELEASE_TYPE)
if (ARANGODB_VERSION_RELEASE_TYPE STREQUAL "")
unset(ARANGODB_VERSION_RELEASE_TYPE)
unset(ARANGODB_VERSION_RELEASE_NUMBER)
unset (ARANGODB_VERSION_RELEASE_TYPE) # do not remove space
unset (ARANGODB_VERSION_RELEASE_NUMBER) # do not remove space
endif()
else()
unset(ARANGODB_VERSION_RELEASE_NUMBER)
unset (ARANGODB_VERSION_RELEASE_NUMBER) # do not remove space
endif()
if (DEFINED ARANGODB_VERSION_RELEASE_NUMBER)
if (ARANGODB_VERSION_RELEASE_NUMBER STREQUAL "")
unset(ARANGODB_VERSION_RELEASE_NUMBER)
unset (ARANGODB_VERSION_RELEASE_NUMBER) # do not remove space
endif()
endif()

6
Installation/release.sh
View File

@ -241,9 +241,9 @@ git fetch --tags
# shellcheck disable=SC2002
cat CMakeLists.txt \
| $SED -e "s~set(ARANGODB_VERSION_MAJOR.*~set(ARANGODB_VERSION_MAJOR \"$VERSION_MAJOR\")~" \
| $SED -e "s~set(ARANGODB_VERSION_MINOR.*~set(ARANGODB_VERSION_MINOR \"$VERSION_MINOR\")~" \
| $SED -e "s~set(ARANGODB_VERSION_PATCH.*~set(ARANGODB_VERSION_PATCH \"$VERSION_PATCH\")~" \
| $SED -e "s~set(ARANGODB_VERSION_MAJOR.*~set(ARANGODB_VERSION_MAJOR \"$VERSION_MAJOR\")~" \
| $SED -e "s~set(ARANGODB_VERSION_MINOR.*~set(ARANGODB_VERSION_MINOR \"$VERSION_MINOR\")~" \
| $SED -e "s~set(ARANGODB_VERSION_PATCH.*~set(ARANGODB_VERSION_PATCH \"$VERSION_PATCH\")~" \
| $SED -e "s~set(ARANGODB_VERSION_RELEASE_TYPE.*~set(ARANGODB_VERSION_RELEASE_TYPE \"$VERSION_VERSION_RELEASE_TYPE\")~" \
| $SED -e "s~set(ARANGODB_VERSION_RELEASE_NUMBER.*~set(ARANGODB_VERSION_RELEASE_NUMBER \"$VERSION_VERSION_RELEASE_NUMBER\")~" \
> CMakeLists.txt.tmp