Merge pull request #692 from pmienk/installer-rewrite

Rewritten build/install scripts.

Author: pmienk

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ endif()
 #------------------------------------------------------------------------------
 # Project options.
 #------------------------------------------------------------------------------
-option( with-test "Build test." ON )
+option( with-tests "Build tests." ON )
 option( with-console "Build console." ON )
 
 #------------------------------------------------------------------------------
@@ -187,15 +187,15 @@ set_target_properties( libbitcoin-server
 )
 
 #------------------------------------------------------------------------------
-# libbitcoin-server-tests tests
+# libbitcoin-server-test tests
 #------------------------------------------------------------------------------
-if ( with-test )
-  add_executable( libbitcoin-server-tests )
+if ( with-tests )
+  add_executable( libbitcoin-server-test )
 
   enable_testing()
 
-  add_test( NAME libbitcoin-server-tests
-    COMMAND libbitcoin-server-tests
+  add_test( NAME libbitcoin-server-test
+    COMMAND libbitcoin-server-test
     --run_test=*
     --log_level=warning
     --show_progress=no
@@ -204,12 +204,12 @@ if ( with-test )
     --build_info=yes
   )
 
-  target_compile_features( libbitcoin-server-tests
+  target_compile_features( libbitcoin-server-test
     PUBLIC
       cxx_std_20
   )
 
-  target_compile_options( libbitcoin-server-tests
+  target_compile_options( libbitcoin-server-test
     PRIVATE
       -Wall
       -Wextra
@@ -225,23 +225,23 @@ if ( with-test )
       -fstack-protector-all
   )
 
-  file( GLOB_RECURSE libbitcoin_server_tests_SOURCES CONFIGURE_DEPENDS
+  file( GLOB_RECURSE libbitcoin_server_test_SOURCES CONFIGURE_DEPENDS
     "${CMAKE_CURRENT_SOURCE_DIR}/../../test/*.c"
     "${CMAKE_CURRENT_SOURCE_DIR}/../../test/*.cpp"
   )
 
-  target_sources( libbitcoin-server-tests
+  target_sources( libbitcoin-server-test
     PRIVATE
-      ${libbitcoin_server_tests_SOURCES}
+      ${libbitcoin_server_test_SOURCES}
   )
 
-  target_link_libraries( libbitcoin-server-tests
+  target_link_libraries( libbitcoin-server-test
     PRIVATE
       Boost::unit_test_framework
       bitcoin::server
   )
 
-  set_target_properties( libbitcoin-server-tests
+  set_target_properties( libbitcoin-server-test
     PROPERTIES
       VERSION ${PROJECT_VERSION}
       SOVERSION ${PROJECT_VERSION_MAJOR}

build.cmd

@@ -11,15 +11,19 @@
                 "type": "inList",
                 "string": "${hostSystemName}",
                 "list": [
-                  "Darwin",
-                  "Linux"
+                    "Darwin",
+                    "Linux"
                 ]
             },
             "cacheVariables": {
                 "CMAKE_PREFIX_PATH": {
                   "type": "PATH",
                   "value": "${sourceParentDir}/../../../prefix/${presetName}"
                 },
+                "CMAKE_INSTALL_PREFIX_PATH": {
+                  "type": "PATH",
+                  "value": "${sourceParentDir}/../../../prefix/${presetName}"
+                },
                 "CMAKE_LIBRARY_PATH": {
                   "type": "PATH",
                   "value": "${sourceParentDir}/../../../prefix/${presetName}/lib:$env{CMAKE_LIBRARY_PATH}"
@@ -31,25 +35,19 @@
             "description": "Factored debug settings.",
             "hidden": true,
             "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
                 "CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -Og -g --coverage",
-                "CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Og -g --coverage",
-                "enable-ndebug": {
-                  "type": "BOOL",
-                  "value": "OFF"
-                }
+                "CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Og -g --coverage"
             }
         },
         {
             "name": "gnu-release",
             "description": "Factored release settings.",
             "hidden": true,
             "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
                 "CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -O3",
-                "CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -O3",
-                "enable-ndebug": {
-                  "type": "BOOL",
-                  "value": "ON"
-                }
+                "CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -O3"
             }
         },
         {
@@ -124,9 +122,9 @@
             "name": "nix-target-list",
             "hidden": true,
             "targets": [
-                "bitcoin-server",
+                "libbitcoin-server",
                 "libbitcoin-server-test",
-                "bs"
+                "bitcoin-server"
             ]
         },
         {