Merge pull request #47 from oblivioncth/dev

Merge to master for v0.7.5

Author: oblivioncth

.github/workflows/build-fil-windows.yml

@@ -17,12 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        lib_linkage: [static] #[static, shared] shared is broken for since CLIFp has to be static
-        include:
-          #- lib_linkage: shared
-          #  cmake_bsl: ON
-          - lib_linkage: static
-            cmake_bsl: OFF
+        linkage: [{type: static, cmake_bsl: OFF}] #shared is broken for since CLIFp has to be static
     runs-on: windows-latest
     env:
       vs_dir: C:/Program Files/Microsoft Visual Studio/2022/Enterprise
@@ -40,11 +35,11 @@ jobs:
         version: 6.5.1
         os: windows
         compiler: msvc2022
-        linkage: ${{ matrix.lib_linkage }}
+        linkage: ${{ matrix.linkage.type }}
         path: ${{ env.qt_install_dir }}
         credentials: ${{ secrets.qt_ffynnon_cred }}
     - name: Checkout FIL
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: ${{ env.fil_src_suffix }}
         fetch-depth: 0 # Required for verbose versioning to work correctly
@@ -55,7 +50,7 @@ jobs:
         echo "Setup C++ Build Environment..."
         CALL "${{ env.vs_dir }}\Common7\Tools\VsDevCmd.bat" -arch=amd64
         echo "Configure CMake using Qt wrapper..."
-        CALL "${{ env.qt_cmake }}" -G "${{ env.cmake_gen }}" -S "${{ env.fil_src_dir}}" -B "${{ env.fil_build_dir }}" -D BUILD_SHARED_LIBS=${{ matrix.cmake_bsl }}
+        CALL "${{ env.qt_cmake }}" -G "${{ env.cmake_gen }}" -S "${{ env.fil_src_dir}}" -B "${{ env.fil_build_dir }}" -D BUILD_SHARED_LIBS=${{ matrix.linkage.cmake_bsl }}
         echo "Changing to build directory..."
         cd "%fil_build_dir%"
         echo "Building FIL release..."
@@ -70,7 +65,7 @@ jobs:
         $artifact_name=$((Get-ChildItem -Path "${{ env.fil_package_path }}" -Filter *.zip)[0].BaseName)
         echo "current_artifact_name=$artifact_name" >> $Env:GITHUB_ENV
     - name: Upload FIL build artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.current_artifact_name }}
         path: ${{ env.fil_install_path }}

.github/workflows/master-pull-request-merge-reaction.yml

@@ -68,7 +68,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Download built static FIL artifact (Windows)
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         path: ${{ env.artifacts_path }}
     - name: Zip up release artifacts

CMakeLists.txt

@@ -6,21 +6,21 @@ cmake_minimum_required(VERSION 3.24.0...3.26.0)
 # Project
 # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
 project(FIL
-    VERSION 0.7.4
+    VERSION 0.7.5
     LANGUAGES CXX
     DESCRIPTION "Flashpoint Importer for Launchers"
 )
 
 # Get helper scripts
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FetchOBCMake.cmake)
-fetch_ob_cmake("v0.3.4")
+fetch_ob_cmake("v0.3.5")
 
 # Initialize project according to standard rules
 include(OB/Project)
 ob_standard_project_setup()
 
 # Additional Project Variables
-set(TARGET_FP_VERSION_PREFIX 12.1)
+set(TARGET_FP_VERSION_PREFIX 13.0)
 
 # Configuration options
 # Handled by fetched libs, but set this here formally since they aren't part of the main project
@@ -40,6 +40,7 @@ enable_language("RC")
 
 set(FIL_QT_COMPONENTS
     Core
+    Core5Compat
     Gui
     Network
     Widgets
@@ -64,18 +65,18 @@ set(FIL_QX_COMPONENTS
 
 include(OB/FetchQx)
 ob_fetch_qx(
-    REF "v0.5.6"
+    REF "v0.5.7"
     COMPONENTS
         ${FIL_QX_COMPONENTS}
 )
 
 # Fetch libfp (build and import from source)
 include(OB/Fetchlibfp)
-ob_fetch_libfp("v0.5.2")
+ob_fetch_libfp("v0.5.3")
 
 # Fetch CLIFp (build and import from source)
 include(OB/FetchCLIFp)
-ob_fetch_clifp("v0.9.10")
+ob_fetch_clifp("v0.9.11")
 
 # TODO: The shared build of this is essentially useless as only the CLIFp executable
 # is deployed, which only works if it's statically linked. There isn't a simple way

app/src/mainwindow.cpp

@@ -202,7 +202,7 @@ void MainWindow::initializeFrontendHelpActions()
 
 bool MainWindow::installMatchesTargetSeries(const Fp::Install& fpInstall)
 {
-    Qx::VersionNumber fpVersion = fpInstall.version();
+    Qx::VersionNumber fpVersion = fpInstall.versionInfo()->version();
     return TARGET_FP_VERSION_PREFIX.isPrefixOf(fpVersion) ||
            TARGET_FP_VERSION_PREFIX.normalized() == fpVersion; // Accounts for if FP doesn't use a trailing zero for major releases
 }
@@ -239,7 +239,7 @@ void MainWindow::validateInstall(const QString& installPath, InstallType install
             mFlashpointInstall = std::make_shared<Fp::Install>(installPath, true);
             if(mFlashpointInstall->isValid())
             {
-                ui->label_flashpointVersion->setText(mFlashpointInstall->nameVersionString());
+                ui->label_flashpointVersion->setText(mFlashpointInstall->versionInfo()->fullString());
                 if(installMatchesTargetSeries(*mFlashpointInstall))
                     ui->icon_flashpoint_install_status->setPixmap(QPixmap(u":/ui/Valid_Install.png"_s));
                 else