updated mingw64 build

.jenkins_linux_builds

@@ -68,6 +68,7 @@ pipeline {
       agent {
         dockerfile {
           filename 'mingw64'
+          args '--build-arg NUM_JOBS=8'
           dir 'docker/64_bit'
         }
       }

CMakeLists.txt

@@ -74,9 +74,9 @@ if (LINUX OR MINGW)
     endif()
   endif()
 
-  if (REPERTORY_MUSL OR MINGW)
+  if (REPERTORY_MUSL)
     find_library(LIBPTHREAD_LIBRARY NO_CACHE NAMES libpthread.a)
-  else()
+  elseif(NOT MINGW)
     find_library(LIBPTHREAD_LIBRARY NO_CACHE NAMES pthread)
   endif()
 
@@ -91,7 +91,7 @@ if (LINUX OR MINGW)
     set(REPERTORY_DEFINITIONS ${REPERTORY_DEFINITIONS} -DFUSE_USE_VERSION=29)
   endif()
 
-  if (NOT LIBPTHREAD_LIBRARY) 
+  if (NOT MINGW AND NOT LIBPTHREAD_LIBRARY) 
     message(FATAL_ERROR "'libpthread' not found")
   endif()
 

cmake/boost.cmake

@@ -1,97 +1,95 @@
-set(BOOST_VERSION ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_REVISION})
-set(BOOST_VERSION2 ${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_REVISION})
-
-set(BOOST_PROJECT_NAME boost_${BOOST_VERSION})
-set(BOOST_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${BOOST_PROJECT_NAME})
-
-set(BOOST_ADDRESS_MODEL 64)
-
-set(BOOST_DOWNLOAD_URL https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION2}.tar.gz)
-
-if (IS_CLANG_COMPILER)
-  set(BOOST_TOOLSET --with-toolset=clang)
-else ()
-  set(BOOST_OPENSSL_DIR "--openssldir=${EXTERNAL_BUILD_ROOT}")
-endif()
-
-if (IS_ARM64)
-  set (BOOST_ARCH arm)
-else()
-  set (BOOST_ARCH x86)
-endif()
-
-set (BOOST_COMMON_ARGS 
-    ${BOOST_OPENSSL_DIR}
-    --prefix=${EXTERNAL_BUILD_ROOT}
-    address-model=${BOOST_ADDRESS_MODEL}
-    architecture=${BOOST_ARCH}
-    cxxflags=-std=c++${CMAKE_CXX_STANDARD}
-    cxxstd=${CMAKE_CXX_STANDARD}
-    define=BOOST_ASIO_HAS_STD_STRING_VIEW
-    define=BOOST_SYSTEM_NO_DEPRECATED
-    link=static
-    linkflags=-std=c++${CMAKE_CXX_STANDARD}
-    threading=multi
-    variant=${CMAKE_BUILD_TYPE_LOWER}
-    -sZLIB_BINARY=zlibstatic${DEBUG_EXTRA}
-    -sZLIB_LIBPATH="${EXTERNAL_BUILD_ROOT}/lib"
-    -sZLIB_INCLUDE="${EXTERNAL_BUILD_ROOT}/include"
-)
-
 if (MINGW)
-  if (NOT CMAKE_HOST_WIN32)
+  include_directories(SYSTEM /mingw/include/boost-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION})
-    set(BOOST_COMMON_ARGS 
+  set(Boost_LIBRARIES
-      ${BOOST_COMMON_ARGS}
+    /mingw64/lib/libboost_system.a
-      --user-config=./user-config.jam
+    /mingw64/lib/libboost_atomic.a
-    )
+    /mingw64/lib/libboost_chrono.a
+    /mingw64/lib/libboost_date_time.a
+    /mingw64/lib/libboost_filesystem.a
+    /mingw64/lib/libboost_random.a
+    /mingw64/lib/libboost_regex.a
+    /mingw64/lib/libboost_serialization.a
+    /mingw64/lib/libboost_thread.a
+  )
+else()
+  set(BOOST_VERSION ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION})
+  set(BOOST_VERSION2 ${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_PATCH_VERSION})
+
+  set(BOOST_PROJECT_NAME boost_${BOOST_VERSION})
+  set(BOOST_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${BOOST_PROJECT_NAME})
+
+  set(BOOST_ADDRESS_MODEL 64)
+
+  set(BOOST_DOWNLOAD_URL https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION2}.tar.gz)
+
+  if (IS_CLANG_COMPILER)
+    set(BOOST_TOOLSET --with-toolset=clang)
+  else ()
+    set(BOOST_OPENSSL_DIR "--openssldir=${EXTERNAL_BUILD_ROOT}")
   endif()
-  set(BOOST_TARGET_OS target-os=windows)
+
-endif()
+  if (IS_ARM64)
-
+    set (BOOST_ARCH arm)
-ExternalProject_Add(boost_project
+  else()
-  DOWNLOAD_NO_PROGRESS 1
+    set (BOOST_ARCH x86)
-  URL ${BOOST_DOWNLOAD_URL}
+  endif()
-  PREFIX ${BOOST_BUILD_ROOT}
+
-  BUILD_IN_SOURCE 1
+  set (BOOST_COMMON_ARGS 
-  CONFIGURE_COMMAND
+      ${BOOST_OPENSSL_DIR}
-   cp -f ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/user-config.jam . &&
+      --prefix=${EXTERNAL_BUILD_ROOT}
-   ./bootstrap.sh
+      address-model=${BOOST_ADDRESS_MODEL}
-    ${BOOST_TOOLSET}
+      architecture=${BOOST_ARCH}
-    ${BOOST_TARGET_OS}
+      cxxflags=-std=c++${CMAKE_CXX_STANDARD}
-    --with-libraries=atomic,chrono,date_time,filesystem,random,regex,serialization,system,thread
+      cxxstd=${CMAKE_CXX_STANDARD}
-  BUILD_COMMAND
+      define=BOOST_ASIO_HAS_STD_STRING_VIEW
-    ./b2
+      define=BOOST_SYSTEM_NO_DEPRECATED
-    ${BOOST_COMMON_ARGS}
+      link=static
-    ${BOOST_TARGET_OS}
+      linkflags=-std=c++${CMAKE_CXX_STANDARD}
-  INSTALL_COMMAND
+      threading=multi
-    ./b2
+      variant=${CMAKE_BUILD_TYPE_LOWER}
-    ${BOOST_COMMON_ARGS}
+      -sZLIB_BINARY=zlibstatic${DEBUG_EXTRA}
-    ${BOOST_TARGET_OS}
+      -sZLIB_LIBPATH="${EXTERNAL_BUILD_ROOT}/lib"
-    install
+      -sZLIB_INCLUDE="${EXTERNAL_BUILD_ROOT}/include"
-)
+  )
-
+
-add_dependencies(boost_project openssl_project)
+  ExternalProject_Add(boost_project
-
+    DOWNLOAD_NO_PROGRESS 1
-if (MINGW AND CMAKE_HOST_WIN32)
+    URL ${BOOST_DOWNLOAD_URL}
-  set(BOOST_GCC_VERSION ${CMAKE_CXX_COMPILER_VERSION})
+    PREFIX ${BOOST_BUILD_ROOT}
-  string(REPLACE "." ";" BOOST_GCC_VERSION_LIST ${BOOST_GCC_VERSION})
+    BUILD_IN_SOURCE 1
-  list(GET BOOST_GCC_VERSION_LIST 0 BOOST_GCC_MAJOR_VERSION)
+    CONFIGURE_COMMAND
-  set(BOOST_LIB_EXTRA "-mgw${BOOST_GCC_MAJOR_VERSION}-mt${DEBUG_EXTRA2}-x64-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}")
+     cp -f ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/user-config.jam . &&
-endif()
+     ./bootstrap.sh
-
+      ${BOOST_TOOLSET}
-set(Boost_LIBRARIES
+      ${BOOST_TARGET_OS}
-  libboost_system${BOOST_LIB_EXTRA}.a
+      --with-libraries=atomic,chrono,date_time,filesystem,random,regex,serialization,system,thread
-  libboost_atomic${BOOST_LIB_EXTRA}.a
+    BUILD_COMMAND
-  libboost_chrono${BOOST_LIB_EXTRA}.a
+      ./b2
-  libboost_date_time${BOOST_LIB_EXTRA}.a
+      ${BOOST_COMMON_ARGS}
-  libboost_filesystem${BOOST_LIB_EXTRA}.a
+      ${BOOST_TARGET_OS}
-  libboost_random${BOOST_LIB_EXTRA}.a
+    INSTALL_COMMAND
-  libboost_regex${BOOST_LIB_EXTRA}.a
+      ./b2
-  libboost_serialization${BOOST_LIB_EXTRA}.a
+      ${BOOST_COMMON_ARGS}
-  libboost_thread${BOOST_LIB_EXTRA}.a
+      ${BOOST_TARGET_OS}
-)
+      install
-
+  )
-add_dependencies(boost_project zlib_project)
+
-if (CMAKE_HOST_WIN32)
+  add_dependencies(boost_project openssl_project)
-  include_directories(SYSTEM ${EXTERNAL_BUILD_ROOT}/include/boost-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION})
+
+  add_dependencies(boost_project zlib_project)
+  if (CMAKE_HOST_WIN32)
+    include_directories(SYSTEM ${EXTERNAL_BUILD_ROOT}/include/boost-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION})
+  endif()
+
+  set(Boost_LIBRARIES
+    libboost_system.a
+    libboost_atomic.a
+    libboost_chrono.a
+    libboost_date_time.a
+    libboost_filesystem.a
+    libboost_random.a
+    libboost_regex.a
+    libboost_serialization.a
+    libboost_thread.a
+  )
 endif()

cmake/curl.cmake

@@ -1,67 +1,60 @@
-set(CURL_PROJECT_NAME curl_${CURL_VERSION})
-set(CURL_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${CURL_PROJECT_NAME})
-
-if (OPENSSL_ROOT_DIR)
-  set(CURL_OPENSSL_EXTRA -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR})
-elseif(LINUX OR MINGW)
-  set(CURL_OPENSSL_EXTRA -DOPENSSL_ROOT_DIR=${EXTERNAL_BUILD_ROOT})
-endif()
-
-set(CURL_CMAKE_ARGS
-  ${CURL_OPENSSL_EXTRA}
-  -DBUILD_CURL_EXE=OFF
-  -DBUILD_SHARED_LIBS=OFF
-  -DBUILD_TESTING=OFF
-  -DCMAKE_BUILD_TYPE=${EXTERNAL_BUILD_TYPE}
-  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-  -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-  -DCMAKE_INSTALL_PREFIX=${EXTERNAL_BUILD_ROOT}
-  -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
-  -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
-  -DCURL_CA_BUNDLE=./cacert.pem
-  -DCURL_CA_FALLBACK=ON
-  -DCURL_DISABLE_LDAP=ON
-  -DCURL_STATICLIB=ON
-  -DCURL_USE_LIBPSL=OFF
-  -DCURL_USE_LIBSSH2=OFF
-  -DCURL_ZLIB=OFF
-  -DENABLE_THREADED_RESOLVER=ON
-  -DOPENSSL_USE_STATIC_LIBS=ON
-  -DUSE_LIBIDN2=OFF
-)
-
-if (CMAKE_TOOLCHAIN_FILE)
-  set(CURL_CMAKE_ARGS
-    ${CURL_CMAKE_ARGS}
-    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} 
-  )
-endif()
-
 if (MINGW)
-  set(CURL_CMAKE_ARGS
+  find_package(CURL REQUIRED)
-    ${CURL_CMAKE_ARGS}
+  set(CURL_LIBRARIES /mingw64/lib/libcurl.a)
-    -DCURL_USE_OPENSSL=OFF
-    -DUSE_WIN32_CRYPTO=ON
-  )
 else()
+  set(CURL_PROJECT_NAME curl_${CURL_VERSION})
+  set(CURL_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${CURL_PROJECT_NAME})
+
+  if (OPENSSL_ROOT_DIR)
+    set(CURL_OPENSSL_EXTRA -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR})
+  elseif(LINUX)
+    set(CURL_OPENSSL_EXTRA -DOPENSSL_ROOT_DIR=${EXTERNAL_BUILD_ROOT})
+  endif()
+
   set(CURL_CMAKE_ARGS
-    ${CURL_CMAKE_ARGS}
+    ${CURL_OPENSSL_EXTRA}
+    -DBUILD_CURL_EXE=OFF
+    -DBUILD_SHARED_LIBS=OFF
+    -DBUILD_TESTING=OFF
+    -DCMAKE_BUILD_TYPE=${EXTERNAL_BUILD_TYPE}
+    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+    -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+    -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+    -DCMAKE_INSTALL_PREFIX=${EXTERNAL_BUILD_ROOT}
+    -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+    -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
+    -DCURL_CA_BUNDLE=./cacert.pem
+    -DCURL_CA_FALLBACK=ON
+    -DCURL_DISABLE_LDAP=ON
+    -DCURL_STATICLIB=ON
+    -DCURL_USE_LIBPSL=OFF
+    -DCURL_USE_LIBSSH2=OFF
     -DCURL_USE_OPENSSL=ON
+    -DCURL_ZLIB=OFF
+    -DENABLE_THREADED_RESOLVER=ON
+    -DOPENSSL_USE_STATIC_LIBS=ON
+    -DUSE_LIBIDN2=OFF
+  )
+
+  if (CMAKE_TOOLCHAIN_FILE)
+    set(CURL_CMAKE_ARGS
+      ${CURL_CMAKE_ARGS}
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} 
+    )
+  endif()
+
+  ExternalProject_Add(curl_project
+    DOWNLOAD_NO_PROGRESS 1
+    URL https://curl.se/download/curl-${CURL_VERSION}.tar.gz 
+    PREFIX ${CURL_BUILD_ROOT}
+    CMAKE_ARGS ${CURL_CMAKE_ARGS}
+  )
+
+  set(CURL_LIBRARIES libcurl${DEBUG_EXTRA2}${CMAKE_STATIC_LIBRARY_SUFFIX})
+  add_dependencies(curl_project 
+    openssl_project
+    zlib_project
   )
 endif()
 
-ExternalProject_Add(curl_project
-  DOWNLOAD_NO_PROGRESS 1
-  URL https://github.com/curl/curl/archive/curl-${CURL_VERSION}.tar.gz
-  PREFIX ${CURL_BUILD_ROOT}
-  CMAKE_ARGS ${CURL_CMAKE_ARGS}
-)
-
 set(REPERTORY_DEFINITIONS ${REPERTORY_DEFINITIONS} -DCURL_STATICLIB=ON -DCURL_DISABLE_LDAP=ON)
-
-set(CURL_LIBRARIES libcurl${DEBUG_EXTRA2}${CMAKE_STATIC_LIBRARY_SUFFIX})
-add_dependencies(curl_project 
-  openssl_project
-  zlib_project
-)

cmake/librepertory.cmake

@@ -12,10 +12,12 @@ set_common_target_options(librepertory)
 set_target_properties(librepertory PROPERTIES PREFIX "")
 target_link_libraries(librepertory PRIVATE ${REPERTORY_LINK_LIBRARIES}) 
 
-add_dependencies(librepertory
+if (NOT MINGW)
-  boost_project
+  add_dependencies(librepertory
-  curl_project
+    boost_project
-  libsodium_project
+    curl_project
-  openssl_project
+    libsodium_project
-  zlib_project
+    openssl_project
-)
+    zlib_project
+  )
+endif()

cmake/libsodium.cmake

@@ -1,27 +1,29 @@
-set(LIBSODIUM_PROJECT_NAME libsodium_${LIBSODIUM_VERSION})
-set(LIBSODIUM_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${LIBSODIUM_PROJECT_NAME})
-set(LIBSODIUM_BUILD_TYPE ${EXTERNAL_BUILD_TYPE})
-
 if (MINGW)
-  set(LIBSODIUM_HOST --host=x86_64-w64-mingw32)
+  set(sodium_USE_STATIC_LIBS ON)
+  find_package(Sodium REQUIRED)
+  set(LIBSODIUM_LIBRARIES /mingw64/lib/libsodium.a)
+else()
+  set(LIBSODIUM_PROJECT_NAME libsodium_${LIBSODIUM_VERSION})
+  set(LIBSODIUM_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${LIBSODIUM_PROJECT_NAME})
+  set(LIBSODIUM_BUILD_TYPE ${EXTERNAL_BUILD_TYPE})
+
+  ExternalProject_Add(libsodium_project
+    DOWNLOAD_NO_PROGRESS 1
+    PREFIX ${LIBSODIUM_BUILD_ROOT}
+    BUILD_IN_SOURCE 1
+    URL https://github.com/jedisct1/libsodium/releases/download/${LIBSODIUM_VERSION}-RELEASE/libsodium-${LIBSODIUM_VERSION}.tar.gz 
+    CONFIGURE_COMMAND ./configure
+      --prefix=${EXTERNAL_BUILD_ROOT}
+      --enable-shared=no
+      --enable-static=yes
+      --disable-asm
+      --disable-ssp
+      ${LIBSODIUM_HOST}
+    BUILD_COMMAND make
+    INSTALL_COMMAND make install
+  )
+
+  add_dependencies(libsodium_project zlib_project)
+  set(LIBSODIUM_LIBRARIES libsodium.a)
 endif()
 
-ExternalProject_Add(libsodium_project
-  DOWNLOAD_NO_PROGRESS 1
-  PREFIX ${LIBSODIUM_BUILD_ROOT}
-  BUILD_IN_SOURCE 1
-  URL https://github.com/jedisct1/libsodium/releases/download/${LIBSODIUM_VERSION}-RELEASE/libsodium-${LIBSODIUM_VERSION}.tar.gz 
-  CONFIGURE_COMMAND
-    ./configure
-    ${LIBSODIUM_HOST}
-    --prefix=${EXTERNAL_BUILD_ROOT}
-    --enable-shared=no
-    --enable-static=yes
-    --disable-asm
-  BUILD_COMMAND make
-  INSTALL_COMMAND make install
-)
-
-set(LIBSODIUM_LIBRARIES libsodium.a)
-
-add_dependencies(libsodium_project zlib_project)

cmake/mingw-w64-x86_64.cmake

@@ -1,16 +0,0 @@
-set(CMAKE_SYSTEM_NAME Windows)
-set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
-
-set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
-set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
-set(CMAKE_Fortran_COMPILER ${TOOLCHAIN_PREFIX}-gfortran)
-set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
-
-set(CMAKE_FIND_ROOT_PATH 
-  /usr/${TOOLCHAIN_PREFIX}
-  /usr/local/${TOOLCHAIN_PREFIX}
-)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

cmake/modules/FindSodium.cmake

@@ -0,0 +1,297 @@
+# Written in 2016 by Henrik Steffen Gaßmann <henrik@gassmann.onl>
+#
+# To the extent possible under law, the author(s) have dedicated all
+# copyright and related and neighboring rights to this software to the
+# public domain worldwide. This software is distributed without any warranty.
+#
+# You should have received a copy of the CC0 Public Domain Dedication
+# along with this software. If not, see
+#
+#     http://creativecommons.org/publicdomain/zero/1.0/
+#
+########################################################################
+# Tries to find the local libsodium installation.
+#
+# On Windows the sodium_DIR environment variable is used as a default
+# hint which can be overridden by setting the corresponding cmake variable.
+#
+# Once done the following variables will be defined:
+#
+#   sodium_FOUND
+#   sodium_INCLUDE_DIR
+#   sodium_LIBRARY_DEBUG
+#   sodium_LIBRARY_RELEASE
+#
+#
+# Furthermore an imported "sodium" target is created.
+#
+
+if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
+    OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    set(_GCC_COMPATIBLE 1)
+endif()
+
+# static library option
+if (NOT DEFINED sodium_USE_STATIC_LIBS)
+    option(sodium_USE_STATIC_LIBS "enable to statically link against sodium" OFF)
+endif()
+if(NOT (sodium_USE_STATIC_LIBS EQUAL sodium_USE_STATIC_LIBS_LAST))
+    unset(sodium_LIBRARY CACHE)
+    unset(sodium_LIBRARY_DEBUG CACHE)
+    unset(sodium_LIBRARY_RELEASE CACHE)
+    unset(sodium_DLL_DEBUG CACHE)
+    unset(sodium_DLL_RELEASE CACHE)
+    set(sodium_USE_STATIC_LIBS_LAST ${sodium_USE_STATIC_LIBS} CACHE INTERNAL "internal change tracking variable")
+endif()
+
+
+########################################################################
+# UNIX
+if (UNIX)
+    # import pkg-config
+    find_package(PkgConfig QUIET)
+    if (PKG_CONFIG_FOUND)
+        pkg_check_modules(sodium_PKG QUIET libsodium)
+    endif()
+
+    if(sodium_USE_STATIC_LIBS)
+        foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
+            if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already ending with .a
+                list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
+            endif()
+        endforeach()
+        list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
+
+        # if pkgconfig for libsodium doesn't provide
+        # static lib info, then override PKG_STATIC here..
+        if (NOT sodium_PKG_STATIC_FOUND)
+            set(sodium_PKG_STATIC_LIBRARIES libsodium.a)
+        endif()
+
+        set(XPREFIX sodium_PKG_STATIC)
+    else()
+        if (NOT sodium_PKG_FOUND)
+            set(sodium_PKG_LIBRARIES sodium)
+        endif()
+
+        set(XPREFIX sodium_PKG)
+    endif()
+
+    find_path(sodium_INCLUDE_DIR sodium.h
+        HINTS ${${XPREFIX}_INCLUDE_DIRS}
+    )
+    find_library(sodium_LIBRARY_DEBUG NAMES ${${XPREFIX}_LIBRARIES}
+        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+    )
+    find_library(sodium_LIBRARY_RELEASE NAMES ${${XPREFIX}_LIBRARIES}
+        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+    )
+
+
+########################################################################
+# Windows
+elseif (WIN32)
+    set(sodium_DIR "$ENV{sodium_DIR}" CACHE FILEPATH "sodium install directory")
+    mark_as_advanced(sodium_DIR)
+
+    find_path(sodium_INCLUDE_DIR sodium.h
+        HINTS ${sodium_DIR}
+        PATH_SUFFIXES include
+    )
+
+    if (MSVC)
+        # detect target architecture
+        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp" [=[
+            #if defined _M_IX86
+            #error ARCH_VALUE x86_32
+            #elif defined _M_X64
+            #error ARCH_VALUE x86_64
+            #endif
+            #error ARCH_VALUE unknown
+        ]=])
+        try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp"
+            OUTPUT_VARIABLE _COMPILATION_LOG
+        )
+        string(REGEX REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*" "\\1" _TARGET_ARCH "${_COMPILATION_LOG}")
+
+        # construct library path
+        if (_TARGET_ARCH STREQUAL "x86_32")
+            string(APPEND _PLATFORM_PATH "Win32")
+        elseif(_TARGET_ARCH STREQUAL "x86_64")
+            string(APPEND _PLATFORM_PATH "x64")
+        else()
+            message(FATAL_ERROR "the ${_TARGET_ARCH} architecture is not supported by Findsodium.cmake.")
+        endif()
+        string(APPEND _PLATFORM_PATH "/$$CONFIG$$")
+
+        if (MSVC_VERSION LESS 1900)
+            math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 60")
+        else()
+            math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 50")
+        endif()
+        string(APPEND _PLATFORM_PATH "/v${_VS_VERSION}")
+
+        if (sodium_USE_STATIC_LIBS)
+            string(APPEND _PLATFORM_PATH "/static")
+        else()
+            string(APPEND _PLATFORM_PATH "/dynamic")
+        endif()
+
+        string(REPLACE "$$CONFIG$$" "Debug" _DEBUG_PATH_SUFFIX "${_PLATFORM_PATH}")
+        string(REPLACE "$$CONFIG$$" "Release" _RELEASE_PATH_SUFFIX "${_PLATFORM_PATH}")
+
+        find_library(sodium_LIBRARY_DEBUG libsodium.lib
+            HINTS ${sodium_DIR}
+            PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX}
+        )
+        find_library(sodium_LIBRARY_RELEASE libsodium.lib
+            HINTS ${sodium_DIR}
+            PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
+        )
+        if (NOT sodium_USE_STATIC_LIBS)
+            set(CMAKE_FIND_LIBRARY_SUFFIXES_BCK ${CMAKE_FIND_LIBRARY_SUFFIXES})
+            set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+            find_library(sodium_DLL_DEBUG libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX}
+            )
+            find_library(sodium_DLL_RELEASE libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
+            )
+            set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BCK})
+        endif()
+
+    elseif(_GCC_COMPATIBLE)
+        if (sodium_USE_STATIC_LIBS)
+            find_library(sodium_LIBRARY_DEBUG libsodium.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+            find_library(sodium_LIBRARY_RELEASE libsodium.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+        else()
+            find_library(sodium_LIBRARY_DEBUG libsodium.dll.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+            find_library(sodium_LIBRARY_RELEASE libsodium.dll.a
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES lib
+            )
+
+            file(GLOB _DLL
+                LIST_DIRECTORIES false
+                RELATIVE "${sodium_DIR}/bin"
+                "${sodium_DIR}/bin/libsodium*.dll"
+            )
+            find_library(sodium_DLL_DEBUG ${_DLL} libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES bin
+            )
+            find_library(sodium_DLL_RELEASE ${_DLL} libsodium
+                HINTS ${sodium_DIR}
+                PATH_SUFFIXES bin
+            )
+        endif()
+    else()
+        message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
+    endif()
+
+
+########################################################################
+# unsupported
+else()
+    message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
+endif()
+
+
+########################################################################
+# common stuff
+
+# extract sodium version
+if (sodium_INCLUDE_DIR)
+    set(_VERSION_HEADER "${_INCLUDE_DIR}/sodium/version.h")
+    if (EXISTS _VERSION_HEADER)
+        file(READ "${_VERSION_HEADER}" _VERSION_HEADER_CONTENT)
+        string(REGEX REPLACE ".*#[ \t]*define[ \t]*SODIUM_VERSION_STRING[ \t]*\"([^\n]*)\".*" "\\1"
+            sodium_VERSION "${_VERSION_HEADER_CONTENT}")
+        set(sodium_VERSION "${sodium_VERSION}" PARENT_SCOPE)
+    endif()
+endif()
+
+# communicate results
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+    Sodium # The name must be either uppercase or match the filename case.
+    REQUIRED_VARS
+        sodium_LIBRARY_RELEASE
+        sodium_LIBRARY_DEBUG
+        sodium_INCLUDE_DIR
+    VERSION_VAR
+        sodium_VERSION
+)
+
+if(Sodium_FOUND)
+    set(sodium_LIBRARIES
+        optimized ${sodium_LIBRARY_RELEASE} debug ${sodium_LIBRARY_DEBUG})
+endif()
+
+# mark file paths as advanced
+mark_as_advanced(sodium_INCLUDE_DIR)
+mark_as_advanced(sodium_LIBRARY_DEBUG)
+mark_as_advanced(sodium_LIBRARY_RELEASE)
+if (WIN32)
+    mark_as_advanced(sodium_DLL_DEBUG)
+    mark_as_advanced(sodium_DLL_RELEASE)
+endif()
+
+# create imported target
+if(sodium_USE_STATIC_LIBS)
+    set(_LIB_TYPE STATIC)
+else()
+    set(_LIB_TYPE SHARED)
+endif()
+
+if(NOT TARGET sodium)
+    add_library(sodium ${_LIB_TYPE} IMPORTED)
+endif()
+
+set_target_properties(sodium PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}"
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+)
+
+if (sodium_USE_STATIC_LIBS)
+    set_target_properties(sodium PROPERTIES
+        INTERFACE_COMPILE_DEFINITIONS "SODIUM_STATIC"
+        IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}"
+        IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}"
+    )
+else()
+    if (UNIX)
+        set_target_properties(sodium PROPERTIES
+            IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}"
+            IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}"
+        )
+    elseif (WIN32)
+        set_target_properties(sodium PROPERTIES
+            IMPORTED_IMPLIB "${sodium_LIBRARY_RELEASE}"
+            IMPORTED_IMPLIB_DEBUG "${sodium_LIBRARY_DEBUG}"
+        )
+        if (NOT (sodium_DLL_DEBUG MATCHES ".*-NOTFOUND"))
+            set_target_properties(sodium PROPERTIES
+                IMPORTED_LOCATION_DEBUG "${sodium_DLL_DEBUG}"
+            )
+        endif()
+        if (NOT (sodium_DLL_RELEASE MATCHES ".*-NOTFOUND"))
+            set_target_properties(sodium PROPERTIES
+                IMPORTED_LOCATION_RELWITHDEBINFO "${sodium_DLL_RELEASE}"
+                IMPORTED_LOCATION_MINSIZEREL "${sodium_DLL_RELEASE}"
+                IMPORTED_LOCATION_RELEASE "${sodium_DLL_RELEASE}"
+            )
+        endif()
+    endif()
+endif()

cmake/openssl.cmake

@@ -1,36 +1,44 @@
-if (IS_CLANG_COMPILER)
+if (MINGW)
-  set(OPENSSL_COMPILE_TYPE_EXTRA -clang)
+  set($ENV:{OPENSSL_ROOT_DIR} /mingw64)
-endif()
+  find_package(OpenSSL REQUIRED)
-
+  set(OPENSSL_LIBRARIES
-if (MACOS)
+    /mingw64/lib64/libssl.a 
-  set(OPENSSL_COMPILE_TYPE darwin64-x86_64-cc)
+    /mingw64/lib64/libcrypto.a 
-elseif(IS_ARM64)
+  )
-  set(OPENSSL_COMPILE_TYPE linux-aarch64${OPENSSL_COMPILE_TYPE_EXTRA})
-elseif(MINGW)
-  if (CMAKE_TOOLCHAIN_FILE)
-    set(OPENSSL_COMPILE_TYPE --cross-compile-prefix=x86_64-w64-mingw32- mingw64${OPENSSL_COMPILE_TYPE_EXTRA})
-  else()
-    set(OPENSSL_COMPILE_TYPE mingw64${OPENSSL_COMPILE_TYPE_EXTRA})
-  endif()
 else()
-  set(OPENSSL_COMPILE_TYPE linux-x86_64${OPENSSL_COMPILE_TYPE_EXTRA})
+  if (IS_CLANG_COMPILER)
+    set(OPENSSL_COMPILE_TYPE_EXTRA -clang)
+  endif()
+
+  if (MACOS)
+    set(OPENSSL_COMPILE_TYPE darwin64-x86_64-cc)
+  elseif(IS_ARM64)
+    set(OPENSSL_COMPILE_TYPE linux-aarch64${OPENSSL_COMPILE_TYPE_EXTRA})
+  else()
+    set(OPENSSL_COMPILE_TYPE linux-x86_64${OPENSSL_COMPILE_TYPE_EXTRA})
+  endif()
+
+  set(OPENSSL_PROJECT_NAME openssl_${OPENSSL_VERSION})
+  set(OPENSSL_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${OPENSSL_PROJECT_NAME})
+  ExternalProject_Add(openssl_project
+    DOWNLOAD_NO_PROGRESS 1
+    URL https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz 
+    PREFIX ${OPENSSL_BUILD_ROOT}
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND ./Configure 
+      ${OPENSSL_COMPILE_TYPE} 
+      --prefix=${EXTERNAL_BUILD_ROOT}
+      no-apps
+      no-docs
+      no-shared 
+    BUILD_COMMAND make
+    INSTALL_COMMAND make install
+  )
+
+  set(OPENSSL_LIBRARIES
+    ${EXTERNAL_BUILD_ROOT}/lib/libssl.a
+    ${EXTERNAL_BUILD_ROOT}/lib/libcrypto.a
+  )
+
+  add_dependencies(openssl_project zlib_project)
 endif()
-
-set(OPENSSL_PROJECT_NAME openssl_${OPENSSL_VERSION})
-set(OPENSSL_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${OPENSSL_PROJECT_NAME})
-ExternalProject_Add(openssl_project
-  DOWNLOAD_NO_PROGRESS 1
-  URL https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz 
-  PREFIX ${OPENSSL_BUILD_ROOT}
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND ./Configure no-shared ${OPENSSL_COMPILE_TYPE} --openssldir=${EXTERNAL_BUILD_ROOT}/ssl --prefix=${EXTERNAL_BUILD_ROOT}
-  BUILD_COMMAND make -j1
-  INSTALL_COMMAND make install
-)
-
-set(OPENSSL_LIBRARIES
-  ${EXTERNAL_BUILD_ROOT}/lib/libssl.a
-  ${EXTERNAL_BUILD_ROOT}/lib/libcrypto.a
-)
-
-add_dependencies(openssl_project zlib_project)

cmake/settings.cmake

@@ -11,6 +11,10 @@ set(CMAKE_COLOR_MAKEFILE OFF)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_MODULE_PATH 
+  ${CMAKE_MODULE_PATH}
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
+)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 
 if (NOT CMAKE_BUILD_TYPE)

cmake/unittests.cmake

@@ -13,7 +13,7 @@ if (REPERTORY_ENABLE_TESTING)
   endif()
   ExternalProject_Add(gtest_project
     DOWNLOAD_NO_PROGRESS 1
-    URL https://github.com/google/googletest/archive/refs/tags/${GTEST_VERSION}.tar.gz 
+    URL https://github.com/google/googletest/archive/refs/tags/v${GTEST_VERSION}.tar.gz 
     PREFIX ${GTEST_BUILD_ROOT}
     CMAKE_ARGS
       -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -30,7 +30,7 @@ if (REPERTORY_ENABLE_TESTING)
     ${GTEST_BUILD_ROOT}/src/gtest_project/googlemock/include
   )
 
-  if(UNIX OR MINGW)
+  if(UNIX)
     set(GTEST_LIBRARIES
       ${GTEST_BUILD_ROOT}/src/gtest_project-build/lib/libgmock.a
       ${GTEST_BUILD_ROOT}/src/gtest_project-build/lib/libgtest.a

cmake/versions.cmake

@@ -1,9 +1,9 @@
 set(BOOST_MAJOR_VERSION 1)
-set(BOOST_MINOR_VERSION 83)
+set(BOOST_MINOR_VERSION 84)
-set(BOOST_REVISION 0)
+set(BOOST_PATCH_VERSION 0)
-set(CURL_VERSION 8_5_0)
+set(CURL_VERSION 8.5.0)
-set(GTEST_VERSION v1.14.0)
+set(GTEST_VERSION 1.14.0)
 set(LIBSODIUM_VERSION 1.0.19)
 set(OPENSSL_VERSION 3.2.0)
 set(WINFSP_VERSION 2.0)
-set(ZLIB_VERSION v1.3)
+set(ZLIB_VERSION 1.3)

cmake/zlib.cmake

@@ -1,31 +1,32 @@
-set(ZLIB_PROJECT_NAME zlib_${ZLIB_VERSION})
+if (MINGW)
-set(ZLIB_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${ZLIB_PROJECT_NAME})
+  find_package(ZLIB REQUIRED)
-set(ZLIB_CMAKE_ARGS
+  set(ZLIB_LIBRARIES /mingw64/lib/libz.a)
-  -DCMAKE_BUILD_TYPE=${EXTERNAL_BUILD_TYPE}
-  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-  -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-  -DCMAKE_INSTALL_PREFIX=${EXTERNAL_BUILD_ROOT}
-  -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
-  -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
-)
-
-if (CMAKE_TOOLCHAIN_FILE)
-  set(ZLIB_CMAKE_ARGS
-    ${ZLIB_CMAKE_ARGS}
-    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} 
-  )
-endif()
-
-ExternalProject_Add(zlib_project
-  DOWNLOAD_NO_PROGRESS 1
-  URL https://github.com/madler/zlib/archive/${ZLIB_VERSION}.tar.gz
-  PREFIX ${ZLIB_BUILD_ROOT}
-  CMAKE_ARGS ${ZLIB_CMAKE_ARGS}
-)
-
-if(MINGW)
-  set(ZLIB_LIBRARIES ${EXTERNAL_BUILD_ROOT}/lib/libzlibstatic${CMAKE_STATIC_LIBRARY_SUFFIX})
 else()
+  set(ZLIB_PROJECT_NAME zlib_${ZLIB_VERSION})
+  set(ZLIB_BUILD_ROOT ${EXTERNAL_BUILD_ROOT}/builds/${ZLIB_PROJECT_NAME})
+  set(ZLIB_CMAKE_ARGS
+    -DBUILD_SHARED_LIBS=OFF
+    -DCMAKE_BUILD_TYPE=${EXTERNAL_BUILD_TYPE}
+    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+    -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+    -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+    -DCMAKE_INSTALL_PREFIX=${EXTERNAL_BUILD_ROOT}
+    -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+  )
+
+  if (CMAKE_TOOLCHAIN_FILE)
+    set(ZLIB_CMAKE_ARGS
+      ${ZLIB_CMAKE_ARGS}
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} 
+    )
+  endif()
+
+  ExternalProject_Add(zlib_project
+    DOWNLOAD_NO_PROGRESS 1
+    URL https://github.com/madler/zlib/archive/v${ZLIB_VERSION}.tar.gz
+    PREFIX ${ZLIB_BUILD_ROOT}
+    CMAKE_ARGS ${ZLIB_CMAKE_ARGS}
+  )
+
   set(ZLIB_LIBRARIES ${EXTERNAL_BUILD_ROOT}/lib/libz${CMAKE_STATIC_LIBRARY_SUFFIX})
 endif()

scripts/make_common.sh

@@ -37,7 +37,7 @@ mkdir -p ../${BUILD_ROOT}/${BUILD_FOLDER}
 pushd ../${BUILD_ROOT}/${BUILD_FOLDER}
 
 if [ "${IS_MINGW}" == "1" ]; then
-  TOOLCHAIN=$(realpath ../../cmake/mingw-w64-x86_64.cmake)
+  TOOLCHAIN=$(realpath /cmake_toolchain.cmake)
   CMAKE_ADDITIONAL_OPTS=-DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
 fi
 

scripts/make_mingw64.sh

@@ -1,5 +1,23 @@
 #!/bin/bash
+# #!/bin/bash
+#
+# pushd "$(dirname "$0")/.."
+# scripts/make_common.sh "${1}" "${2}" 1
+# popd
+#
+BUILD_TYPE=$1
+BUILD_CLEAN=$2
 
-pushd "$(dirname "$0")/.."
+SOURCE_DIR=$(dirname "$0")/..
-scripts/make_common.sh "${1}" "${2}" 1
+SOURCE_DIR=$(realpath ${SOURCE_DIR})
-popd
+
+NAME=mingw64
+BUILD_ARCH=64_bit
+
+docker stop repertory_${NAME}
+docker rm repertory_${NAME}
+docker build --build-arg NUM_JOBS=${MY_NUM_JOBS} -t repertory:${NAME} - < ${SOURCE_DIR}/docker/${BUILD_ARCH}/${NAME} &&
+  docker run -td -u $(id -u):$(id -g) --name repertory_${NAME} -w ${SOURCE_DIR} -v ${SOURCE_DIR}:${SOURCE_DIR}:rw,z repertory:${NAME} &&
+  docker exec repertory_${NAME} /bin/bash -c "${SOURCE_DIR}/scripts/make_common.sh ${BUILD_TYPE} "${BUILD_CLEAN}" 1"
+docker stop repertory_${NAME}
+docker rm repertory_${NAME}

scripts/make_win32.cmd

@@ -1,5 +0,0 @@
-@echo off
-
-pushd "%~dp0%.."
-mingw64 scripts/make_common.sh "%1" "%2" 0 1
-popd

scripts/run_docker_shell.sh

@@ -1,5 +1,15 @@
 #!/bin/bash
 
+NUM_JOBS=${MY_NUM_JOBS}
+if [[ -z "${NUM_JOBS}" ]]; then
+  NUM_JOBS=$(getconf _NPROCESSORS_ONLN 2> /dev/null || getconf NPROCESSORS_ONLN 2> /dev/null || echo 1)
+  if [ "${NUM_JOBS}" -gt "2" ]; then
+    NUM_JOBS=$(expr ${NUM_JOBS} - 2)
+  elif [ "${NUM_JOBS}" -gt "1" ]; then
+    NUM_JOBS=$(expr ${NUM_JOBS} - 1)
+  fi
+fi
+
 pushd "$(dirname "$0")"
 CURRENT_DIR=$(pwd)
 
@@ -14,15 +24,17 @@ else
   fi
 
   TAG=repertory_shell
-  CONTAINER=${TAG}_shell_${NAME}
+  CONTAINER=${TAG}_${NAME}
 
   docker stop ${CONTAINER}
   docker rm ${CONTAINER}
-  docker build -t ${TAG}:${NAME} - < docker/${TYPE}/${NAME} &&
+  docker build --build-arg NUM_JOBS=$NUM_JOBS -t ${TAG}:${NAME} - < docker/${TYPE}/${NAME} &&
     docker run -itd --device /dev/fuse --cap-add SYS_ADMIN --name ${CONTAINER} -v $(pwd):/mnt ${TAG}:${NAME} &&
+    # docker run -itd --device /dev/fuse --cap-add SYS_ADMIN --name ${CONTAINER} ${TAG}:${NAME} &&
     docker exec -it ${CONTAINER} /bin/bash
   docker stop ${CONTAINER}
   docker rm ${CONTAINER}
+  docker system prune -f
 fi
 popd
 popd