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

do not update submodules before each build. 

add tolua to .gitignore, it's not a proper submodule.
This commit is contained in:
Enno Rehling 2017-01-10 12:54:49 +01:00
parent f5419a7f45
commit 3ff5a3155e
2 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
.gitignore vendored
View File

@ -1,40 +1,41 @@
.vscode/ tolua/
*.orig .vscode/
eressea.ini *.orig
Debug eressea.ini
Release Debug
Release
# SlickEdit
*.vtg # SlickEdit
*.vpwhistu *.vtg
*.vpwhistu
# Microsoft Visual Studio build artefacts
src/Debug/ # Microsoft Visual Studio build artefacts
src/Release/ src/Debug/
src/*.vcproj.*.user src/Release/
Debug/ src/*.vcproj.*.user
Release/ Debug/
ipch/ Release/
*.ipch ipch/
*.ncb *.ipch
*.opensdf *.ncb
*.pdb *.opensdf
*.sdf *.pdb
*.suo *.sdf
*.user *.suo
*.user
*~
*.bak *~
bin/ *.bak
build*/ bin/
*.log build*/
*.log.* *.log
tags *.log.*
Thumbs.db tags
.gdb_history Thumbs.db
*.cfg .gdb_history
*.cmd *.cfg
tmp/ *.cmd
tests/config.lua tmp/
tests/reports/ tests/config.lua
tests/data/185.dat tests/reports/
tests/data/185.dat

2
s/build
View File

@ -33,8 +33,6 @@ if [ ! -d $ROOT/$BUILD ]; then
exit exit
fi fi
git submodule update
echo "build eressea" echo "build eressea"
cd $ROOT/$BUILD cd $ROOT/$BUILD
VERSION=$(git describe --match 'v*.*.*' --tags | sed 's/^v//') VERSION=$(git describe --match 'v*.*.*' --tags | sed 's/^v//')