From 5b7ff77e595b93ca36a56b56076eb89295c8ec90 Mon Sep 17 00:00:00 2001
From: Russel Waters <vaelstrom@gmail.com>
Date: Mon, 4 Feb 2019 15:02:22 -0500
Subject: [PATCH] Build/debug beta (#1696)

* Build RelWithDebInfo for beta

* Update appveyor.yml

capture artifacts based on build type
---
 appveyor.yml       | 12 ++++++------
 ci/build-gitlab.sh |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1ea9acd1..da000b92 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,15 +9,15 @@ platform: x64
 environment:
   matrix:
     - network: nano_live_network
+      configuration: Release
     - network: nano_beta_network
+      configuration: RelWithDebInfo
 clone_folder: C:\projects\myproject
 install:
 - cmd: >-
     git submodule update --init --recursive
 
-    cmake -DNANO_GUI=ON -DACTIVE_NETWORK=%NETWORK% -DQt5_DIR="C:\Qt\5.9\msvc2017_64\lib\cmake\Qt5" -DNANO_SIMD_OPTIMIZATIONS=TRUE -DBoost_COMPILER="-vc141" -DBOOST_ROOT="C:/Libraries/boost_1_66_0" -DBOOST_LIBRARYDIR="C:/Libraries/boost_1_66_0/lib64-msvc-14.1" -G "Visual Studio 15 2017 Win64" -DIPHLPAPI_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/iphlpapi.lib" -DWINSOCK2_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/WS2_32.lib"
-
-
+    cmake -DNANO_GUI=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DACTIVE_NETWORK=%NETWORK% -DQt5_DIR="C:\Qt\5.9\msvc2017_64\lib\cmake\Qt5" -DNANO_SIMD_OPTIMIZATIONS=TRUE -DBoost_COMPILER="-vc141" -DBOOST_ROOT="C:/Libraries/boost_1_66_0" -DBOOST_LIBRARYDIR="C:/Libraries/boost_1_66_0/lib64-msvc-14.1" -G "Visual Studio 15 2017 Win64" -DIPHLPAPI_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/iphlpapi.lib" -DWINSOCK2_LIBRARY="C:/Program Files (x86)/Windows Kits/10/Lib/10.0.14393.0/um/x64/WS2_32.lib"
 
 - ps: Invoke-WebRequest -Uri https://aka.ms/vs/15/release/vc_redist.x64.exe -OutFile .\vc_redist.x64.exe
 build:
@@ -26,11 +26,11 @@ build:
   verbosity: minimal
 after_build:
 - cmd: >-
-    cpack -NSIS --verbose
+    cpack -C %CONFIGURATION% --verbose --config ./CPackConfig.cmake
 
-    7z a nano.zip %APPVEYOR_BUILD_FOLDER%\Release\*.exe %APPVEYOR_BUILD_FOLDER%\Release\*.com
+    7z a nano.zip %APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%\*.exe %APPVEYOR_BUILD_FOLDER%\%CONFIGURATION%\*.com
 artifacts:
 - path: nano.zip
   name: nano_release_%network%
 - path: Nano_Installer-*.exe
-  name: Nano_Installer_%network%
\ No newline at end of file
+  name: Nano_Installer_%network%
diff --git a/ci/build-gitlab.sh b/ci/build-gitlab.sh
index f4927b28..fa630ce6 100755
--- a/ci/build-gitlab.sh
+++ b/ci/build-gitlab.sh
@@ -54,8 +54,10 @@ fi
 
 if [[ "${BETA}" -eq 1 ]]; then
     NETWORK_CFG="-DACTIVE_NETWORK=nano_beta_network"
+    CONFIGURATION="RelWithDebInfo"
 else
     NETWORK_CFG="-DACTIVE_NETWORK=nano_live_network"
+    CONFIGURATION="Release"
 fi
 
 set -o nounset
@@ -67,7 +69,7 @@ run_build() {
     cd ${build_dir}
     cmake -GNinja \
        -DNANO_GUI=ON \
-       -DCMAKE_BUILD_TYPE=Release \
+       -DCMAKE_BUILD_TYPE=${CONFIGURATION} \
        -DCMAKE_VERBOSE_MAKEFILE=ON \
        -DCMAKE_INSTALL_PREFIX="../install" \
        ${NETWORK_CFG} \
@@ -80,7 +82,7 @@ run_build() {
 
     cmake --build ${PWD} -- -v
     cmake --build ${PWD} -- install -v
-    cpack -G ${CPACK_TYPE} ${PWD}
+    cpack -G ${CPACK_TYPE} -C ${CONFIGURATION} ${PWD}
     sha1sum *.tar* > SHA1SUMS
 }