From d353a2485c1f8df2a8063d71ed811deab771549f Mon Sep 17 00:00:00 2001 From: lukas Date: Tue, 5 May 2020 17:02:39 +0200 Subject: [PATCH] more dynamic .dll folder for exe packing other config dir for windows build --- CMakeLists.txt | 68 +++++++++++++++++++++++++++++--------------------- src/Config.cpp | 7 +++--- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index acd644c..a4238a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,9 +56,15 @@ if (${WinBuild}) # maybe so: set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++ -static") # or set(CMAKE_CXX_STANDARD_LIBRARIES -lcurl -lpthread -static-libgcc -static-libstdc++ -lcrypto -lssl -lws2_32 -static -DCURL_STATICLIB) # or add_definitions(-DCURL_STATICLIB) + + # windows config path is same as executable + set(CONFIG_PATH "./iprefresher.cfg") else () set(LIBSUFFIX .so) set(SUFFIX "") + + # set /etc/ config path + set(CONFIG_PATH "/etc/iprefresher.cfg") endif () @@ -71,9 +77,9 @@ if (${WinBuild}) FIND_PATH(CURL_INCLUDE_DIRS curl/curl.h /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/include/) # search for libconfig include headers FIND_LIBRARY(CURL_LIBRARIES NAMES libcurl.dll.a HINTS /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/lib) # search for actual lib - message(STATUS "Found CURL version: ${CURL_VERSION_STRING}") message(STATUS "Using CURL include dir(s): ${CURL_INCLUDE_DIRS}") message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}") + message(STATUS "") include_directories(${CURL_INCLUDE_DIRS} inc) @@ -81,14 +87,10 @@ if (${WinBuild}) FIND_PATH(LIBCONFIG++_INCLUDE_DIRS libconfig.h++ /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/include/) # search for libconfig include headers FIND_LIBRARY(LIBCONFIG++_LIBRARIES NAMES libconfig++.dll.a HINTS /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/lib) # search for actual lib - message(STATUS "Found LIBCONFIG++ version: ${CURL_VERSION_STRING}") message(STATUS "Using LIBCONFIG++ include dir(s): ${LIBCONFIG++_INCLUDE_DIRS}") message(STATUS "Using LIBCONFIG++ lib(s): ${LIBCONFIG++_LIBRARIES}") include_directories(${LIBCONFIG++_INCLUDE_DIRS} inc) - - # configure libconfig - else () find_package(CURL REQUIRED) if (CURL_INCLUDE_DIRS AND CURL_LIBRARIES) @@ -123,19 +125,11 @@ FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/Version.h #include namespace Version { const std::string VERSION = \"${PROJECT_VERSION}\"; + const std::string ConfigDir = \"${CONFIG_PATH}\"; const std::string SAMPLECONFIG = R\"(${SAMPLECONFIG})\"; }" ) -# generate post script for checking if configuration already exists -FILE(WRITE ${CMAKE_SOURCE_DIR}/postinst - "#!/bin/bash -if [ ! -f /etc/iprefresher.cfg ]; then - cat > /etc/iprefresher.cfg <<- EOM -${SAMPLECONFIG}EOM -fi\n" - ) - add_library(api ${LIB_METHOD} src/api/API.cpp src/api/TelegramAPI.cpp @@ -178,6 +172,15 @@ IF (NOT ${WinBuild}) # install systemd service and enable it install(FILES service/iprefresher.service DESTINATION lib/systemd/system) + # generate post script for checking if configuration already exists + FILE(WRITE ${CMAKE_SOURCE_DIR}/postinst + "#!/bin/bash +if [ ! -f ${CONFIG_PATH} ]; then + cat > ${CONFIG_PATH} <<- EOM +${SAMPLECONFIG}EOM +fi\n" + ) + SET(CPACK_DEB_COMPONENT_INSTALL 1) SET(CPACK_OUTPUT_FILE_PREFIX packages) @@ -215,27 +218,34 @@ IF (NOT ${WinBuild}) SET(CPACK_PACKAGE_SECTION "games") ELSE () + # INSTALL to Windows SYSTEM # + + # install binary to current folder + set_target_properties(iprefresher PROPERTIES SUFFIX ".exe") + install(TARGETS iprefresher DESTINATION .) + + # install .dll dependencies + # todo check if files exist... + install(FILES /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libcurl-4.dll + /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libssh2-1.dll + /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libstdc++-6.dll + /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libgcc_s_seh-1.dll + /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libcrypto-1_1-x64.dll + /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libssl-1_1-x64.dll + /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libwinpthread-1.dll + /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/zlib1.dll + /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libidn2-0.dll + /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libconfig++-11.dll + DESTINATION .) + + # Pack a NSIS intaller set(CPACK_GENERATOR NSIS) + message(STATUS "Using NSIS Package build.") set(CPACK_NSIS_testcomp_INSTALL_DIRECTORY /) set(CPACK_PACKAGE_INSTALL_DIRECTORY "DynuIpRefresher") SET(CPACK_NSIS_MODIFY_PATH ON) - - set_target_properties(iprefresher PROPERTIES SUFFIX ".exe") - install(TARGETS iprefresher DESTINATION .) - # todo more dynamic - install(FILES /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libcurl-4.dll - /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssh2-1.dll - /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libstdc++-6.dll - /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libgcc_s_seh-1.dll - /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libcrypto-1_1-x64.dll - /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssl-1_1-x64.dll - /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libwinpthread-1.dll - /usr/x86_64-w64-mingw32/sys-root/mingw/bin/zlib1.dll - /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libidn2-0.dll - /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libconfig++-11.dll - DESTINATION .) ENDIF () INCLUDE(CPack) diff --git a/src/Config.cpp b/src/Config.cpp index 07bc961..8fdfd2f 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -21,13 +21,14 @@ std::string Config::chatId; bool Config::readCredentials() { libconfig::Config cfg; try { - cfg.readFile("/etc/iprefresher.cfg"); + // todo make dynamic here + cfg.readFile(Version::ConfigDir.c_str()); } catch (const libconfig::FileIOException &fioex) { std::cout << "I/O error while reading config file." << std::endl << "creating new config file!" << std::endl; std::ofstream myfile; - myfile.open("/etc/iprefresher.cfg"); + myfile.open(Version::ConfigDir); if (myfile.is_open()) { myfile << Version::SAMPLECONFIG; myfile.close(); @@ -66,7 +67,7 @@ bool Config::validateConfig() { libconfig::Config cfg; try { Logger::message("reading config file"); - cfg.readFile("/etc/iprefresher.cfg"); + cfg.readFile(Version::ConfigDir.c_str()); } catch (const libconfig::FileIOException &fioex) { Logger::warning("config file doesn't exist or permission denied!");