From b39be8c2953343619aad95cea278c93d700a1e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Mon, 23 Nov 2020 10:56:59 +0100 Subject: [PATCH] Add CMakeLists for MO2 build. --- .gitignore | 5 ++ CMakeLists.txt | 13 +++++ make.ps1 | 2 +- plugin-requirements.txt | 1 + src/CMakeLists.txt | 7 +++ .../installer_wizard_en.ts | 58 +++++++++---------- 6 files changed, 56 insertions(+), 30 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 plugin-requirements.txt create mode 100644 src/CMakeLists.txt rename installer_wizard_en.ts => src/installer_wizard_en.ts (65%) diff --git a/.gitignore b/.gitignore index f8f6198..f22e853 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,12 @@ src/ui/*.py .tox .vscode +# MO2 build files: +vsbuild +mob.log + # Generated files: +lib src/lib installer_wizard installer_wizard-*.zip diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..290445d --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 3.16) + +project(installer_wizard LANGUAGES NONE) +set(project_type python_module_plugin) +set(enable_warnings OFF) + +if(DEFINED DEPENDENCIES_DIR) + include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake) +else() + include(../cmake_common/project.cmake) +endif() + +add_subdirectory(src) diff --git a/make.ps1 b/make.ps1 index baf02fa..b6bfdb9 100644 --- a/make.ps1 +++ b/make.ps1 @@ -1,5 +1,5 @@ # Install the lib: -pip install --target=.\src\lib --upgrade git+https://github.com/Holt59/bain-wizard-interpreter | Out-Null +pip install --target=.\src\lib --upgrade -r .\plugin-requirements.txt | Out-Null # Convert ui files: Get-ChildItem -Recurse -File -Include "*.ui" | ForEach-Object { diff --git a/plugin-requirements.txt b/plugin-requirements.txt new file mode 100644 index 0000000..ab64692 --- /dev/null +++ b/plugin-requirements.txt @@ -0,0 +1 @@ +git+https://github.com/Holt59/bain-wizard-interpreter diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..d57f796 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 3.16) + +if(DEFINED DEPENDENCIES_DIR) + include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/src.cmake) +else() + include(../../cmake_common/src.cmake) +endif() diff --git a/installer_wizard_en.ts b/src/installer_wizard_en.ts similarity index 65% rename from installer_wizard_en.ts rename to src/installer_wizard_en.ts index 0c983e2..5843ead 100644 --- a/installer_wizard_en.ts +++ b/src/installer_wizard_en.ts @@ -3,32 +3,32 @@ WizardInstallerComplete - + Form - + The installer script has finished. The following sub-packages and plugins will be installed. - + Sub-Packages: - + Plugins: - + INI Tweaks: - + Notes: @@ -36,37 +36,37 @@ WizardInstallerDialog - + BAIN Wizard Installer - + Name - + Manual - + Script - + Back - + Next - + Cancel @@ -74,12 +74,12 @@ WizardInstallerError - + Form - + TextLabel @@ -87,22 +87,22 @@ WizardInstallerPage - + Form - + TextLabel - + Options: - + Description: @@ -110,52 +110,52 @@ WizardInstallerRequires - + Form - + <html><head/><body><p><span style=" font-weight:600;">Warning:</span> The following version requirements are not met for using this installer.</p></body></html> - + Requirements - + Graphics Extender - + Wrye Bash - + Need - + Game - + N/A - + Have - + Script Extender