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

Merge pull request #101 from badgerman/master 

build preparations for version 3.4
This commit is contained in:
Enno Rehling 2015-01-09 20:48:39 +01:00
parent 90f4ed9753 ba71728a64
commit fd0f3fa351
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
s/cron/previews.sh
View File

@ -1,9 +1,13 @@
#!/bin/sh #!/bin/sh
[ -z $ERESSEA ] && ERESSEA=$HOME/eressea [ -z ${ERESSEA} ] && ERESSEA=~/eressea
SRC=$ERESSEA/git branch="master"
$SRC/s/preview build master if [ -e ${ERESSEA}/build/.preview ]; then
$SRC/s/preview version branch=`cat ${ERESSEA}/build/.preview`
fi
SRC=${ERESSEA}/git
${SRC}/s/preview build ${branch}
${SRC}/s/preview version
for game in 2 3 4 ; do for game in 2 3 4 ; do
$SRC/s/preview -g $game run && \ ${SRC}/s/preview -g ${game} run && \
$SRC/s/preview -g $game send ${SRC}/s/preview -g ${game} send
done done

6
src/kernel/order.c
View File

@ -467,7 +467,6 @@ bool is_exclusive(const order * ord)
bool is_long(const order * ord) bool is_long(const order * ord)
{ {
keyword_t kwd = ORD_KEYWORD(ord); keyword_t kwd = ORD_KEYWORD(ord);
bool result = false;
switch (kwd) { switch (kwd) {
case K_CAST: case K_CAST:
@ -494,9 +493,9 @@ bool is_long(const order * ord)
return true; return true;
default: default:
result = false; break;
} }
return result; return false;
} }
/** /**
@ -524,7 +523,6 @@ bool is_persistent(const order * ord)
default: default:
return persist || is_repeated(ord); return persist || is_repeated(ord);
} }
} }
char *write_order(const order * ord, char *buffer, size_t size) char *write_order(const order * ord, char *buffer, size_t size)