From f4a50f4e1e1471b50fa9eb666396a738ac91b285 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 21 Apr 2023 13:44:46 -0500 Subject: [PATCH 01/10] Updating scripts and build files to reference Qt 6.5, and update OpenSSL to 3.1.0 --- .github/workflows/ci.yml | 4 ++-- conanfile.txt | 2 +- setup-debug.bat | 2 +- setup-debug.sh | 2 +- setup-release.bat | 2 +- setup-release.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5794c2f..2fdbc65f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: msvc_arch: x64 msvc_toolset: 14.34 msvc_version: 2022 - qt_version: 6.4.2 + qt_version: 6.5.0 qt_arch: win64_msvc2019_64 qt_tools: '' conan_arch: x86_64 @@ -43,7 +43,7 @@ jobs: env_cc: gcc-11 env_cxx: g++-11 compiler: gcc - qt_version: 6.4.2 + qt_version: 6.5.0 qt_arch: gcc_64 qt_tools: '' conan_arch: x86_64 diff --git a/conanfile.txt b/conanfile.txt index 4228790c..bd241403 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -8,7 +8,7 @@ glm/cci.20220420 gtest/cci.20210126 libcurl/7.86.0 libxml2/2.10.3 -openssl/1.1.1t +openssl/3.1.0 spdlog/1.11.0 sqlite3/3.40.1 vulkan-loader/1.3.236.0 diff --git a/setup-debug.bat b/setup-debug.bat index 2ed9af1a..dcc3f2ba 100644 --- a/setup-debug.bat +++ b/setup-debug.bat @@ -1,5 +1,5 @@ call tools\setup-common.bat mkdir build-debug cd build-debug -cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.4.2/msvc2019_64 .. +cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:/Qt/6.5.0/msvc2019_64 .. pause diff --git a/setup-debug.sh b/setup-debug.sh index 1f6552c8..bf55697e 100755 --- a/setup-debug.sh +++ b/setup-debug.sh @@ -2,4 +2,4 @@ ./tools/setup-common.sh mkdir -p build-debug cd build-debug -cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.4.2/gcc_64 .. +cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.0/gcc_64 .. diff --git a/setup-release.bat b/setup-release.bat index eca4e02a..da10db7c 100644 --- a/setup-release.bat +++ b/setup-release.bat @@ -1,5 +1,5 @@ call tools\setup-common.bat mkdir build-release cd build-release -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.4.2/msvc2019_64 .. +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:/Qt/6.5.0/msvc2019_64 .. pause diff --git a/setup-release.sh b/setup-release.sh index 6d8dedae..04c7c2d9 100755 --- a/setup-release.sh +++ b/setup-release.sh @@ -2,4 +2,4 @@ ./tools/setup-common.sh mkdir -p build-release cd build-release -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.4.2/gcc_64 .. +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=/opt/Qt/6.5.0/gcc_64 .. From a83065acd8678aff4c27f90c5bf65e7b0b50cb69 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 21 Apr 2023 13:45:00 -0500 Subject: [PATCH 02/10] Adding recent translation updates --- scwx-qt/ts/scwx_en_US.ts | 361 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 357 insertions(+), 4 deletions(-) diff --git a/scwx-qt/ts/scwx_en_US.ts b/scwx-qt/ts/scwx_en_US.ts index 202bf24b..98d6b783 100644 --- a/scwx-qt/ts/scwx_en_US.ts +++ b/scwx-qt/ts/scwx_en_US.ts @@ -2,11 +2,142 @@ - MainWindow + AboutDialog - Toolbox + About Supercell Wx + + Supercell Wx + + + + Version X.Y.Z + + + + Git Revision 0000000000 + + + + Copyright © 2021-YYYY Dan Paulat + + + + + AlertDialog + + Dialog + + + + First + + + + ... + + + + Previous + + + + Next + + + + Last + + + + # of # + + + + + AlertDockWidget + + Alerts + + + + Filter + + + + Settings + + + + ... + + + + &View + + + + &Go + + + + &Active Alerts + + + + + AlertModel + + ETN + + + + Office ID + + + + Phenomenon + + + + Significance + + + + State + + + + Counties / Areas + + + + Start Time + + + + End Time + + + + Distance + + + + + ImGuiDebugDialog + + ImGui Debug + + + + Context + + + + + MainWindow ... @@ -60,11 +191,199 @@ - &Open... + &Open - Ctrl+O + &View + + + + &Debug + + + + Radar Toolbox + + + + Resource Explorer + + + + Expand All + + + + Collapse All + + + + &Resource Explorer + + + + &NEXRAD Product... + + + + Text &Event Product... + + + + &Alerts + + + + &ImGui Debug + + + + &Settings + + + + &User Manual + + + + &Discord + + + + &GitHub Repository + + + + Dump Radar &Product Records + + + + + QObject + + Product + + + + %1 of %2 + + + + ... + + + + Phenomenon + + + + Active + + + + Inactive + + + + + RadarSiteDialog + + Select Radar Site + + + + Filter + + + + + RadarSiteModel + + Site ID + + + + Place + + + + State + + + + Country + + + + Latitude + + + + Longitude + + + + Type + + + + Distance + + + + + SettingsDialog + + Settings + + + + General + + + + Palettes + + + + Default Radar Site + + + + Grid Height + + + + ... + + + + Mapbox API Key + + + + Font Sizes + + + + Grid Width + + + + Debug Enabled + + + + Color Tables + + + + Alerts + + + + Reset @@ -74,6 +393,33 @@ Unrecognized NEXRAD Product: + + Radar &Toolbox + + + + &Resource Explorer + + + + &Alerts + + + + + scwx::qt::ui::AboutDialog + + Version %1 + + + + Git Revision <a href="%1">%2</a> + + + + Copyright © 2021-%1 Dan Paulat + + scwx::qt::ui::Level2SettingsWidgetImpl @@ -90,4 +436,11 @@ + + scwx::qt::ui::Level3ProductsWidgetImpl + + Tilt %1 + + + From 4ba56d8cf0ad1db8c90824467cca91a48f65537f Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 21 Apr 2023 13:45:27 -0500 Subject: [PATCH 03/10] Updating AWS Level 2 test to use KEAX for prune --- test/source/scwx/provider/aws_level2_data_provider.test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/source/scwx/provider/aws_level2_data_provider.test.cpp b/test/source/scwx/provider/aws_level2_data_provider.test.cpp index 4f6bb9dd..66c3dbef 100644 --- a/test/source/scwx/provider/aws_level2_data_provider.test.cpp +++ b/test/source/scwx/provider/aws_level2_data_provider.test.cpp @@ -48,7 +48,7 @@ TEST(AwsLevel2DataProvider, Prune) { using namespace std::chrono; - AwsLevel2DataProvider provider("KLSX"); + AwsLevel2DataProvider provider("KEAX"); const auto today = floor(system_clock::now()); const auto yesterday = today - days {1}; From 5b39d80d3ba9f191eccfb1e3b696d586be8bd8ff Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 21 Apr 2023 13:47:44 -0500 Subject: [PATCH 04/10] Update MSVC toolset to 14.35 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2fdbc65f..4b8dc581 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: env_cxx: '' compiler: msvc msvc_arch: x64 - msvc_toolset: 14.34 + msvc_toolset: 14.35 msvc_version: 2022 qt_version: 6.5.0 qt_arch: win64_msvc2019_64 From b0af526b49f921ef3e30fb9e44f000181643449c Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 21 Apr 2023 16:14:27 -0500 Subject: [PATCH 05/10] Don't fail fast on CI job, allow either platform to run to completion when the other fails --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b8dc581..34347be2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ concurrency: jobs: build: strategy: + fail-fast: false matrix: include: - name: win64_msvc2022 From ebee72668852750fa532975fa948089c2ceb7989 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 21 Apr 2023 16:14:53 -0500 Subject: [PATCH 06/10] Enable no_module option for OpenSSL legacy provider --- conanfile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/conanfile.txt b/conanfile.txt index bd241403..95e79404 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -21,6 +21,7 @@ cmake_paths [options] libiconv:shared=True +openssl:no_module=True openssl:shared=True [imports] From 17a9c9190dbd6379534dc3aa384d4f431d7d751b Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 21 Apr 2023 18:06:25 -0500 Subject: [PATCH 07/10] Set Linux DT_RUNPATH --- scwx-qt/scwx-qt.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 03766a2c..b6516a2d 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -384,6 +384,9 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets target_link_libraries(supercell-wx PRIVATE scwx-qt wxdata) +# Set DT_RUNPATH for Linux targets +set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib") + install(TARGETS supercell-wx qmaplibregl RUNTIME_DEPENDENCIES From a264bd6b1b8427813c9c0c195a9f7d59cf854b2f Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 21 Apr 2023 18:06:57 -0500 Subject: [PATCH 08/10] Set Qt NO_TRANSLATIONS (QTBUG-112204) --- scwx-qt/scwx-qt.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index b6516a2d..6792ee1f 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -399,12 +399,16 @@ install(TARGETS supercell-wx COMPONENT supercell-wx OPTIONAL) +# NO_TRANSLATIONS is needed for Qt 6.5.0 (will be fixed in 6.5.1) +# https://bugreports.qt.io/browse/QTBUG-112204 qt_generate_deploy_app_script(TARGET qmaplibregl FILENAME_VARIABLE deploy_script_qmaplibregl + NO_TRANSLATIONS NO_UNSUPPORTED_PLATFORM_ERROR) qt_generate_deploy_app_script(TARGET supercell-wx FILENAME_VARIABLE deploy_script_scwx + NO_TRANSLATIONS NO_UNSUPPORTED_PLATFORM_ERROR) install(SCRIPT ${deploy_script_qmaplibregl} From 27bce3c8b138ee513a4b11b33df142ec1861e979 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 22 Apr 2023 01:02:57 -0500 Subject: [PATCH 09/10] Migrating qt_generate_deploy_app_script to Qt 6.5 syntax --- scwx-qt/scwx-qt.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 6792ee1f..092475fa 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -402,12 +402,12 @@ install(TARGETS supercell-wx # NO_TRANSLATIONS is needed for Qt 6.5.0 (will be fixed in 6.5.1) # https://bugreports.qt.io/browse/QTBUG-112204 qt_generate_deploy_app_script(TARGET qmaplibregl - FILENAME_VARIABLE deploy_script_qmaplibregl + OUTPUT_SCRIPT deploy_script_qmaplibregl NO_TRANSLATIONS NO_UNSUPPORTED_PLATFORM_ERROR) qt_generate_deploy_app_script(TARGET supercell-wx - FILENAME_VARIABLE deploy_script_scwx + OUTPUT_SCRIPT deploy_script_scwx NO_TRANSLATIONS NO_UNSUPPORTED_PLATFORM_ERROR) From eabe28c423e45d25510a9962a27174f160b78b55 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 22 Apr 2023 01:17:01 -0500 Subject: [PATCH 10/10] Fixing DT_RUNPATH for Linux targets --- scwx-qt/scwx-qt.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 092475fa..641f9abb 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -385,7 +385,8 @@ target_link_libraries(supercell-wx PRIVATE scwx-qt wxdata) # Set DT_RUNPATH for Linux targets -set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib") +set_target_properties(qmaplibregl PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") +set_target_properties(supercell-wx PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") install(TARGETS supercell-wx qmaplibregl