Move mo2-cmake to standalone feature.

Author: Holt59

.github/workflows/build.yml

@@ -2,45 +2,19 @@ name: Build Installer OMOD
 
 on:
   push:
-    branches: master
+    branches: [master]
   pull_request:
     types: [opened, synchronize, reopened]
 
 env:
-  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+  VCPKG_BINARY_SOURCES: clear;x-azblob,${{ vars.AZ_BLOB_VCPKG_URL }},${{ secrets.AZ_BLOB_SAS }},readwrite
 
 jobs:
   build:
     runs-on: windows-2022
     steps:
-      # https://learn.microsoft.com/en-us/vcpkg/consume/binary-caching-github-actions-cache
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: 6.7.0
-          modules:
-          cache: true
-
-      - uses: actions/checkout@v4
-
-      - name: "Set environmental variables"
-        shell: bash
-        run: |
-          echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV
-
-      - name: Configure Installer OMOD
-        shell: pwsh
-        run: |
-          cmake --preset vs2022-windows-standalone `
-            "-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64" `
-            "-DCMAKE_INSTALL_PREFIX=install"
-
       - name: Build Installer OMOD
-        run: cmake --build vsbuild --config RelWithDebInfo --target INSTALL
+        id: build-installer-omod
+        uses: ModOrganizer2/build-with-mob-action@dev/vcpkg
+        with:
+          mo2-dependencies: uibase

.pre-commit-config.yaml

@@ -0,0 +1,20 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-merge-conflict
+      - id: check-case-conflict
+  # - repo: https://github.com/pre-commit/mirrors-clang-format
+  #   rev: v19.1.5
+  #   hooks:
+  #   - id: clang-format
+  #     'types_or': [c++, c]
+
+ci:
+  autofix_commit_msg: "[pre-commit.ci] Auto fixes from pre-commit.com hooks."
+  autofix_prs: true
+  autoupdate_commit_msg: "[pre-commit.ci] Pre-commit autoupdate."
+  autoupdate_schedule: quarterly
+  submodules: false

CMakePresets.json

@@ -48,5 +48,12 @@
       "name": "vs2022-windows-standalone"
     }
   ],
+  "buildPresets": [
+    {
+      "name": "vs2022-windows",
+      "resolvePackageReferences": "on",
+      "configurePreset": "vs2022-windows"
+    }
+  ],
   "version": 4
 }

src/DummyCSFile.cs

@@ -13,4 +13,4 @@ static void Stub2()
             Rtf.ToHtml("");
         }
     }
-}
+}

src/OMODFrameworkWrapper.h

@@ -53,7 +53,7 @@ protected slots:
   void pickModNameSlot(bool& successOut, MOBase::GuessedValue<QString>& modName);
   void createModSlot(MOBase::IModInterface*& modInterfaceOut, MOBase::GuessedValue<QString>& modName);
   void displayReadmeSlot(const QString& modName, const QString& readme);
-  
+
   void showWaitDialogSlot(QString message);
   void hideWaitDialogSlot();
 

src/implementations/ScriptFunctions.cpp

@@ -20,7 +20,7 @@
 ScriptFunctionsHelper::ScriptFunctionsHelper() : mMessageBoxHelper(make_unique<MessageBoxHelper>())
 {
   moveToThread(QApplication::instance()->thread());
-  
+
   connect(this, &ScriptFunctionsHelper::DialogSelectSignal, this, &ScriptFunctionsHelper::DialogSelectSlot, Qt::BlockingQueuedConnection);
   connect(this, &ScriptFunctionsHelper::InputStringSignal, this, &ScriptFunctionsHelper::InputStringSlot, Qt::BlockingQueuedConnection);
   connect(this, &ScriptFunctionsHelper::DisplayImageSignal, this, &ScriptFunctionsHelper::DisplayImageSlot, Qt::BlockingQueuedConnection);

src/oldstuff/DialogSelect.cpp

@@ -230,7 +230,7 @@ std::optional<QVector<int>> DialogSelect(
     rightInner = new QWidget(right);
     rightScrollArea->setWidget(rightInner);
     rightScrollArea->setWidgetResizable(true);
-    
+
     rightInnerLayout = new QVBoxLayout(rightInner);
   }
   else

src/oldstuff/folder.md

@@ -1 +1 @@
-This is stuff I'm just lifting from my original attempt at an OMOD installer. It's probably terrible and I'm barely going to fix it. I expect and want other MO2 devs to rework/replace it with something better.
+This is stuff I'm just lifting from my original attempt at an OMOD installer. It's probably terrible and I'm barely going to fix it. I expect and want other MO2 devs to rework/replace it with something better.

vcpkg.json

@@ -1,16 +1,15 @@
 {
-  "dependencies": ["mo2-cmake"],
   "features": {
     "standalone": {
       "description": "Build Standalone.",
-      "dependencies": ["mo2-uibase"]
+      "dependencies": ["mo2-cmake", "mo2-uibase"]
     }
   },
   "vcpkg-configuration": {
     "default-registry": {
       "kind": "git",
       "repository": "https://github.com/ModOrganizer2/vcpkg-registry",
-      "baseline": "d194ec4e14052784518d5e9f1c5ccac16de49c2c"
+      "baseline": "8beb2e0efa9c17dd6d17bb05288dd1e40727f673"
     }
   }
 }