Skip to content

Commit

Permalink
Move to VCPKG.
Browse files Browse the repository at this point in the history
  • Loading branch information
Holt59 committed Aug 2, 2024
1 parent d544205 commit e0d29c2
Show file tree
Hide file tree
Showing 12 changed files with 130 additions and 84 deletions.
39 changes: 35 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,47 @@
name: Build Installer BAIN Plugin
name: Build Installer BAIN

on:
push:
branches: master
pull_request:
types: [opened, synchronize, reopened]

env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"

jobs:
build:
runs-on: windows-2022
steps:
- name: Build Installer BAIN Plugin
uses: ModOrganizer2/build-with-mob-action@master
# 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:
mo2-dependencies: cmake_common uibase
setup-python: false
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 BAIN
shell: pwsh
run: |
cmake --preset vs2022-windows-standalone `
"-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64" `
"-DCMAKE_INSTALL_PREFIX=install"
- name: Build Installer BAIN
run: cmake --build vsbuild --config RelWithDebInfo --target INSTALL
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@ cmake_minimum_required(VERSION 3.16)

project(installer_bain)

if(DEFINED DEPENDENCIES_DIR)
include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
else()
include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
endif()

add_subdirectory(src)
60 changes: 60 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"configurePresets": [
{
"errors": {
"deprecated": true
},
"hidden": true,
"name": "cmake-dev",
"warnings": {
"deprecated": true,
"dev": true
}
},
{
"cacheVariables": {
"VCPKG_MANIFEST_NO_DEFAULT_FEATURES": {
"type": "BOOL",
"value": "ON"
}
},
"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"hidden": true,
"name": "vcpkg"
},
{
"hidden": true,
"inherits": ["vcpkg"],
"name": "vcpkg-dev"
},
{
"binaryDir": "${sourceDir}/vsbuild",
"architecture": {
"strategy": "set",
"value": "x64"
},
"cacheVariables": {
"CMAKE_CXX_FLAGS": "/EHsc /MP /W4",
"VCPKG_TARGET_TRIPLET": {
"type": "STRING",
"value": "x64-windows-static-md"
}
},
"generator": "Visual Studio 17 2022",
"inherits": ["cmake-dev", "vcpkg-dev"],
"name": "vs2022-windows",
"toolset": "v143"
},
{
"cacheVariables": {
"VCPKG_MANIFEST_FEATURES": {
"type": "STRING",
"value": "standalone"
}
},
"inherits": "vs2022-windows",
"name": "vs2022-windows-standalone"
}
],
"version": 4
}
6 changes: 5 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
cmake_minimum_required(VERSION 3.16)

find_package(mo2-cmake CONFIG REQUIRED)
find_package(mo2-uibase CONFIG REQUIRED)

add_library(installer_bain SHARED)
mo2_configure_plugin(installer_bain WARNINGS OFF)
mo2_install_target(installer_bain)
target_link_libraries(installer_bain PRIVATE mo2::uibase)
mo2_install_plugin(installer_bain)
18 changes: 0 additions & 18 deletions src/SConscript

This file was deleted.

7 changes: 4 additions & 3 deletions src/baincomplexinstallerdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
*/

#include "baincomplexinstallerdialog.h"
#include "textviewer.h"
#include "ui_baincomplexinstallerdialog.h"

#include <QCompleter>

#include <uibase/textviewer.h>

#include "baincomplexinstallerdialog.h"

using namespace MOBase;

BainComplexInstallerDialog::BainComplexInstallerDialog(
Expand Down
7 changes: 3 additions & 4 deletions src/baincomplexinstallerdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#ifndef BAINCOMPLEXINSTALLERDIALOG_H
#define BAINCOMPLEXINSTALLERDIALOG_H

#include "ifiletree.h"
#include <guessedvalue.h>

#include "tutorabledialog.h"
#include <uibase/guessedvalue.h>
#include <uibase/ifiletree.h>
#include <uibase/tutorabledialog.h>

namespace Ui
{
Expand Down
39 changes: 0 additions & 39 deletions src/installerBAIN.pro

This file was deleted.

11 changes: 5 additions & 6 deletions src/installerbain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,16 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.

#include "installerbain.h"

#include <igamefeatures.h>
#include <iinstallationmanager.h>
#include <iplugingame.h>
#include <moddatachecker.h>
#include <uibase/game_features/igamefeatures.h>
#include <uibase/game_features/moddatachecker.h>
#include <uibase/iinstallationmanager.h>
#include <uibase/iplugingame.h>
#include <uibase/log.h>

#include <QDir>
#include <QMessageBox>
#include <QtPlugin>

#include <log.h>

#include "baincomplexinstallerdialog.h"

using namespace MOBase;
Expand Down
4 changes: 2 additions & 2 deletions src/installerbain.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#ifndef INSTALLERBAIN_H
#define INSTALLERBAIN_H

#include <iplugininstallersimple.h>
#include <uibase/iplugininstallersimple.h>

class InstallerBAIN : public MOBase::IPluginInstallerSimple
{
Q_OBJECT
Q_INTERFACES(MOBase::IPlugin MOBase::IPluginInstaller MOBase::IPluginInstallerSimple)
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "org.tannin.InstallerBAIN" FILE "installerbain.json")
Q_PLUGIN_METADATA(IID "org.tannin.InstallerBAIN")
#endif

public:
Expand Down
1 change: 0 additions & 1 deletion src/installerbain.json

This file was deleted.

16 changes: 16 additions & 0 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"dependencies": ["mo2-cmake"],
"features": {
"standalone": {
"description": "Build Standalone.",
"dependencies": ["mo2-uibase"]
}
},
"vcpkg-configuration": {
"default-registry": {
"kind": "git",
"repository": "https://github.com/ModOrganizer2/vcpkg-registry",
"baseline": "d194ec4e14052784518d5e9f1c5ccac16de49c2c"
}
}
}

0 comments on commit e0d29c2

Please sign in to comment.