Commit Graph

214 Commits

Author SHA1 Message Date
Enno Rehling 0b2292c98f
Merge pull request #810 from ennorehling/develop
Integrate new parser library separation progress
2018-10-06 21:35:15 +02:00
Enno Rehling f53b1f50ae cmake init after pull 2018-09-30 14:54:13 +02:00
Enno Rehling 4a69573786 change database selection, fix in-memory db 2018-09-30 13:36:34 +02:00
Enno Rehling 735c890ece explicitly build sqlite on travis 2018-09-29 09:58:23 +02:00
Enno Rehling b18f8ca9fb change database selection, fix in-memory db 2018-09-29 09:56:05 +02:00
Enno Rehling e462529596 fix merge conflict
choose sqlite as default database
2018-09-26 20:36:27 +02:00
Enno Rehling bca987ee64 force tag update after release 2018-09-10 17:54:39 +02:00
Enno Rehling 11eb4980f8 use system-wide muttrc 2018-07-24 13:58:36 +02:00
Enno Rehling 67a2f0bacd detect missing lua library 2018-03-10 18:32:31 +01:00
Enno Rehling b0840f83ef detect missing lua library 2018-03-10 18:27:11 +01:00
Enno Rehling 6c0f8a81f6 merge from master 2018-02-26 19:51:48 +01:00
Enno Rehling 622c103b00 more cppcheck messages 2018-02-26 19:48:52 +01:00
Enno Rehling 432a8d432d messy merge of cppcheck fixes into develop 2018-02-25 20:41:53 +01:00
Enno Rehling 28e9ddbdb4 Merge branch 'master' 2018-02-25 20:27:16 +01:00
Enno Rehling 43268b913b cppcheck ignores tests 2018-02-25 20:06:55 +01:00
Enno Rehling 15e2d82706 ignore some more defines 2018-02-25 20:06:55 +01:00
Enno Rehling a0fcdc83fe ignore TODO code 2018-02-25 20:06:55 +01:00
Enno Rehling 5d9d299e68 refactor repotring items 2018-02-25 20:06:55 +01:00
Enno Rehling b67db4faf9 remove unused ct_fleechance (misteltoe relic) 2018-02-25 13:22:41 +01:00
Enno Rehling c432bcf22e fix types for CMakeCache 2018-02-24 18:17:47 +01:00
Enno Rehling 02c6c863a3 BUG 2416: Prefer sqlite over db backend 2018-02-24 17:37:51 +01:00
Enno Rehling e841177e6f fix types for CMakeCache 2018-02-18 10:37:13 +01:00
Enno Rehling 7c3e0a5225 BUG 2416: Prefer sqlite over db backend 2018-02-18 10:31:57 +01:00
Enno Rehling 77a8c24ead disable process test turn check (recent change).
make all tests run from inside the tests directory
2018-02-10 18:52:03 +01:00
Enno Rehling a8c9576937 fix mac build 2018-02-04 14:59:01 +01:00
Enno Rehling 3c8ff4e76e CMAKE_BUILD_TYPE is a cache variable 2018-02-03 09:58:56 +01:00
Enno Rehling 5094705ba0 make s/cmake-init more intelligent. 2018-02-02 18:39:05 +01:00
Enno Rehling 041c0fdfaa export LUA_DIR to find the right LUA_INCLUDE_DIR 2018-01-11 17:13:49 +01:00
Enno Rehling a79e22984b cppcheck disabled, it is too slow 2017-12-31 20:47:40 +01:00
Enno Rehling 55479c960c break up the cppcheck tests, they time out on travis 2017-12-31 20:26:24 +01:00
Enno Rehling 0c1562c14f add include directories for cppcheck 2017-12-08 21:11:54 +01:00
Enno Rehling 5e435a7c0b pass cppcheck v 1.54 default checks 2017-12-08 19:26:26 +01:00
Enno Rehling 0857e363e5 fix travis shellcheck 2017-12-03 16:26:02 +01:00
Enno Rehling 4619f77af9 add a shellcheck test, fix some scripts 2017-12-03 16:12:48 +01:00
Enno Rehling 4fa9e041bf fix cppcheck report (missing curly race) 2017-11-20 14:57:04 +01:00
Enno Rehling af9f263266 add cppcheck to travis build 2017-11-20 08:41:17 +01:00
Steffen Mecke 2f35feee3e minor, obvious fixes 2017-11-14 12:51:04 +01:00
Enno Rehling ed23853c4d add valgrind option to runtests, use in travis builds 2017-10-10 21:30:53 +02:00
Enno Rehling b70f0e9977 do not allow install from the wrong branch 2017-08-24 16:57:02 +02:00
Enno Rehling 9e213d3bcd minor optimization and using fraction code 2017-05-26 19:05:46 +02:00
Enno Rehling c44e63e763 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2017-05-08 22:06:45 +02:00
Enno Rehling 4fdfbb44b5 this config.xml was added by accident. 2017-05-08 08:15:18 +02:00
Enno Rehling 7f9c85384a build script madness, again 2017-04-22 19:06:38 +02:00
Enno Rehling 9c6108f965 Merge branch 'master' into develop 2017-04-22 19:05:58 +02:00
Enno Rehling 376fc0265c Merge branch 'master' of github.com:eressea/server
Conflicts:
	s/build
2017-04-22 19:05:14 +02:00
Enno Rehling 1eb189cf47 shell wants spaces around = for string compares? 2017-04-22 19:03:08 +02:00
Enno Rehling 1e3abb3df6 Merge branch 'master' into develop 2017-04-22 18:58:52 +02:00
Enno Rehling bda395d374 shell wants ==, not = for string compares? 2017-04-22 18:57:57 +02:00
Enno Rehling e938350acd add cmake as part of main project 2017-04-22 18:07:09 +02:00
Enno Rehling 8d2687ab90 print version number at end of tests. 2017-03-29 04:30:54 +02:00