updated build system

.jenkins_builds

@@ -4,7 +4,9 @@ pipeline {
   agent none
 
   environment {
-    PROJECT_TEST_DIR = "${HOME}/.ci/cfg"
+    DEVELOPER_PRIVATE_KEY = "/.ci/repertory/cert/developer.priv"
+    DEVELOPER_PUBLIC_KEY = "${WORKSPACE}/developer.pub"
+    PROJECT_TEST_DIR = "/.ci/repertory/test"
   }
 
   options {
@@ -53,7 +55,9 @@ pipeline {
       agent any
 
       steps {
-        sh 'echo skipping deliver'
+        sh 'scripts/deliver.sh /mnt/repertory "" "" "" "" 1 0'
+        sh 'scripts/deliver.sh /mnt/repertory "" aarch64'
+        sh 'scripts/deliver.sh /mnt/repertory'
       }
     }
   }

CMakeLists.txt

@@ -44,6 +44,13 @@ if(PROJECT_BUILD)
 
   include(project.cmake)
 
+  string(REPLACE "\\<" "<" PROJECT_COMPANY_NAME "${PROJECT_COMPANY_NAME}")
+  string(REPLACE "\\<" "<" PROJECT_COPYRIGHT "${PROJECT_COPYRIGHT}")
+  string(REPLACE "\\<" "<" PROJECT_DESC "${PROJECT_DESC}")
+  string(REPLACE "\\>" ">" PROJECT_COMPANY_NAME "${PROJECT_COMPANY_NAME}")
+  string(REPLACE "\\>" ">" PROJECT_COPYRIGHT "${PROJECT_COPYRIGHT}")
+  string(REPLACE "\\>" ">" PROJECT_DESC "${PROJECT_DESC}")
+
   if (PROJECT_IS_MINGW)
     if ("${PROJECT_RELEASE_ITER}" STREQUAL "release")
       set(PROJECT_PRERELEASE 0)
@@ -72,6 +79,13 @@ if(PROJECT_ENABLE_FUSE)
   message(STATUS "  FUSE version: ${PROJECT_FUSE}")
 endif()
 
+  string(REPLACE "<" "\\<" PROJECT_COMPANY_NAME "${PROJECT_COMPANY_NAME}")
+  string(REPLACE "<" "\\<" PROJECT_COPYRIGHT "${PROJECT_COPYRIGHT}")
+  string(REPLACE "<" "\\<" PROJECT_DESC "${PROJECT_DESC}")
+  string(REPLACE ">" "\\>" PROJECT_COMPANY_NAME "${PROJECT_COMPANY_NAME}")
+  string(REPLACE ">" "\\>" PROJECT_COPYRIGHT "${PROJECT_COPYRIGHT}")
+  string(REPLACE ">" "\\>" PROJECT_DESC "${PROJECT_DESC}")
+
   add_custom_target(project ALL
     DEPENDS ${PROJECT_DEPENDENCIES}
     COMMAND cd build && cmake
@@ -89,38 +103,17 @@ endif()
       -DPROJECT_DESC=${PROJECT_DESC}
       -DPROJECT_DIST_DIR=${PROJECT_DIST_DIR}
       -DPROJECT_ENABLE_BOOST=${PROJECT_ENABLE_BOOST}
-      -DPROJECT_ENABLE_CLI11=${PROJECT_ENABLE_CLI11}
       -DPROJECT_ENABLE_CPP_HTTPLIB=${PROJECT_ENABLE_CPP_HTTPLIB}
       -DPROJECT_ENABLE_CURL=${PROJECT_ENABLE_CURL}
-      -DPROJECT_ENABLE_DTL=${PROJECT_ENABLE_DTL}
-      -DPROJECT_ENABLE_FLAC=${PROJECT_ENABLE_FLAC}
-      -DPROJECT_ENABLE_FMT=${PROJECT_ENABLE_FMT}
-      -DPROJECT_ENABLE_FONTCONFIG=${PROJECT_ENABLE_FONTCONFIG}
-      -DPROJECT_ENABLE_FREETYPE2=${PROJECT_ENABLE_FREETYPE2}
       -DPROJECT_ENABLE_FUSE=${PROJECT_ENABLE_FUSE}
-      -DPROJECT_ENABLE_FZF=${PROJECT_ENABLE_FZF}
-      -DPROJECT_ENABLE_GTKMM=${PROJECT_ENABLE_GTKMM}
       -DPROJECT_ENABLE_JSON=${PROJECT_ENABLE_JSON}
-      -DPROJECT_ENABLE_LIBBITCOIN_SYSTEM=${PROJECT_ENABLE_LIBBITCOIN_SYSTEM}
-      -DPROJECT_ENABLE_LIBEVENT=${PROJECT_ENABLE_LIBEVENT}
       -DPROJECT_ENABLE_LIBSODIUM=${PROJECT_ENABLE_LIBSODIUM}
-      -DPROJECT_ENABLE_NUSPELL=${PROJECT_ENABLE_NUSPELL}
-      -DPROJECT_ENABLE_OGG=${PROJECT_ENABLE_OGG}
-      -DPROJECT_ENABLE_OPENAL=${PROJECT_ENABLE_OPENAL}
       -DPROJECT_ENABLE_OPENSSL=${PROJECT_ENABLE_OPENSSL}
       -DPROJECT_ENABLE_PUGIXML=${PROJECT_ENABLE_PUGIXML}
-      -DPROJECT_ENABLE_ROCKSDB=${PROJECT_ENABLE_ROCKSDB}
-      -DPROJECT_ENABLE_SAGO_PLATFORM_FOLDERS=${PROJECT_ENABLE_SAGO_PLATFORM_FOLDERS}
-      -DPROJECT_ENABLE_SECP256K1=${PROJECT_ENABLE_SECP256K1}
-      -DPROJECT_ENABLE_SFML=${PROJECT_ENABLE_SFML}
-      -DPROJECT_ENABLE_SPDLOG=${PROJECT_ENABLE_SPDLOG}
       -DPROJECT_ENABLE_SQLITE=${PROJECT_ENABLE_SQLITE}
       -DPROJECT_ENABLE_STDUUID=${PROJECT_ENABLE_STDUUID}
       -DPROJECT_ENABLE_TESTING=${PROJECT_ENABLE_TESTING}
-      -DPROJECT_ENABLE_TPL=${PROJECT_ENABLE_TPL}
-      -DPROJECT_ENABLE_VORBIS=${PROJECT_ENABLE_VORBIS}
       -DPROJECT_ENABLE_WINFSP=${PROJECT_ENABLE_WINFSP}
-      -DPROJECT_ENABLE_WXWIDGETS=${PROJECT_ENABLE_WXWIDGETS}
       -DPROJECT_EXTERNAL_BUILD_ROOT=${PROJECT_EXTERNAL_BUILD_ROOT}
       -DPROJECT_FUSE=${PROJECT_FUSE}
       -DPROJECT_FUSE_INCLUDE_DIRS=${PROJECT_FUSE_INCLUDE_DIRS}

cmake/libraries.cmake

@@ -1,46 +1,21 @@
 find_package(PkgConfig REQUIRED)
 
-set(Boost_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
-set(CURL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
-set(LIBEVENT_STATIC_LINK ${PROJECT_STATIC_LINK})
-set(OPENSSL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
-set(SFML_STATIC_LIBRARIES ${PROJECT_STATIC_LINK})
 set(ZLIB_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
-set(wxWidgets_USE_STATIC ${PROJECT_STATIC_LINK})
 
-set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR})
+include(cmake/libraries/openssl.cmake)
 
 include(cmake/libraries/boost.cmake)
-include(cmake/libraries/cli11.cmake)
+
-include(cmake/libraries/cpphttplib.cmake)
+include(cmake/libraries/cpp_httplib.cmake)
 include(cmake/libraries/curl.cmake)
-include(cmake/libraries/dtl.cmake)
-include(cmake/libraries/flac.cmake)
-include(cmake/libraries/fmt.cmake)
-include(cmake/libraries/fontconfig.cmake)
-include(cmake/libraries/freetype2.cmake)
 include(cmake/libraries/fuse.cmake)
-include(cmake/libraries/gtest.cmake)
-include(cmake/libraries/gtkmm.cmake)
 include(cmake/libraries/json.cmake)
-include(cmake/libraries/libbitcoinsystem.cmake)
-include(cmake/libraries/libevent.cmake)
 include(cmake/libraries/libsodium.cmake)
-include(cmake/libraries/nuspell.cmake)
-include(cmake/libraries/ogg.cmake)
-include(cmake/libraries/openal.cmake)
-include(cmake/libraries/openssl.cmake)
 include(cmake/libraries/pugixml.cmake)
-include(cmake/libraries/rocksdb.cmake)
-include(cmake/libraries/secp256k1.cmake)
-include(cmake/libraries/sfml.cmake)
-include(cmake/libraries/spdlog.cmake)
 include(cmake/libraries/sqlite.cmake)
 include(cmake/libraries/stduuid.cmake)
-include(cmake/libraries/tpl.cmake)
+include(cmake/libraries/testing.cmake)
-include(cmake/libraries/vorbis.cmake)
 include(cmake/libraries/winfsp.cmake)
-include(cmake/libraries/wxwidgets.cmake)
 
 if(PROJECT_BUILD)
   find_package(Threads REQUIRED)

cmake/libraries/boost.cmake

@@ -1,3 +1,5 @@
+set(Boost_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
+
 if(PROJECT_ENABLE_BOOST)
   add_definitions(-DPROJECT_ENABLE_BOOST)
 

cmake/libraries/cli11.cmake

@@ -1,28 +0,0 @@
-if(PROJECT_ENABLE_CLI11)
-  if(PROJECT_BUILD)
-    find_package(CLI11 ${CLI11_VERSION} REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_CLI11)
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(cli11_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/CLI11-${CLI11_VERSION}.tar.gz
-      URL_HASH SHA256=f2d893a65c3b1324c50d4e682c0cdc021dd0477ae2c048544f39eed6654b699a
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-        -DCLI11_WARNINGS_AS_ERRORS=OFF
-        -DCLI11_SINGLE_FILE=ON
-        -DCLI11_BUILD_DOCS=OFF
-        -DCLI11_BUILD_TESTS=OFF
-        -DCLI11_BUILD_EXAMPLES=OFF
-        -DCLI11_INSTALL=ON
-    )
-
-    set(PROJECT_DEPENDENCIES
-      ${PROJECT_DEPENDENCIES}
-      cli11_project
-    )
-  endif()
-endif()

cmake/libraries/curl.cmake

@@ -1,3 +1,5 @@
+set(CURL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
+
 if(PROJECT_ENABLE_CURL)
   if(PROJECT_BUILD)
     find_package(CURL ${CURL_VERSION} REQUIRED)

cmake/libraries/dtl.cmake

@@ -1,20 +0,0 @@
-if(PROJECT_ENABLE_DTL)
-  if(PROJECT_BUILD)
-    add_definitions(-DPROJECT_ENABLE_DTL)
-  else()
-    ExternalProject_Add(dtl_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/dtl-v${DTL_VERSION}.tar.gz
-      URL_HASH SHA256=d6dcc7834b4117b5c14456ea73b907d0e2bafa5058e3a06b2c504d53517438c5
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      dtl_project
-    )
-  endif()
-endif()

cmake/libraries/flac.cmake

@@ -1,37 +0,0 @@
-if(PROJECT_ENABLE_FLAC)
-  if(PROJECT_BUILD)
-    find_package(FLAC ${FLAC_VERSION} REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_FLAC)
-
-    include_directories(BEFORE SYSTEM
-      ${FLAC_INCLUDE_DIRS}
-    )
-
-    link_libraries(
-      FLAC::FLAC
-    )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(flac_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/flac-${FLAC_VERSION}.tar.gz
-      URL_HASH SHA256=0a4bb82a30609b606650d538a804a7b40205366ce8fc98871b0ecf3fbb0611ee
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-        -DBUILD_EXAMPLES=ON
-        -DBUILD_PROGRAMS=ON
-        -DBUILD_TESTING=OFF
-        -DBUILD_DOCS=OFF
-        -DINSTALL_MANPAGES=OFF
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      flac_project
-    )
-
-    add_dependencies(flac_project vorbis_project)
-  endif()
-endif()

cmake/libraries/fmt.cmake

@@ -1,30 +0,0 @@
-if(PROJECT_ENABLE_FMT)
-  if(PROJECT_BUILD)
-    find_package(fmt ${FMT_VERSION} REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_FMT)
-
-    include_directories(BEFORE SYSTEM
-      ${FMT_INCLUDE_DIRS}
-    )
-
-    link_libraries(
-      fmt::fmt
-    ) 
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(fmt_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/fmt-${FMT_VERSION}.tar.gz
-      URL_HASH SHA256=1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      fmt_project
-    )
-  endif()
-endif()

cmake/libraries/fontconfig.cmake

@@ -1,41 +0,0 @@
-if(PROJECT_ENABLE_FONTCONFIG)
-  if(PROJECT_BUILD)
-    find_package(Fontconfig ${FONTCONFIG_VERSION} REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_FONTCONFIG)
-
-    include_directories(BEFORE SYSTEM
-      ${FONTCONFIG_INCLUDE_DIRS}
-    )
-
-    link_libraries(
-      Fontconfig::Fontconfig
-    )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(fontconfig_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/fontconfig-${FONTCONFIG_VERSION}.tar.gz
-      URL_HASH SHA256=cdebb4b805d33e9bdefcc0ef9743db638d2acb21139bbe1a6a85878d4c3e8c9e
-      BUILD_IN_SOURCE 1
-      LIST_SEPARATOR |
-      CONFIGURE_COMMAND meson
-        setup
-        --prefix=${PROJECT_EXTERNAL_BUILD_ROOT}
-        _build
-      BUILD_COMMAND meson
-        compile
-        -C _build 
-      INSTALL_COMMAND meson
-        install
-        -C _build
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      fontconfig_project
-    )
-
-    add_dependencies(fontconfig_project freetype2_project)
-  endif()
-endif()
-

cmake/libraries/freetype2.cmake

@@ -1,39 +0,0 @@
-if(PROJECT_ENABLE_FREETYPE2)
-  if(PROJECT_BUILD)
-    find_package(Freetype ${FREETYPE2_VERSION} REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_FREETYPE2)
-
-    include_directories(BEFORE SYSTEM
-      ${FREETYPE_INCLUDE_DIRS}
-    )
-
-    link_libraries(
-      Freetype::Freetype
-    )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(freetype2_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/freetype-${FREETYPE2_VERSION}.tar.gz
-      URL_HASH SHA256=1ac27e16c134a7f2ccea177faba19801131116fd682efc1f5737037c5db224b5
-      BUILD_IN_SOURCE 1
-      LIST_SEPARATOR |
-      CONFIGURE_COMMAND meson
-        setup
-        --prefix=${PROJECT_EXTERNAL_BUILD_ROOT}
-        _build
-      BUILD_COMMAND meson
-        compile
-        -C _build
-      INSTALL_COMMAND meson
-        install
-        -C _build
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      freetype2_project
-    )
-  endif()
-endif()
-

cmake/libraries/gtkmm.cmake

@@ -1,14 +0,0 @@
-if(PROJECT_ENABLE_GTKMM)
-  if(PROJECT_BUILD)
-    pkg_check_modules(GTKMM REQUIRED gtkmm-${GTKMM_VERSION})
-
-    add_definitions(
-      -DPROJECT_ENABLE_GTKMM
-      ${GTKMM_DEFINITIONS}
-    )
-
-    include_directories(${GTKMM_INCLUDE_DIRS})
-    link_directories(${GTKMM_LIBRARY_DIRS})
-    link_libraries(${GTKMM_LIBRARIES})
-  endif()
-endif()

cmake/libraries/libbitcoinsystem.cmake

@@ -1,72 +0,0 @@
-if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
-  if(PROJECT_BUILD)
-    add_definitions(
-      -DPROJECT_ENABLE_LIBBITCOIN_SYSTEM
-      -DBC_STATIC
-      -DECMULT_GEN_PREC_BITS=4
-      -DECMULT_WINDOW_SIZE=15
-      -DWITH_ICU
-    )
-
-    set(LIBBITCOIN_SYSTEM_ROOT 
-      ${PROJECT_BUILD_DIR}/external/src/libbitcoinsystem_project
-    )
-
-    include_directories(SYSTEM BEFORE
-      ${LIBBITCOIN_SYSTEM_ROOT}/include
-    )
-
-    set(PROJECT_ADDITIONAL_SOURCES
-      ${PROJECT_ADDITIONAL_SOURCES}
-      ${LIBBITCOIN_SYSTEM_ROOT}/src/math/external/*.c
-      ${LIBBITCOIN_SYSTEM_ROOT}/src/formats/*.cpp
-      ${LIBBITCOIN_SYSTEM_ROOT}/src/config/*.cpp
-      ${LIBBITCOIN_SYSTEM_ROOT}/src/math/*.cpp
-      ${LIBBITCOIN_SYSTEM_ROOT}/src/unicode/*.cpp
-      ${LIBBITCOIN_SYSTEM_ROOT}/src/utility/string.cpp
-      ${LIBBITCOIN_SYSTEM_ROOT}/src/wallet/dictionary.cpp
-      ${LIBBITCOIN_SYSTEM_ROOT}/src/wallet/electrum.cpp
-      ${LIBBITCOIN_SYSTEM_ROOT}/src/wallet/electrum_dictionary.cpp
-      ${LIBBITCOIN_SYSTEM_ROOT}/src/wallet/mnemonic.cpp
-    )
-
-    if(PROJECT_IS_MINGW)
-      pkg_check_modules(ICU_I18N icu-i18n)
-      pkg_check_modules(ICU_IO icu-io)
-      pkg_check_modules(ICU_UC icu-uc)
-
-      link_libraries(
-        ${ICU_I18N_LINK_LIBRARIES}
-        ${ICU_IO_LINK_LIBRARIES}
-        ${ICU_UC_LINK_LIBRARIES}
-      )
-    else()
-      link_libraries(
-        icui18n
-        icuuc
-        icudata
-      )
-    endif()
-  else()
-    ExternalProject_Add(libbitcoinsystem_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/libbitcoin-system-${LIBBITCOIN_SYSTEM_VERSION}.tar.gz
-      URL_HASH SHA256=0d10d79472e914620223f1ddb9396b0fa92ae5eb0b31acc14b9aa634a01d78b6
-      CONFIGURE_COMMAND echo "No configure"
-      BUILD_COMMAND echo "No build"
-      INSTALL_COMMAND echo "No install"
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      libbitcoinsystem_project
-    )
-
-    if(NOT PROJECT_IS_MINGW_UNIX)
-      add_dependencies(libbitcoinsystem_project 
-        boost_project
-        secp256k1_project
-      )
-    endif()
-  endif()
-endif()

cmake/libraries/libevent.cmake

@@ -1,40 +0,0 @@
-if(PROJECT_ENABLE_LIBEVENT)
-  if(PROJECT_BUILD)
-    find_package(Libevent ${LIBEVENT_VERSION} REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_LIBEVENT)
-
-    include_directories(BEFORE SYSTEM
-      ${LIBEVENT_INCLUDE_DIRS}
-    )
-
-    link_libraries(
-      ${LIBEVENT_LIBRARIES}
-    )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    if(PROJECT_BUILD_SHARED_LIBS)
-      set(LIBEVENT_LIBRARY_TYPE BOTH)
-    else()
-      set(LIBEVENT_LIBRARY_TYPE STATIC)
-    endif()
-
-    ExternalProject_Add(libevent_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/libevent-${LIBEVENT_VERSION}-stable.tar.gz
-      URL_HASH SHA256=92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-        -DEVENT__DISABLE_OPENSSL=ON
-        -DEVENT__DISABLE_SAMPLES=ON
-        -DEVENT__DISABLE_TESTS=ON
-        -DEVENT__LIBRARY_TYPE=${LIBEVENT_LIBRARY_TYPE}
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      libevent_project
-    )
-  endif()
-endif()

cmake/libraries/nuspell.cmake

@@ -1,32 +0,0 @@
-if(PROJECT_ENABLE_NUSPELL)
-  if(PROJECT_BUILD)
-    find_package(Nuspell ${NUSPELL_VERSION} REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_NUSPELL)
-
-    include_directories(BEFORE SYSTEM
-      ${NUSPELL_INCLUDE_DIRS}
-    )
-
-    link_libraries(
-      Nuspell::nuspell
-    ) 
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(nuspell_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/nuspell-v${NUSPELL_VERSION}.tar.gz
-      URL_HASH SHA256=bdf344c5adbcc6797940f8f8cb75cb59f5a3794eb21b9547751a11782a792ef7
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-        -DBUILD_TESTING=OFF
-        -DBUILD_TOOLS=OFF
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      nuspell_project
-    )
-  endif()
-endif()

cmake/libraries/ogg.cmake

@@ -1,30 +0,0 @@
-if(PROJECT_ENABLE_OGG)
-  if(PROJECT_BUILD)
-    find_package(Ogg ${OGG_VERSION} REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_OGG)
-
-    include_directories(BEFORE SYSTEM
-      ${OGG_INCLUDE_DIRS}
-    )
-
-    link_libraries(
-      Ogg::ogg
-    )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(ogg_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/ogg-v${OGG_VERSION}.tar.gz
-      URL_HASH SHA256=f6f1b04cfa4e98b70ffe775d5e302d9c6b98541f05159af6de2d6617817ed7d6
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      ogg_project
-    )
-  endif()
-endif()

cmake/libraries/openal.cmake

@@ -1,30 +0,0 @@
-if(PROJECT_ENABLE_OPENAL)
-  if(PROJECT_BUILD)
-    find_package(OpenAL ${OPENAL_VERSION} REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_OPENAL)
-
-    include_directories(BEFORE SYSTEM
-      ${OPENAL_INCLUDE_DIR}
-    )
-
-    link_libraries(
-      ${OPENAL_LIBRARY}
-    )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(openal_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/openal-${OPENAL_VERSION}.tar.gz
-      URL_HASH SHA256=dfddf3a1f61059853c625b7bb03de8433b455f2f79f89548cbcbd5edca3d4a4a
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      openal_project
-    )
-  endif()
-endif()

cmake/libraries/openssl.cmake

@@ -1,3 +1,6 @@
+set(OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR})
+set(OPENSSL_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
+
 if(PROJECT_ENABLE_OPENSSL)
   if(PROJECT_BUILD)
     find_package(OpenSSL ${OPENSSL_VERSION} REQUIRED)

cmake/libraries/rocksdb.cmake

@@ -1,41 +0,0 @@
-if(PROJECT_ENABLE_ROCKSDB)
-  if(PROJECT_BUILD)
-    find_library(ROCKSDB_LIBRARY NAMES librocksdb.a REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_ROCKSDB)
-
-    link_libraries(
-      ${ROCKSDB_LIBRARY}
-    )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(rocksdb_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/rocksdb-${ROCKSDB_VERSION}.tar.gz
-      URL_HASH SHA256=1f829976aa24b8ba432e156f52c9e0f0bd89c46dc0cc5a9a628ea70571c1551c
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-        -DFAIL_ON_WARNINGS=OFF
-        -DPORTABLE=1
-        -DROCKSDB_BUILD_SHARED=${PROJECT_BUILD_SHARED_LIBS}
-        -DROCKSDB_INSTALL_ON_WINDOWS=ON
-        -DWITH_BENCHMARK=OFF
-        -DWITH_BENCHMARK_TOOLS=OFF
-        -DWITH_CORE_TOOLS=OFF
-        -DWITH_EXAMPLES=OFF
-        -DWITH_GFLAGS=OFF
-        -DWITH_IOSTATS_CONTEXT=OFF
-        -DWITH_PERF_CONTEXT=OFF
-        -DWITH_TESTS=OFF
-        -DWITH_TOOLS=OFF
-        -DWITH_TRACE_TOOLS=OFF
-        -DWITH_ZLIB=ON
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      rocksdb_project
-    )
-  endif()
-endif()

cmake/libraries/secp256k1.cmake

@@ -1,41 +0,0 @@
-if(PROJECT_ENABLE_SECP256K1)
-  if(PROJECT_BUILD)
-    pkg_check_modules(SECP256K1 libsecp256k1=${SECP256K1_VERSION} REQUIRED)
-    add_definitions(-DPROJECT_ENABLE_SECP256K1)
-
-    include_directories(BEFORE SYSTEM
-      ${SECP256K1_INCLUDE_DIRS}
-    )
-
-    link_libraries(
-      ${SECP256K1_LINK_LIBRARIES}
-    )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    if(PROJECT_BUILD_SHARED_LIBS)
-      set(SECP256K1_ENABLE_SHARED yes)
-    else()
-      set(SECP256K1_ENABLE_SHARED no)
-    endif()
-
-    ExternalProject_Add(secp256k1_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/secp256k1-${SECP256K1_VERSION}.tar.gz
-      URL_HASH SHA256=61583939f1f25b92e6401e5b819e399da02562de663873df3056993b40148701
-      BUILD_IN_SOURCE 1
-      LIST_SEPARATOR |
-      CONFIGURE_COMMAND ./autogen.sh && ./configure
-        --enable-shared=${SECP256K1_ENABLE_SHARED}
-        --enable-static=yes
-        --enable-module-ecdh
-        --enable-module-recovery
-        --prefix=${PROJECT_EXTERNAL_BUILD_ROOT}
-      BUILD_COMMAND make -j1
-      INSTALL_COMMAND make install
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      secp256k1_project
-    )
-  endif()
-endif()

cmake/libraries/sfml.cmake

@@ -1,66 +0,0 @@
-if(PROJECT_ENABLE_SFML)
-  if(PROJECT_BUILD)
-    find_package(OpenGL REQUIRED)
-    find_package(X11 REQUIRED)
-
-    find_package(SFML ${SFML_VERSION}
-      COMPONENTS 
-        audio
-        graphics
-        network
-        system
-        window
-      REQUIRED
-    )
-
-    add_definitions(-DPROJECT_ENABLE_SFML)
-
-    if(PROJECT_BUILD_SHARED_LIBS)
-      link_libraries(
-        ${X11_LIBRARIES}
-        sfml-audio
-        sfml-graphics
-        sfml-network
-        sfml-system
-        sfml-window
-      )
-    else()
-      link_libraries(
-        ${X11_LIBRARIES}
-        sfml-audio-s
-        sfml-graphics-s
-        sfml-network-s
-        sfml-system-s
-        sfml-window-s
-      )
-    endif()
-
-    include_directories(BEFORE SYSTEM
-      ${X11_INCLUDE_DIR}
-      ${SFML_INCLUDE_DIR}
-    )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(sfml_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/SFML-${SFML_VERSION}.tar.gz
-      URL_HASH SHA256=82535db9e57105d4f3a8aedabd138631defaedc593cab589c924b7d7a11ffb9d
-      PATCH_COMMAND ${PROJECT_3RD_PARTY_DIR}/SFML_patch.sh
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      sfml_project
-    )
-
-    add_dependencies(sfml_project 
-      flac_project
-      fontconfig_project
-      freetype2_project
-      openal_project
-    )
-  endif()
-endif()

cmake/libraries/spdlog.cmake

@@ -1,33 +0,0 @@
-if(PROJECT_ENABLE_SPDLOG)
-  if(PROJECT_BUILD)
-    find_package(spdlog ${SPDLOG_VERSION} REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_SPDLOG)
-
-    include_directories(BEFORE SYSTEM
-      ${SPDLOG_INCLUDE_DIRS}
-    )
-
-    link_libraries(
-      spdlog::spdlog
-    ) 
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(spdlog_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/spdlog-${SPDLOG_VERSION}.tar.gz
-      URL_HASH SHA256=1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-        -DSPDLOG_BUILD_EXAMPLE=OFF
-        -DSPDLOG_FMT_EXTERNAL=OFF
-        -DSPDLOG_FMT_EXTERNAL_HO=OFF
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      spdlog_project
-    )
-  endif()
-endif()

cmake/libraries/testing.cmake

@@ -1,4 +1,6 @@
 if(NOT PROJECT_BUILD AND PROJECT_ENABLE_TESTING)
+  add_definitions(-DPROJECT_ENABLE_TESTING)
+
   if(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
     ExternalProject_Add(gtest_project
       PREFIX external

cmake/libraries/tpl.cmake

@@ -1,27 +0,0 @@
-if(PROJECT_ENABLE_TPL)
-  if(PROJECT_BUILD)
-    find_package(tiny-process-library REQUIRED)
-    add_definitions(-DPROJECT_ENABLE_TPL)
-
-    link_libraries(
-      tiny-process-library::tiny-process-library
-    )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(tpl_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/tiny-process-library.tar.gz
-      URL_HASH SHA256=82e46657e697aff5bf980387c86ef3aa05bb184622abbd75663a4df549c68f73
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-        -DBUILD_TESTING=OFF
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      tpl_project
-    )
-  endif()
-endif()
-

cmake/libraries/vorbis.cmake

@@ -1,33 +0,0 @@
-if(PROJECT_ENABLE_VORBIS)
-  if(PROJECT_BUILD)
-    find_package(Vorbis ${VORBIS_VERSION} REQUIRED)
-
-    add_definitions(-DPROJECT_ENABLE_VORBIS)
-
-    include_directories(BEFORE SYSTEM
-      ${VORBIS_INCLUDE_DIRS}
-    )
-
-    link_libraries(
-      Vorbis::vorbis
-    )
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(vorbis_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/vorbis-v${VORBIS_VERSION}.tar.gz
-      URL_HASH SHA256=270c76933d0934e42c5ee0a54a36280e2d87af1de3cc3e584806357e237afd13
-      PATCH_COMMAND ${PROJECT_3RD_PARTY_DIR}/vorbis_patch.sh ${PROJECT_3RD_PARTY_DIR} ${CMAKE_BINARY_DIR}/external/src/vorbis_project
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      vorbis_project
-    )
-
-    add_dependencies(vorbis_project ogg_project)
-  endif()
-endif()

cmake/libraries/wxwidgets.cmake

@@ -1,47 +0,0 @@
-if(PROJECT_ENABLE_WXWIDGETS)
-  if(PROJECT_BUILD)
-    find_package(OpenGL REQUIRED)
-    find_package(wxWidgets ${WXWIDGETS_VERSION} REQUIRED 
-      COMPONENTS 
-        net 
-        core 
-        base 
-        gl
-        adv 
-        xml 
-        aui 
-        html 
-        media 
-        propgrid 
-        qa 
-        ribbon 
-        richtext
-        stc
-        webview
-        xrc
-      )
-    if(wxWidgets_USE_FILE)
-      include(${wxWidgets_USE_FILE})
-    endif()
-    link_libraries(${wxWidgets_LIBRARIES})
-  elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
-    ExternalProject_Add(wxwidgets_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/wxWidgets-${WXWIDGETS_VERSION}.tar.bz2
-      URL_HASH SHA256=0ad86a3ad3e2e519b6a705248fc9226e3a09bbf069c6c692a02acf7c2d1c6b51
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-        -DwxBUILD_MONOLITHIC=OFF
-        -DwxBUILD_SHARED=${PROJECT_BUILD_SHARED_LIBS}
-    )
-
-    set(PROJECT_DEPENDENCIES 
-      ${PROJECT_DEPENDENCIES}
-      wxwidgets_project
-    )
-
-    add_dependencies(wxwidgets_project curl_project)
-  endif()
-endif()

cmake/options.cmake

@@ -1,52 +1,19 @@
 option(PROJECT_ENABLE_BOOST "Enable boost libraries" OFF)
-option(PROJECT_ENABLE_CLI11 "Enable CLI11 library" OFF)
 option(PROJECT_ENABLE_CPP_HTTPLIB "Enable cpp-httplib" OFF)
 option(PROJECT_ENABLE_CURL "Enable curl library" OFF)
-option(PROJECT_ENABLE_DTL "Enable DTL" OFF)
-option(PROJECT_ENABLE_FLAC "Enable FLAC library" OFF)
-option(PROJECT_ENABLE_FMT "Enable fmt library" OFF)
-option(PROJECT_ENABLE_FONTCONFIG "Enable fontconfig library" OFF)
-option(PROJECT_ENABLE_FREETYPE2 "Enable freetype2 library" OFF)
 option(PROJECT_ENABLE_FUSE "Enable FUSE" OFF)
-option(PROJECT_ENABLE_FZF "Enable fzf" OFF)
-option(PROJECT_ENABLE_GTKMM "Enable gtkmm" OFF)
 option(PROJECT_ENABLE_JSON "Enable JSON for Modern C++ library" OFF)
-option(PROJECT_ENABLE_LIBBITCOIN_SYSTEM "Enable libbitcoin-system library" OFF)
-option(PROJECT_ENABLE_LIBEVENT "Enable libevent library" OFF)
 option(PROJECT_ENABLE_LIBSODIUM "Enable libsodium library" OFF)
-option(PROJECT_ENABLE_NUSPELL "Enable nuspell" OFF)
-option(PROJECT_ENABLE_OGG "Enable OGG library" OFF)
-option(PROJECT_ENABLE_OPENAL "Enable OpenAL" OFF)
 option(PROJECT_ENABLE_OPENSSL "Enable OpenSSL library" OFF)
 option(PROJECT_ENABLE_PUGIXML "Enable PugiXML library" OFF)
-option(PROJECT_ENABLE_ROCKSDB "Enable RocksDB library" OFF)
-option(PROJECT_ENABLE_SAGO_PLATFORM_FOLDERS "Enable Sago platform folders" OFF)
-option(PROJECT_ENABLE_SECP256K1 "Enable secp256k1 library" OFF)
-option(PROJECT_ENABLE_SFML "Enable SFML" OFF)
-option(PROJECT_ENABLE_SPDLOG "Enable spdlog library" OFF) 
 option(PROJECT_ENABLE_SQLITE "Enable SQLite" OFF)
 option(PROJECT_ENABLE_STDUUID "Enable stduuid library" OFF)
 option(PROJECT_ENABLE_TESTING "Enable building unit tests" OFF)
-option(PROJECT_ENABLE_TPL "Enable tiny process library" OFF)
-option(PROJECT_ENABLE_VORBIS "Enable Vorbis library" OFF)
 option(PROJECT_ENABLE_WINFSP "Enable WinFSP" OFF)
-option(PROJECT_ENABLE_WXWIDGETS "Enable wxWidgets library" OFF)
 
 option(PROJECT_REQUIRE_ALPINE "Require Alpine Linux as build system" OFF)
 option(PROJECT_STATIC_LINK "Static link executables" OFF)
 
-if(PROJECT_ENABLE_FZF)
-  add_definitions(-DPROJECT_ENABLE_FZF)
-endif()
-
-if(PROJECT_ENABLE_SAGO_PLATFORM_FOLDERS)
-  add_definitions(-DPROJECT_ENABLE_SAGO_PLATFORM_FOLDERS)
-endif()
-
-if(PROJECT_ENABLE_TESTING)
-  add_definitions(-DPROJECT_ENABLE_TESTING)
-endif()
-
 if(PROJECT_STATIC_LINK)
   add_definitions(-DPROJECT_STATIC_LINK)
 endif()

config.sh

@@ -5,7 +5,7 @@ PROJECT_NAME="repertory"
 PROJECT_URL="https://git.fifthgrid.com/blockstorage/repertory"
 
 PROJECT_COMPANY_NAME="https://git.fifthgrid.com/blockstorage"
-PROJECT_COPYRIGHT="Copyright \<2018-2024\> \<MIT License\> \<${PROJECT_URL}\>"
+PROJECT_COPYRIGHT="Copyright <2018-2024> <MIT License> <${PROJECT_URL}>"
 PROJECT_DESC="Mount utility for Sia and S3"
 
 PROJECT_MAJOR_VERSION=2

repertory/repertory_test/src/file_manager_test.cpp

@@ -42,13 +42,11 @@ namespace repertory {
 static std::string file_manager_dir =
     utils::path::combine(get_test_dir(), {"file_manager_test"});
 
-#if defined(PROJECT_ENABLE_TESTING)
 auto file_manager::open(std::shared_ptr<i_closeable_open_file> of,
                         const open_file_data &ofd, std::uint64_t &handle,
                         std::shared_ptr<i_open_file> &f) -> api_error {
   return open(of->get_api_path(), of->is_directory(), ofd, handle, f, of);
 }
-#endif
 
 TEST(file_manager, can_start_and_stop) {
   {

repertory/repertory_test/src/providers_test.cpp

@@ -346,7 +346,7 @@ static void get_api_path_from_source(const app_config &cfg,
                                      i_provider &provider) {
   if (provider.get_provider_type() == provider_type::encrypt) {
     const auto source_path =
-        utils::path::combine(cfg.get_encrypt_config().path, {"test.txt"});
+        utils::path::combine("./test_date/encrypt", {"test.txt"});
 
     std::string api_path{};
     EXPECT_EQ(api_error::success,
@@ -397,7 +397,7 @@ static void get_directory_item_count(const app_config &cfg,
     EXPECT_EQ(std::size_t(0U), provider.get_directory_item_count("/not_found"));
 
     const auto source_path =
-        utils::path::combine(cfg.get_encrypt_config().path, {"sub10"});
+        utils::path::combine("./test_data/encrypt", {"sub10"});
 
     std::string api_path{};
     EXPECT_EQ(api_error::success,
@@ -636,7 +636,8 @@ TEST(providers, encrypt_provider) {
   {
     app_config cfg(provider_type::encrypt, config_path);
 
-    const auto encrypt_path = utils::path::combine(".", {"encrypt"});
+    const auto encrypt_path =
+        utils::path::combine("./test_data/encrypt", {"encrypt"});
 
     EXPECT_STREQ(
         encrypt_path.c_str(),

repertory/version.rc.in

@@ -1,64 +1,64 @@
-#include <windows.h>
+#include <windows.h>
-#define VER_FILEVERSION             @PROJECT_MAJOR_VERSION@,@PROJECT_MINOR_VERSION@,@PROJECT_REVISION_VERSION@,@PROJECT_RELEASE_NUM@
+#define VER_FILEVERSION             @PROJECT_MAJOR_VERSION@,@PROJECT_MINOR_VERSION@,@PROJECT_REVISION_VERSION@,@PROJECT_RELEASE_NUM@
-#define VER_FILEVERSION_STR         "@PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
+#define VER_FILEVERSION_STR         "@PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
-
+
-#define VER_PRODUCTVERSION          @PROJECT_MAJOR_VERSION@,@PROJECT_MINOR_VERSION@,@PROJECT_REVISION_VERSION@,@PROJECT_RELEASE_NUM@
+#define VER_PRODUCTVERSION          @PROJECT_MAJOR_VERSION@,@PROJECT_MINOR_VERSION@,@PROJECT_REVISION_VERSION@,@PROJECT_RELEASE_NUM@
-#define VER_PRODUCTVERSION_STR      "@PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
+#define VER_PRODUCTVERSION_STR      "@PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
-
+
-#define VER_COMPANYNAME_STR         "@PROJECT_COMPANY_NAME@\0"
+#define VER_COMPANYNAME_STR         "@PROJECT_COMPANY_NAME@\0"
-#define VER_INTERNALNAME_STR        "@PROJECT_NAME@ @PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
+#define VER_INTERNALNAME_STR        "@PROJECT_NAME@ @PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
-#define VER_LEGALCOPYRIGHT_STR      "@PROJECT_COPYRIGHT@\0"
+#define VER_LEGALCOPYRIGHT_STR      "@PROJECT_COPYRIGHT@\0"
-#define VER_ORIGINALFILENAME_STR    "@PROJECT_NAME@.exe\0"
+#define VER_ORIGINALFILENAME_STR    "@PROJECT_NAME@.exe\0"
-#define VER_LEGALTRADEMARKS1_STR    "\0"
+#define VER_LEGALTRADEMARKS1_STR    "\0"
-#define VER_LEGALTRADEMARKS2_STR    "\0"  
+#define VER_LEGALTRADEMARKS2_STR    "\0"  
-#define VER_FILEDESCRIPTION_STR     "@PROJECT_DESC@\0"  
+#define VER_FILEDESCRIPTION_STR     "@PROJECT_DESC@\0"  
-#define VER_PRODUCTNAME_STR         "@PROJECT_NAME@ @PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
+#define VER_PRODUCTNAME_STR         "@PROJECT_NAME@ @PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_REVISION_VERSION@-@PROJECT_RELEASE_ITER@-@PROJECT_GIT_REV@\0"
-
+
-#ifdef DEBUG                                    
+#ifdef DEBUG                                    
-#define VER_DEBUG                   VS_FF_DEBUG
+#define VER_DEBUG                   VS_FF_DEBUG
-#else                               
+#else                               
-#define VER_DEBUG                   0
+#define VER_DEBUG                   0
-#endif
+#endif
-
+
-#define VER_PRERELEASE              @PROJECT_PRERELEASE@       
+#define VER_PRERELEASE              @PROJECT_PRERELEASE@       
-
+
-
+
-VS_VERSION_INFO VERSIONINFO
+VS_VERSION_INFO VERSIONINFO
-FILEVERSION     VER_FILEVERSION
+FILEVERSION     VER_FILEVERSION
-PRODUCTVERSION  VER_PRODUCTVERSION
+PRODUCTVERSION  VER_PRODUCTVERSION
-FILEFLAGSMASK   (VS_FF_DEBUG|VS_FF_PRERELEASE)
+FILEFLAGSMASK   (VS_FF_DEBUG|VS_FF_PRERELEASE)
-FILEFLAGS       (VER_DEBUG|VER_PRERELEASE)
+FILEFLAGS       (VER_DEBUG|VER_PRERELEASE)
-FILEOS          VOS__WINDOWS32
+FILEOS          VOS__WINDOWS32
-FILETYPE        VFT_DLL
+FILETYPE        VFT_DLL
-FILESUBTYPE     VFT2_UNKNOWN
+FILESUBTYPE     VFT2_UNKNOWN
-BEGIN
+BEGIN
-    BLOCK "StringFileInfo"
+    BLOCK "StringFileInfo"
-    BEGIN
+    BEGIN
-        BLOCK "040904E4"
+        BLOCK "040904E4"
-        BEGIN
+        BEGIN
-            VALUE "CompanyName",      VER_COMPANYNAME_STR
+            VALUE "CompanyName",      VER_COMPANYNAME_STR
-            VALUE "FileDescription",  VER_FILEDESCRIPTION_STR
+            VALUE "FileDescription",  VER_FILEDESCRIPTION_STR
-            VALUE "FileVersion",      VER_FILEVERSION_STR
+            VALUE "FileVersion",      VER_FILEVERSION_STR
-            VALUE "InternalName",     VER_INTERNALNAME_STR
+            VALUE "InternalName",     VER_INTERNALNAME_STR
-            VALUE "LegalCopyright",   VER_LEGALCOPYRIGHT_STR
+            VALUE "LegalCopyright",   VER_LEGALCOPYRIGHT_STR
-            VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR
+            VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR
-            VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR
+            VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR
-            VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
+            VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
-            VALUE "ProductName",      VER_PRODUCTNAME_STR
+            VALUE "ProductName",      VER_PRODUCTNAME_STR
-            VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
+            VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
-        END
+        END
-    END
+    END
-
+
-    BLOCK "VarFileInfo"
+    BLOCK "VarFileInfo"
-    BEGIN
+    BEGIN
-        /* The following line should only be modified for localized versions.     */
+        /* The following line should only be modified for localized versions.     */
-        /* It consists of any number of WORD,WORD pairs, with each pair           */
+        /* It consists of any number of WORD,WORD pairs, with each pair           */
-        /* describing a language,codepage combination supported by the file.      */
+        /* describing a language,codepage combination supported by the file.      */
-        /*                                                                        */
+        /*                                                                        */
-        /* For example, a file might have values "0x409,1252" indicating that it  */
+        /* For example, a file might have values "0x409,1252" indicating that it  */
-        /* supports English language (0x409) in the Windows ANSI codepage (1252). */
+        /* supports English language (0x409) in the Windows ANSI codepage (1252). */
-
+
-        VALUE "Translation", 0x409, 1252
+        VALUE "Translation", 0x409, 1252
-
+
-    END
+    END
-END
+END

scripts/deliver.cmd

@@ -0,0 +1,13 @@
+@echo off
+
+setlocal
+
+set DEST=%~1
+set DIST=%~2
+set ARG1=%~3
+set ARG2=%~4
+set ARG3=%~5
+
+pushd "%~dp0%"
+  call mingw64 -no-start ./deliver.sh "%DEST%" "%DIST%" "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
+popd

scripts/deliver.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+DEST_DIR=$1
+DIST_DIR=$2
+
+CURRENT_DIR=$(dirname "$0")
+CURRENT_DIR=$(realpath ${CURRENT_DIR})
+
+SOURCE_DIR=${CURRENT_DIR}/..
+SOURCE_DIR=$(realpath ${SOURCE_DIR})
+
+. "${CURRENT_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"
+
+function error_exit() {
+  echo $1
+  exit $2
+}
+
+if [ ! -d "${PROJECT_DIST_DIR}" ]; then
+  error_exit "dist directory not found: ${PROJECT_DIST_DIR}" 2
+fi
+
+if [ "${DIST_DIR}" == "" ]; then
+  DIST_DIR="${CURRENT_DIR}/../dist"
+fi
+DIST_DIR=$(realpath "${DIST_DIR}")
+
+if [ ! -d "${DIST_DIR}" ]; then
+  error_exit "dist directory not found: ${DIST_DIR}" 2
+fi
+
+if [ "${DEST_DIR}" == "" ]; then
+  error_exit "dest directory not set" 2
+fi
+
+if [ ! -d "${DEST_DIR}" ]; then
+  error_exit "dest directory not found: ${DEST_DIR}" 2
+fi
+
+pushd "${SOURCE_DIR}"
+BRANCH=$(git branch --show-current)
+RELEASE=$(grep set\(PROJECT_RELEASE_ITER ./config.sh | sed s/\)//g | awk '{print $2}')
+popd
+
+if [ "${BRANCH}" == "master" ] || [ "${BRANCH}" == "alpha" ] || [ "${BRANCH}" == "beta" ] || [ "${BRANCH}" == "rc" ]; then
+  DEST_DIR=${DEST_DIR}/${RELEASE}
+else
+  DEST_DIR=${DEST_DIR}/nightly
+fi
+
+FILE_PART=${PROJECT_NAME}_${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_REVISION_VERSION}-${PROJECT_RELEASE_ITER}-${PROJECT_GIT_REV}_${PROJECT_BUILD_ARCH}_${PROJECT_OS}
+echo ${DEST_DIR}
+
+pushd "${DIST_DIR}"
+cp -f ./${FILE_PART}.tar.gz ${DEST_DIR} || error_exit "failed to deliver file: ${FILE_PART}.tar.gz" 1
+cp -f ./${FILE_PART}.tar.gz.sha256 ${DEST_DIR} || error_exit "failed to deliver file: ${FILE_PART}.tar.gz.sha256" 1
+if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then
+  cp -f ./${FILE_PART}.tar.gz.sig ${DEST_DIR} || error_exit "failed to deliver file: ${FILE_PART}.tar.gz.sig" 1
+fi
+popd
+
+error_exit "delivered ${FILE_PART}" 0

scripts/make_package.sh

@@ -2,46 +2,46 @@
 
 TEMP_DIR=$(mktemp -d)
 
-DEST_DIR=$1
+DIST_DIR=$1
 CURRENT_DIR=$(dirname "$0")
 CURRENT_DIR=$(realpath ${CURRENT_DIR})
 
 . "${CURRENT_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6"
 
-function exit_and_clean() {
+function error_exit() {
   echo $1
   rm -rf ${TEMP_DIR}
   exit $2
 }
 
 if [ ! -d "${PROJECT_DIST_DIR}" ]; then
-  echo "Dist directory not found: ${PROJECT_DIST_DIR}"
+  error_exit "dist directory not found: ${PROJECT_DIST_DIR}" 2
-  exit 1
 fi
 
-if [ "${DEST_DIR}" == "" ]; then
+if [ "${DIST_DIR}" == "" ]; then
-  DEST_DIR="${CURRENT_DIR}/../dist"
+  DIST_DIR="${CURRENT_DIR}/../dist"
 fi
-DEST_DIR=$(realpath "${DEST_DIR}")
+DIST_DIR=$(realpath "${DIST_DIR}")
 
-if [ ! -d "${DEST_DIR}" ]; then
+if [ ! -d "${DIST_DIR}" ]; then
-  echo "Destination directory not found: ${DEST_DIR}"
+  error_exit "dest directory not found: ${DIST_DIR}" 1
-  exit 1
 fi
 
 PACKAGE_ROOT="${PROJECT_DIST_DIR}/.."
 PACKAGE_ROOT=$(realpath "${PACKAGE_ROOT}")
 
-rsync -av --progress ${PROJECT_DIST_DIR}/ ${TEMP_DIR}/${PROJECT_NAME}/ || exit_and_clean "Failed to rsync" 1
+rsync -av --progress ${PROJECT_DIST_DIR}/ ${TEMP_DIR}/${PROJECT_NAME}/ || error_exit "failed to rsync" 1
 
-pushd "${DEST_DIR}"
+FILE_PART=${PROJECT_NAME}_${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_REVISION_VERSION}-${PROJECT_RELEASE_ITER}-${PROJECT_GIT_REV}_${PROJECT_BUILD_ARCH}_${PROJECT_OS}
-OUT_FILE=${PROJECT_NAME}_${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_REVISION_VERSION}-${PROJECT_RELEASE_ITER}-${PROJECT_GIT_REV}_${PROJECT_BUILD_ARCH}_${PROJECT_OS}.tar.gz
+
-tar cvzf "${OUT_FILE}" -C ${TEMP_DIR} . || exit_and_clean "Failed to create archive" 1
+pushd "${DIST_DIR}"
-sha256sum "${OUT_FILE}" >"${OUT_FILE}.sha256" || exit_and_clean "Failed to create sha256 file" 1
+OUT_FILE=${FILE_PART}.tar.gz
+tar cvzf "${OUT_FILE}" -C ${TEMP_DIR} . || error_exit "failed to create archive" 1
+sha256sum "${OUT_FILE}" >"${OUT_FILE}.sha256" || error_exit "failed to create sha256 file" 1
 if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then
-  openssl dgst -sha256 -sign "${PROJECT_PRIVATE_KEY}" -out "${OUT_FILE}.sig" "${OUT_FILE}" || exit_and_clean "Failed to create signature file" 1
+  openssl dgst -sha256 -sign "${PROJECT_PRIVATE_KEY}" -out "${OUT_FILE}.sig" "${OUT_FILE}" || error_exit "failed to create signature file" 1
-  openssl dgst -sha256 -verify "${PROJECT_PUBLIC_KEY}" -signature "${OUT_FILE}.sig" "${OUT_FILE}" || exit_and_clean "Failed to validate signature file" 1
+  openssl dgst -sha256 -verify "${PROJECT_PUBLIC_KEY}" -signature "${OUT_FILE}.sig" "${OUT_FILE}" || error_exit "failed to validate signature file" 1
 fi
 popd
 
-exit_and_clean "Created package successfully" 0
+error_exit "created package ${FILE_PART}" 0

scripts/options.sh

@@ -2,70 +2,26 @@
 
 PROJECT_LIBRARIES=(
   BOOST
-  CLI11
-  CPP_HTTPLIB
   CURL
-  DTL
-  FLAC
-  FMT
-  FONTCONFIG
-  FREETYPE2
   FUSE
-  FZF
-  GTKMM
   JSON
-  LIBBITCOIN_SYSTEM
-  LIBEVENT
   LIBSODIUM
-  NUSPELL
-  OGG
-  OPENAL
   OPENSSL
   PUGIXML
-  ROCKSDB
-  SAGO_PLATFORM_FOLDERS
-  SECP256K1
-  SFML
-  SPDLOG
   SQLITE
   STDUUID
   TESTING
-  TPL
-  VORBIS
   WINFSP
-  WXWIDGETS
 )
 
 declare -A PROJECT_CLEANUP
 PROJECT_CLEANUP[BOOST]="boost_*"
-PROJECT_CLEANUP[CLI11]="CLI11-*"
-PROJECT_CLEANUP[CPP_HTTPLIB]="cpp-httplib-*"
 PROJECT_CLEANUP[CURL]="curl-*"
-PROJECT_CLEANUP[DTL]="dtl-*"
-PROJECT_CLEANUP[FLAC]="flac-*"
-PROJECT_CLEANUP[FMT]="fmt-*"
-PROJECT_CLEANUP[FONTCONFIG]="fontconfig-*"
-PROJECT_CLEANUP[FREETYPE2]="freetype-*"
-PROJECT_CLEANUP[FZF]="include/fzf.h:src/fzf.c"
 PROJECT_CLEANUP[JSON]="json-*"
-PROJECT_CLEANUP[LIBBITCOIN_SYSTEM]="boost_1_76_*:libbitcoin-system-*"
-PROJECT_CLEANUP[LIBBITCOIN_SYSTEM_ON]="boost_1_85_*"
-PROJECT_CLEANUP[LIBEVENT]="libevent-*"
 PROJECT_CLEANUP[LIBSODIUM]="libsodium*"
-PROJECT_CLEANUP[NUSPELL]="nuspell-*"
-PROJECT_CLEANUP[OGG]="ogg-*"
-PROJECT_CLEANUP[OPENAL]="openal-*"
 PROJECT_CLEANUP[OPENSSL]="openssl-*"
 PROJECT_CLEANUP[PUGIXML]="pugixml-*"
-PROJECT_CLEANUP[ROCKSDB]="rocksdb-*"
-PROJECT_CLEANUP[SAGO_PLATFORM_FOLDERS]="include/platform_folders.hpp:src/platform_folders.cpp"
-PROJECT_CLEANUP[SECP256K1]="secp256k1-*"
-PROJECT_CLEANUP[SFML]="SFML*:include/RoundedRectangleShape.hpp:include/Text2.hpp:src/RoundedRectangleShape.cpp:src/Text2.cpp"
-PROJECT_CLEANUP[SPDLOG]="spdlog-*"
 PROJECT_CLEANUP[SQLITE]="sqlite-*"
 PROJECT_CLEANUP[STDUUID]="stduuid-*"
 PROJECT_CLEANUP[TESTING]="googletest-*"
-PROJECT_CLEANUP[TPL]="tiny-process-library*"
-PROJECT_CLEANUP[VORBIS]="vorbis*"
 PROJECT_CLEANUP[WINFSP]="winfsp-*"
-PROJECT_CLEANUP[WXWIDGETS]="wxWidgets-*"