Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
10813 commits 10 branches 0 tags 41 MiB
Commit graph

245 commits

Author SHA1 Message Date
Enno Rehling
3ff5a3155e do not update submodules before each build. 
add tolua to .gitignore, it's not a proper submodule.
 2017-01-10 12:54:49 +01:00
Enno Rehling
31ff07cbec do not #error 2016-11-25 21:17:10 +01:00
Enno Rehling
5e49ac6fdf fix $MACHINE variable, update submodules 2016-11-25 16:01:28 +00:00
Enno Rehling
a88bfa7a9a decluttering config.c (rules go into laws.c) 2016-11-16 22:46:01 +01:00
Enno Rehling
d008a8167d Merge pull request #599 from ennorehling/feature/guards 
eliminate special cases for guards
 2016-11-01 17:03:12 +01:00
Enno Rehling
92d027014a Make runtests more verbose in case of errors. 
Eliminate stray ERROR messages from tests.
 2016-10-31 20:36:05 +01:00
Enno Rehling
a5e63a2472 move GUARD_* flags to guard.h 2016-10-30 05:37:12 +01:00
Enno Rehling
bca90d2076 buildno.h is gone, don't try to read it. 2016-10-23 09:42:43 +02:00
Enno Rehling
919001fae0 do not rmdir tolua, we need it 2016-10-16 16:41:08 +02:00
Enno Rehling
0de30cd376 remove discontinued submodules if they are checked out 2016-10-16 11:58:42 +02:00
Enno Rehling
f6beda43f4 fix small typo 2016-10-03 16:16:17 +02:00
Enno Rehling
4fc4e8a588 change how lua version is determined to work with my mac 2016-09-30 22:21:26 +02:00
Enno Rehling
04333e71d6 working on a new tolua build step that supports 5.1 2016-09-30 19:47:40 +00:00
Enno Rehling
ac8332c896 re-enable report tests. 
RF_LIGHTHOUSE also flags for lighthouses with size 0.
 2016-09-18 10:24:08 +02:00
Enno Rehling
ad4377c0e7 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/kernel/version.c
	src/kernel/version.h
 2016-09-16 17:08:03 +02:00
Enno Rehling
55df24ffb8 all code review nitpicks fixed. 2016-09-16 16:54:41 +02:00
Enno Rehling
dc004b2d71 require cmake version 2.8.8 (add_library <name> OBJECT ...) 2016-09-16 16:30:49 +02:00
Enno Rehling
00a3a934f5 require cmake version 2.8.8 (add_library <name> OBJECT ...) 2016-09-16 09:49:53 +02:00
Enno Rehling
929db73102 disable integration tests 
combine prepare_ functions
 2016-09-14 17:14:04 +02:00
Enno Rehling
8fd812ecb4 travis must not check for leaks as long as they exist as they do 2016-09-11 17:25:50 +02:00
Enno Rehling
2311dd5cdf cheap change to the release script 2016-09-10 19:20:20 +02:00
Enno Rehling
bf35b98927 filter leading garbage from tags, only use version tags 2016-09-10 19:03:09 +02:00
Enno Rehling
3c630ee863 disable deprecated script, must fix before next release 2016-09-10 18:56:24 +02:00
Enno Rehling
497f53102c set version based on most recent tag 2016-09-10 18:44:19 +02:00
Enno Rehling
61a1cfa141 fix build script jobs determination on mac 2016-08-31 09:50:28 +02:00
Enno Rehling
ce867af34f this is a static variable, and it is bad 2016-02-25 23:11:44 +01:00
Enno Rehling
84a6e7a498 include process directory in install process, clean up install script 2016-02-10 23:06:41 +01:00
Enno Rehling
52e517b98d Merge branch 'master' into develop 2016-01-17 16:23:01 +01:00
Enno Rehling
b75b25c046 add suppressions for bugs in valgrind vs libc on our debian system 
this fixes issue #456
 2016-01-17 16:10:39 +01:00
Enno Rehling
50e560c7c0 TODO: still find out how to stop these from being created 2015-12-06 18:43:59 +01:00
Enno Rehling
d07f359acb fix a minor warning, get ready for 3.7 release 2015-11-16 14:12:51 +01:00
Enno Rehling
f581999dde add a script to automate coverity scans 2015-10-29 20:40:40 +01:00
Enno Rehling
e23a7fc87d deprecate report_kampfstatus and implement a replacement function. 2015-10-27 12:40:04 +01:00
Enno Rehling
47c48d2985 Merge branch 'master' into develop 2015-09-12 22:27:14 +02:00
Enno Rehling
7e6312441c cron fixes 2015-09-12 21:43:36 +02:00
Enno Rehling
de9fec8eed fix bug in a python script 
do not install crontab anywhere but eressea@gruenbaer
 2015-09-12 21:21:58 +02:00
Enno Rehling
8f00d5293f change the release naming scheme 2015-09-12 15:42:46 +02:00
Enno Rehling
864454877e change the release naming scheme 2015-09-12 15:42:03 +02:00
Enno Rehling
6c8342d1c1 Merge branch 'master' into develop 2015-09-12 15:39:58 +02:00
Enno Rehling
17342b7c5d add a release-tagging script 2015-09-12 15:39:36 +02:00
Enno Rehling
3f39569710 add compression scripts to installer 2015-09-12 15:26:00 +02:00
Enno Rehling
42f1030251 separate test script for E4: 
even though it has mostly the same rules, it does not have xmastrees, and loads a different config
remove dead `inactivefaction` function, we have no use for the file it creates.
 2015-09-12 14:10:08 +02:00
Enno Rehling
bf86b1d66a add missing .sh files to git (previously blocked by .gitignore) 
add an integration test for run-turn.lua
 2015-09-07 15:27:30 +02:00
Enno Rehling
a28a35bb6c include weekly summary in the report email. 
https://bugs.eressea.de/view.php?id=2135#c6115
 2015-09-07 11:04:56 +02:00
Enno Rehling
df5eaa6ef2 eliminate warning (unused variable) 2015-08-16 19:55:11 +02:00
Enno Rehling
76740192f8 check that the CR contains reasonable entries 2015-08-05 17:42:36 +02:00
Enno Rehling
a31dd95de0 give the first unit a sword, set skills from the equipment-config, not script 
make the preview link use a soft-link, not calculate the build-directory again.
 2015-07-19 20:07:08 +02:00
Enno Rehling
c0c3400f21 remove junk files, thank you windows 2015-07-12 11:01:59 +02:00
Enno Rehling
7087c0e0ab Update to latest submodules, fix iniparser and critbit. 
I did this before, must have lost it in the merge. Crazy.
 2015-07-12 10:38:01 +02:00
Enno Rehling
11e1fab0d0 Merge branch 'hotfix-3.4.1' into feature/travis-migration 
Conflicts:
	.travis.yml
	s/build
	s/cmake-init
	s/runtests
	s/travis-build
	src/kernel/region.c
 2015-07-12 04:12:32 +02:00
Enno Rehling
cfb1812f24 fix building on RasPi 2015-07-12 03:08:29 +02:00
Enno Rehling
b89c9a2401 raspberry pi fixes 2015-07-12 01:04:39 +02:00
Enno Rehling
252d8b8d88 trying to fix tolua build 2015-07-11 23:25:09 +02:00
Enno Rehling
90d428f67a use local copy of tolua if it isn't installed in the system 2015-07-11 21:52:59 +02:00
Enno Rehling
4c79962729 add tolua submodule, kill all references to tolua++ 2015-07-11 17:48:35 +02:00
Enno Rehling
13e50cd403 updte submoduiles before building 2015-07-11 14:37:38 +02:00
Enno Rehling
09db2fe278 jsreport: return error if file not open. add scan-build to travis 2015-07-06 20:49:13 +02:00
Enno Rehling
7934917607 pull latest version before building develop 2015-06-28 13:38:13 +02:00
Enno Rehling
b630c9ee45 oops. the name of the server is gruenbaer, not eressea 2015-06-17 08:07:47 +02:00
Enno Rehling
5257848648 do not install crontab, except on eresseaserver. fixes issue #226 2015-06-17 08:06:01 +02:00
Enno Rehling
32bd8c4353 make preview script valgrind use suppression file, closing issue #154 2015-06-17 07:50:35 +02:00
Enno Rehling
ff3fdb62cd enable valgrind suppressions for QA previews 2015-06-17 07:30:06 +02:00
Enno Rehling
8080adcd2b travis build now runs a full turn for acceptance. 
* new cmake module (lus/tolua changes).
* valgrind suppression for glibc strtod problems.
 2015-06-09 08:39:22 +02:00
Enno Rehling
8ecf51b057 cmake will use LD_LUA and LD_TOLUA environment variables to search 2015-06-08 22:23:07 +02:00
Enno Rehling
59400b1e27 Merge branch 'release-3-5' into develop 
Conflicts:
	s/runtests
	src/buildno.h
 2015-05-24 14:10:42 +02:00
Enno Rehling
9780ec845f still having problems with GiveRestriction 2015-05-24 07:49:01 +02:00
Enno Rehling
b7f6bea569 suppress zlib bugs on Travix boxen 2015-05-21 18:03:24 +02:00
Enno Rehling
0838218706 generate suppressions, fix valgrind exit code 2015-05-21 17:48:45 +02:00
Enno Rehling
090197866b investigating travis build environment 2015-05-21 17:44:36 +02:00
Enno Rehling
ac01d33cd2 try to locate zlib valgrind problem on the travis boxen. 
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577135
use set -e to terminate when any part of the build fails
 2015-05-21 17:29:13 +02:00
Enno Rehling
f29d573c3e fix travis build writing reports with valgrind 2015-05-21 16:30:14 +02:00
Enno Rehling
5c62bf2401 include valgrind in the travis build 2015-05-21 13:21:53 +02:00
Enno Rehling
1c4778e3ef abort tests when non-zero exit-code is returned, fix GiveRestriction for pool tests 2015-05-21 11:05:24 +02:00
Enno Rehling
88f454e1f7 failed tests abort runtests and return an error code 
small test world for (future) valgrind tests.
 2015-05-21 08:29:22 +02:00
Enno Rehling
57263134ab travis build did not run the right test file 2015-05-18 07:36:39 +02:00
Enno Rehling
c57907e340 setup new games defaulting to turn 0 2015-05-12 14:30:49 -07:00
Enno Rehling
dc0897b122 fix gmtool and setup script to match the GM guide document. 2015-05-10 13:41:48 -07:00
Enno Rehling
7ae7fa24d8 don't call nproc if the system doesn't have it 2015-03-03 00:10:10 +01:00
Enno Rehling
45b77c9993 Merge branch 'repairing_lua_tests' of https://github.com/CTD1/eressea-server-bugfixing into CTD1-repairing_lua_tests 
Conflicts:
	scripts/run-tests.lua
 2015-02-20 20:28:36 +01:00
CTD
8f21aa7a11 repairing lua tests 
Das ist totales Chaos, viele Testcases wurden einfach nicht ausgeführt
weil sie nicht in den init files stehen.
Etwas neu strukturiert, Test laufen jetzt auch wenn sie nicht aus dem
eressea root Ordner gestartet werden wie in s/runtest und es sind einige
Testcases mehr als bisher. Auch macht Travis jetzt die E3 Test. Dabei
ist ein schwerwiegender Fehler beim neuen Bewache aufgefallen!
 2015-02-13 16:03:05 +01:00
Enno Rehling
742f464ee5 further fixes to the crontab system 2015-02-08 10:35:59 +01:00
Enno Rehling
741cb30e90 clean up cron jobs, add crontab, add flag to disable jobs 2015-02-07 19:39:44 +01:00
Enno Rehling
fecbac86bc update version number, make preview script use the correct branch 2015-02-06 01:40:03 +01:00
Enno Rehling
b06efdfa75 I cannot get this to work, hacking it 2015-02-01 08:37:04 +01:00
Enno Rehling
a567fe9ed0 function is a bash-ism 2015-02-01 08:29:21 +01:00
Enno Rehling
6b1285a784 fix preview script so it can checkout and build from tags 2015-02-01 08:21:07 +01:00
Enno Rehling
ba71728a64 preview build script checks for a branch to build from (in build/.preview) 
fix int to bool conversions
 2015-01-09 20:42:17 +01:00
Enno Rehling
9453aff7f5 fix running game-specific tests for E3, add them to the test suite. 2014-12-31 21:07:42 +01:00
Enno Rehling
0b58ca9176 try to handle more potential errors 2014-12-21 13:41:21 +01:00
Enno Rehling
3ac407407a check for lockfile before running 2014-12-14 07:01:22 +01:00
Enno Rehling
65b48a7996 check for reports.txt before trying to send reports 2014-12-14 06:57:45 +01:00
Enno Rehling
386588083c add a script to pull a branch and update submodules 2014-12-12 13:45:50 +01:00
Enno Rehling
e1d5033b76 make tests more valgrind-friendly by not leaking memory 2014-12-12 11:13:25 +01:00
Enno Rehling
c76ff2b9c7 create link to an eressea.ini before runnign tests 2014-12-11 10:22:14 +00:00
Enno Rehling
6438d6807e accepting Don's changes to the setup script. 
back-filling test for faction.get and get_faction.
 2014-11-26 18:37:07 +01:00
Enno Rehling
f55ab5f752 the build number is in a new file. 2014-11-09 12:20:16 +01:00
Enno Rehling
4081480e4a upgrade to latest stoarge library with bugfixes 2014-11-04 07:43:19 +01:00
Enno Rehling
352d947770 debugging done, no need to be so verbose 2014-10-14 23:25:54 +02:00
Enno Rehling
9742ee265f fix eressea.ini for travis, again 2014-10-14 23:22:02 +02:00
Enno Rehling
e1b1f9e03f fix eressea.ini for travis 2014-10-14 23:18:01 +02:00
Enno Rehling
c30a9bd524 travis debugging 2014-10-14 23:10:00 +02:00
Enno Rehling
9ce996051d Merge branch 'master' of github.com:badgerman/eressea 2014-10-14 23:02:56 +02:00
Enno Rehling
a18ea927e6 Travis CI integration 2014-10-14 22:19:36 +02:00
Enno Rehling
8432a6369d guess the ERESSEA environment if it is missing 2014-09-21 16:55:28 +02:00
Enno Rehling
74582aeb2f fix remaining getstrtoken uses without null-check. 2014-09-21 16:43:17 +02:00
Enno Rehling
da42feae58 do not need bash 2014-09-21 09:59:48 +02:00
Enno Rehling
54cf4f4b7b Merge branch 'version-3-2' 
Conflicts:
	src/laws.c
 2014-09-02 09:26:59 +02:00
Enno Rehling
86c2096cfa use full path to preview script from cron. 2014-08-24 00:37:03 +02:00
Enno Rehling
beacb850c6 fix MAKE TEMP, for real this time. I hate skip_token and all that stuff. 2014-08-23 00:37:33 +02:00
Enno Rehling
b2dc6a3a9d fix MAKE TEMP, for real this time. I hate skip_token and all that stuff. 2014-08-23 00:35:06 +02:00
Enno Rehling
e9ccc24895 make previews always build from master 2014-08-22 07:44:52 +02:00
Enno Rehling
fd46b25317 Merge branch 'version-3-0' 
Conflicts:
	conf/e3/config.xml
 2014-08-22 07:40:43 +02:00
Enno Rehling
8d30d73bb4 fix preview script sending to testers.txt 2014-08-21 19:50:03 +02:00
Enno Rehling
408febe1e1 Merge branch 'master' of github.com:eressea/server 2014-08-18 20:33:11 +02:00
Enno Rehling
f8ad9e92e7 Fix some English message translations. 
clean up and improve some scripts, too.
 2014-08-17 11:19:04 +02:00
Enno Rehling
56ea4ec325 this file is executable 2014-08-17 08:45:09 +02:00
Enno Rehling
bb9d59bac5 read turn file before sending 2014-08-16 18:57:06 +02:00
Enno Rehling
d880de0b2a fix preview send script 2014-08-16 18:23:44 +02:00
Enno Rehling
8cc4a53077 cron for eressea previews 2014-08-16 11:43:46 +02:00
Enno Rehling
ff73358b9c Some tiny errors that slipped through Visual Studio's warnings. 2014-08-14 09:59:33 +02:00
Enno Rehling
91ec503b43 fix the mapper script. 
1. move xml configuration reading to a separate module, it's compliated.
2. move the map file to the main scripts folder.
 2014-08-12 22:54:55 +02:00
Enno Rehling
6fbb9b46ca modifying ini file from setup script 2014-08-12 22:00:26 +02:00
Enno Rehling
ca64be7868 setup script to install the server 2014-08-12 17:34:02 +02:00
Enno Rehling
04be680bd5 refactoring the pre-release script. 
1. tests are now done in a subdiretory od the live server.
2. usage is easier, with commands.
3. using getopts for command-line parsing is cool.
 2014-08-11 13:41:37 +02:00
Enno Rehling
3c2ae7ca93 preview script and logging cleanup 
1. all log messages will be terminated with \n, whether the user provided
	it or not.
2. remove a bunch of print() calls from scripts to reduce clutter
3. replace printf calls with log_* calls to reduce clutter
4. add the new release preview script
 2014-08-11 12:04:12 +02:00
Enno Rehling
ebe078df61 replace backslash with forward for unix-style paths 2014-08-03 12:43:16 +02:00
Enno Rehling
67cf73d42c update ini files so tests will pass again 2014-07-23 16:01:56 +02:00
Enno Rehling
a4675c61fd installing resource files through cmake. 2014-07-17 15:55:50 +02:00
TomBraun
c1c0689dc2 Merge remote-tracking branch 'eressea/master' 2014-07-07 10:25:22 +02:00
Enno Rehling
896681e189 print log errors after runnign tests 2014-07-06 22:03:00 +02:00
TomBraun
8803b9d91f accept fix server don't configure 
changes are now in configure fille
 2014-07-04 08:20:49 +02:00
TomBraun
cbdf486d45 Merge remote-tracking branch 'eressea/master' 2014-07-04 08:01:05 +02:00
Enno Rehling
f51e5f91ff strip down the configure script to do only configuration, not builds. 
remove distcc support, because I do not have it set up anywhere I can
test it.
 2014-07-03 20:44:19 -07:00
Enno Rehling
90120ee5c3 stop side-effect of cd - at the end of these scripts 2014-07-02 21:35:16 -07:00
TomBraun
2bb41b169a Server can not configure 
mkdir -p $BIN_DIR is allready done in configure file
the effect is that file configure create the build directory
and in this directory file cmake-init create another, go inside
and don't find CMakeLists.txt
 2014-06-30 08:23:33 +02:00
Enno Rehling
ba53c90b9c Release/Debug builds support 2014-06-28 16:54:10 -07:00
Enno Rehling
2033aabf60 new test suite, moving to new directory. 2014-06-13 17:35:43 -07:00
Enno Rehling
30c1b0e1ff new lua test framework, work in progress. 2014-06-12 17:41:03 -07:00
Enno Rehling
19a21772e4 stop tests from crashing 2014-05-04 15:54:56 -07:00
Enno Rehling
fa5dc43b98 reorganizing the way configuration data is read (WIP) 2014-04-20 09:36:25 -07:00
Enno Rehling
ae68a1beaf add a script that runs all tests 
clean up the build scripta bit
bind ship type
 2014-04-12 05:25:21 +02:00
Enno Rehling
9aeb0f6b86 make build script figure out how many jobs to run 2014-04-11 19:41:17 -07:00
Enno Rehling
bcc116825b latest cutest revision 2014-04-11 09:51:37 -07:00
Enno Rehling
e350b8a146 rebuild lua bindings 
fix json export
add a script to reset submodules
 2014-03-16 02:12:49 -07:00
Enno Rehling
afe355e9b9 begin creating a make install target. 
add a script to set up PATHs for cmake
 2014-03-02 12:20:49 -08:00