Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/ennorehling/eressea.git

This commit is contained in:
Enno Rehling 2018-02-18 11:46:14 +01:00
parent de52d8d669 e841177e6f
commit 5a1c6d87ca
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
process/CMakeLists.txt
View File

@ -1,6 +1,6 @@
install(PROGRAMS create-orders backup-eressea run-turn send-zip-report install(PROGRAMS create-orders backup-eressea run-turn send-zip-report
send-bz2-report compress.py compress.sh epasswd.py orders-process send-bz2-report compress.py compress.sh epasswd.py orders-process
checkpasswd.py sendreport.sh orders-accept DESTINATION bin) checkpasswd.py sendreport.sh sendreports.sh orders-accept DESTINATION bin)
install(DIRECTORY cron/ DESTINATION bin USE_SOURCE_PERMISSIONS install(DIRECTORY cron/ DESTINATION bin USE_SOURCE_PERMISSIONS
FILES_MATCHING PATTERN "*.cron") FILES_MATCHING PATTERN "*.cron")

4
s/build
View File

@ -37,10 +37,10 @@ BRANCH=$(git status -s -b | head -1 | cut -d\ -f 2 | sed 's/\..*//')
if [ "$BRANCH" = "master" ] ; then if [ "$BRANCH" = "master" ] ; then
VERSION=$(git describe --match 'v*.*.*' --tags | sed 's/^v//') VERSION=$(git describe --match 'v*.*.*' --tags | sed 's/^v//')
echo "$BRANCH $VERSION" echo "$BRANCH $VERSION"
CMAKE_ARGS="-DERESSEA_VERSION=$VERSION ${CMAKE_ARGS}" CMAKE_ARGS="-DERESSEA_VERSION:STRING=$VERSION ${CMAKE_ARGS}"
else else
REV=$(git rev-parse --short HEAD) REV=$(git rev-parse --short HEAD)
CMAKE_ARGS="-DERESSEA_BUILDNO=$REV $CMAKE_ARGS" CMAKE_ARGS="-DERESSEA_BUILDNO:STRING=$REV $CMAKE_ARGS"
fi fi
cmake ${CMAKE_ARGS} cmake ${CMAKE_ARGS}

4
s/cmake-init
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
ERESSEA_DB=sqlite
if [ -e /usr/include/db.h ] ; then
ERESSEA_DB=db ERESSEA_DB=db
if [ -e /usr/include/sqlite3.h ] ; then
ERESSEA_DB=sqlite
fi fi
# Parse command line arguments # Parse command line arguments