Commit graph

61 commits

Author SHA1 Message Date
ctrlaltca
e223f07462 fix #3235 (#3302) 2018-06-21 18:56:53 -04:00
ctrlaltca
f97959febc
fix #3257 (#3258) 2018-05-24 15:46:02 +02:00
ctrlaltca
c06fc562a1
Cmake scripts refactoring; fix #3225 (#3230)
* fix #3225

* Servatrice: use websockets as an optional component (for qt < 5.3)

* Attempt++
2018-05-12 23:28:22 +02:00
ctrlaltca
2780270911 macOS: fix qt plugin installation (#3216)
* Osx: fix qt plugin installation

* Add make install step to travis debug build

* only install under osx

* Add "styles" plugins (for native look'n'feel)

* Osx: upgrade qt from 5.5 to current (5.10.1)

* Fix osx on travis

The qt homebrew formula now installs three qt* symlinks (qt, qt5, qt5@5.x) so we can't use/don't need bash globbing anymore
2018-05-02 15:57:35 -04:00
woogerboy21
da7c7c1f83
Update Servatrice MySQL Search Path (#3039)
Removed the older versions of the mysql library install paths and updated to reflect the 5.7 product paths.
2018-01-21 11:05:13 -05:00
woogerboy21
b684c12964 Correct VS2017 Compile Issue (#2878)
A line in the servatrice CMAKE file was removed in a prior commit causing a compile error in newer versions of visual studio.  This returns the line.
2017-10-03 09:23:33 -04:00
ctrlaltca
ccee0aa3fd Cmake: remove old unneeded POLICIES (fix Appveyor) (#2859) 2017-09-22 17:47:05 +02:00
ctrlaltca
1366e5970e Portable mode for windows (#2794)
* Portable mode for windows

* fix start menu in portable mode

* Make gcc an happy puppy

* Clean old installation if we are installing over an old portable mode installation

* Default to Desktop\CockatricePortable

* Settings dialog fixes

* wording
2017-07-08 11:22:29 +02:00
Zach H
47cafde521 fix lowercase (#2419)
* fix lowercase

* fix changes

* fix .desktop

* servatrice .desktop
2017-02-23 08:53:18 +01:00
Fabio Bas
5b21dc8cde Implementation of websockets in servatrice and test js client 2016-06-26 19:38:53 +02:00
Fabio Bas
bb5292aa8d Drop Qt4, libgcrypt, qtmobility dependencies 2016-05-11 12:45:58 +02:00
ctrlaltca
55f3e9314b Merge pull request #1859 from ctrlaltca/carddb
Rework some parts of the card database
2016-03-30 22:55:36 +02:00
Fabio Bas
a55b3784eb cmake: Enable c++11 for all targets 2016-03-21 11:42:38 +01:00
Fabio Bas
62cb89d224 Fix mysql plugin deploy on windows 2016-03-08 12:54:04 +01:00
woogerboy21
3ba3f1e2a7 Added MySQL 5.7 lib path to servatrice CMAKE
Added default search path for most recent version of MySQL
2016-02-27 15:13:59 -05:00
Fabio Bas
ac06544849 Added 64bit libraries each path for libmysqlclient 2016-02-23 08:56:47 +01:00
Fabio Bas
49b22b7d2f Try to fix package creation 2015-12-27 16:03:32 +01:00
Fabio Bas
74c58cc2b0 fix qt libraries bundling on osx
fix #1547
2015-10-01 23:35:54 +02:00
marco
0b94b47f72 Servatrice portable + cmake options
Use -DPORTABLE=1 to build a portable version
2015-08-25 21:25:13 +02:00
Fabio Bas
1ffc9b4561 Refactor servatrice email send 2015-07-25 18:48:34 +02:00
Zach
7ebf817b17 Merge pull request #1197 from Cockatrice/cpp11 2015-07-13 13:23:18 -04:00
Gavin Bises
8ed9d35724 Update project to C++11 compilation. 2015-07-03 10:02:31 -04:00
Fabio Bas
6cf3db7e6b Servatrice: refactor signal handling and permit config reloading 2015-06-30 22:21:26 +02:00
Fabio Bas
471f6371b5 More work
* Refactored code out of common/ into servatrice/
 * added smtp client library
 * disable registration when connected
 * validate email address
 * send activation token via email
2015-05-24 23:02:51 +02:00
Fabio Bas
7bbb5dec52 fix #947 2015-04-11 15:19:16 +02:00
Fabio Bas
54ce135e0c Optimize qt plugins installation
* Always install “release” plugins
 * install only plugins actually used
2014-12-28 22:21:45 +01:00
Fabio Bas
c0ee060af4 Fixed vendor name 2014-11-09 23:14:36 +01:00
Fabio Bas
a716d73a42 OSX: Add proper infos to info.plist
fixes #411
2014-11-09 21:03:10 +01:00
Fabio Bas
c0abb347ac Servatrice: Install icons and desktop file under linux 2014-10-11 13:37:52 +02:00
Matt Lowe
5b50aa0f0a Servatrice logo
+ added resources needed for servatrice logo
~ updated CMakeLists.txt to include the new resources
2014-10-06 21:04:37 +02:00
Fabio Bas
a1b6600fe1 Servatrice: group all the use of QSettings in a single file
and add a method to guess the path of servatrice.ini
2014-10-02 22:37:50 +02:00
Gavin Bisesi
263b5a40f5 Merge pull request #341 from ctrlaltca/servatrice_install_configs
Servatrice: install example ini and sql schema file
2014-10-02 10:06:03 -04:00
Fabio Bas
7afdff1b3b Servatrice: install example ini and sql schema file
WIN: in the binary directory
OSX: in the app bundle’s Resources subdirectory
LINUX: in $PREFIX/share/servatrice
2014-10-02 08:34:21 +02:00
Fabio Bas
355de8fba4 Drop libgcrypt dependency for qt5 2014-10-01 20:21:22 +02:00
Fabio Bas
fc24ffdec2 Cmake reorganization
* Move all cmake-related files in a new “cmake” folder
* move nsis files in there, too, since they are templates parsed by cake
* retrieve git version once when cmake is run, and use it for both
creating version_string.h/cpp and for package naming
2014-06-28 19:39:26 +02:00
Fabio Bas
096f200eb9 Install libraries and plugins automatically under windows
You won’t have to copy manually all the dlls in the release directory
anymore
2014-06-27 17:40:29 +02:00
Fabio Bas
34772cccab Compilation fix for MSVC+Qt5 2014-06-27 17:09:09 +02:00
Fabio Bas
c4458b16b2 Qt5: fix plugin installation 2014-06-25 15:53:25 +02:00
Fabio Bas
809f390e2f Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-25 15:46:50 +02:00
Fabio Bas
2eebddea9a Port "make package" fix to oracle and servatrice 2014-06-22 23:41:15 +02:00
Fabio Bas
b44365b73c This finally fixes both make install and make package 2014-06-22 23:41:15 +02:00
Fabio Bas
6d1de0c617 Partially revert previous commits; ensure the bundle is fixed up correctly 2014-06-22 23:41:15 +02:00
Fabio Bas
41c7ce8022 Fix qt.conf file creation for "make package" 2014-06-22 23:41:15 +02:00
Fabio Bas
99f3519da5 Workaround permission problem in ixup_bundle
Without this change, make install and make package would require “sudo”
under osx
2014-06-22 23:41:15 +02:00
Fabio Bas
d7a962c055 CMake: support fir linking against qt5 2014-06-21 14:12:55 +02:00
Fabio Bas
eca318c34d Make install paths relative to prepare for CPack 2014-06-12 23:29:42 +02:00
Fabio Bas
721cf6fe4f Re-indent CMakeLists.txt using spaces 2014-06-11 18:08:30 +02:00
Fabio Bas
4b49458eeb servatrice's CMakeLists.txt: major overhaul
* Remove cockatrice_HEADERS (obsoleted by automoc)
* Remove compilation flags definition and Qt4 finding calls
* Make use of CMAKE_INSTALL_PREFIX
* use INSTALL(TARGETS) in place of INSTALL(PROGRAM)
* Osx: create a proper application bundle
* Added comments
2014-06-10 23:34:01 +02:00
Max-Wilhelm Bruker
de87bc6546 compile fixes by hasufell 2012-10-28 21:43:41 +01:00
Max-Wilhelm Bruker
520300dc86 made server threaded, fixing issue #51 2012-05-28 18:51:58 +02:00