commit a73cc879

sago007 · 2018-11-13 17:01
a73cc879d534d4a262906995630abbb358bfbd3c patch · browse files
parent 00d8454434b3cf6fb44d3bad7e01f99ef071bb19

Add .dockerignore. Use CppDb

Changed files

diff --git a/.dockerignore b/.dockerignore new file mode 120000 index 0000000..3e4e48b --- /dev/null +++ b/.dockerignore

@@ -0,0 +1 @@

+.gitignore

\ No newline at end of file

diff --git a/.gitignore b/.gitignore index 39124d5..f27a3b2 100644 --- a/.gitignore +++ b/.gitignore

@@ -10,9 +10,10 @@ oastat-win/

sql/create_tables/oastat_create_tables_mysql.sql

sql/create_tables/oastat_create_tables_posgrel.sql

sql/create_tables/oastat_create_tables_sqlite.sql

cmake_install.cmake

CMake*

-CMakeLists.txt

+#.dockerignore needs a ! in front instead of -

+!CMakeLists.txt

CPack*

Makefile

diff --git a/CMakeLists.txt b/CMakeLists.txt index f44e48f..a029055 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.9)

project (oastat)

find_package(Boost COMPONENTS program_options REQUIRED)

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11")

+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11 -DUSECPPDB=1")

file(GLOB SOURCES "src/*.cpp" "src/*/*.cpp")

diff --git a/src/oastat.cpp b/src/oastat.cpp index b5b6548..632f5d1 100644 --- a/src/oastat.cpp +++ b/src/oastat.cpp

@@ -216,7 +216,7 @@ int main (int argc, const char* argv[])

if (vm.count("help")) {

std::cout << desc << "n";

std::cout << "Examples: \n";

- std::cout << argv[0] << " -f \"~/.openarena/baseoa/games.log\" --backend \"Cppdb\" --dbarg \"mysql:database=oastat;username=openarena\"\n";

+ std::cout << argv[0] << " -f \"~/.openarena/baseoa/games.log\" --backend \"CppDb\" --dbarg \"mysql:database=oastat;username=openarena\"\n";

std::cout << argv[0] << " -f \"~/.openarena/baseoa/games.log\" --backend \"CppDb\" --dbarg \"pgsql:database=oastat;username=openarena\"\n";

std::cout << argv[0] << " -f %APPDATA%/OpenArena/baseoa/games.log --backend \"CppDb\" --dbarg \"sqlite3:db=defoastat.db3\"\n";

std::cout << "tail -f \"~/.openarena/baseoa/games.log\" | "<< argv[0] << " -f \"\" --backend \"Xml\" --dbarg \"outputdir ~/oastat\"\n";