Skip to content
This repository was archived by the owner on Jun 19, 2024. It is now read-only.

Commit 941e89e

Browse files
committed
Upgrade dependencies, add omod installer
1 parent d067c7a commit 941e89e

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

config.py

+13-13
Original file line numberDiff line numberDiff line change
@@ -81,33 +81,33 @@ def gen_search_folders(*subpath):
8181

8282
# manualy set all versions
8383
'7zip_version': '19.00',
84-
'boost_version': '1.74.0',
84+
'boost_version': '1.75.0',
8585
'boost_version_tag': '',
86-
'fmt_version': '7.0.3',
86+
'fmt_version': '7.1.3',
8787
'googletest_version': '1.8.0', # unused. We use the latest source
8888
'grep_version': '3.3',
89-
'icu_version': '67',
90-
'icu_version_minor': '1',
89+
'icu_version': '68',
90+
'icu_version_minor': '2',
9191
'loot_version': '0.16.1',
9292
'loot_commit': 'gd8c9b98',
9393
'loot_branch': '0.16.1',
94-
'lz4_version': '1.9.2',
94+
'lz4_version': '1.9.3',
9595
'lz4_version_minor': '', # leave empty if no patch version (1.2.3.x)
9696
'nasm_version': '2.15.05',
97-
'nuget_version': '5.7.0',
97+
'nuget_version': '5.8.1',
9898
'nmm_version': '0.71.2',
99-
'openssl_version': '1.1.1h',
100-
'pyqt_version': '5.15.1',
101-
'pyqt_pypi_hash': '1d/31/896dc3dfb6c81c70164019a6cbba6ab037e3af7653d9ca60ccc874ee4c27',
99+
'openssl_version': '1.1.1i',
100+
'pyqt_version': '5.15.2',
101+
'pyqt_pypi_hash': '28/6c/640e3f5c734c296a7193079a86842a789edb7988dca39eab44579088a1d1',
102102
'pyqt_dev_version': '', # leave empty for a standard release
103-
'pyqt_builder_version': '1.5.0',
103+
'pyqt_builder_version': '1.7.0',
104104
'pyqt_sip_version': '12.8.1',
105105
'python_version': '3.8',
106-
'python_version_minor': '.6',
106+
'python_version_minor': '.7',
107107
'bzip2_version': '1.0.6', # For python
108-
'sip_version': '5.4.0',
108+
'sip_version': '5.5.0',
109109
'sip_dev_version': '', # leave empty for a standard release
110-
'spdlog_version': 'v1.8.0',
110+
'spdlog_version': 'v1.8.2',
111111
'qt_version': '5.15',
112112
'qt_version_minor': '2',
113113
'qt_version_appveyor': '5.15',

makefile.uni.py

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ def gen_userfile_content(project):
108108
(config['Main_Author'], "modorganizer-installer_fomod", "installer_fomod", config['Build_Branch'], ["Qt5", "modorganizer-uibase", "modorganizer-game_features"], True),
109109
(config['Main_Author'], "modorganizer-installer_fomod_csharp", "installer_fomod_csharp", config['Build_Branch'], ["Qt5", "modorganizer-uibase", "modorganizer-game_features"], True),
110110
(config['Main_Author'], "modorganizer-installer_wizard", "installer_wizard", config['Build_Branch'], ["Python", "PyQt5"], True),
111+
(config['Main_Author'], "modorganizer-installer_omod", "installer_omod", config["Build_Branch"], ["Qt5", "modorganizer-uibase", "modorganizer-game_features"], True),
111112
(config['Main_Author'], "modorganizer-installer_ncc", "installer_ncc", config['Build_Branch'], ["Qt5", "modorganizer-uibase", "ncc", "modorganizer-game_features"], True),
112113
(config['Main_Author'], "modorganizer-bsa_extractor", "bsa_extractor", config['Build_Branch'], ["Qt5", "modorganizer-uibase", "modorganizer-bsatk"], True),
113114
(config['Main_Author'], "modorganizer-plugin_python", "plugin_python", config['Build_Branch'], ["Qt5", "boost", "modorganizer-uibase", "modorganizer-game_features",

patches/pyqt5_configure.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- builder.py (date 1575938575861)
22
+++ builder.py (date 1575938575861)
3-
@@ -386,17 +386,29 @@
3+
@@ -441,17 +441,29 @@
44
'QMAKE_LFLAGS += -Wl,--version-script={}.exp'.format(
55
buildable.target))
66

unibuild/modules/msbuild.py

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ def process(self, progress):
8989
"/consoleloggerparameters:Summary",
9090
"/fileLogger",
9191
"/property:RunCodeAnalysis=false",
92+
"/restore",
9293
"/fileloggerparameters:Summary;Verbosity=" + lverbosity]
9394

9495

unibuild/projects/lz4.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def upgrade_args():
5050
os.path.join(lz_path, "visual", "VS2017", 'lz4.sln'),
5151
"/upgrade"]
5252
return [os.path.join(get_visual_studio(config["vs_version"]), "..", "..", "..", "Common7", "IDE", "devenv.exe"),
53-
os.path.join(lz_path, "visual", "VS2017", 'lz4.sln'), "/upgrade"]
53+
os.path.join(lz_path, "build", "VS2017", 'lz4.sln'), "/upgrade"]
5454

5555

5656
def copy_binaries(context):
@@ -59,7 +59,7 @@ def copy_binaries(context):
5959
os.path.join(lz_path, "bin")
6060
)
6161
shutil.copytree(
62-
os.path.join(lz_path, "visual", "VS2017", "bin", "{}_Release".format(bitness())),
62+
os.path.join(lz_path, "build", "VS2017", "bin", "{}_Release".format(bitness())),
6363
os.path.join(lz_path, "bin")
6464
)
6565
return True
@@ -97,7 +97,7 @@ def copy_binaries(context):
9797
copy_binaries
9898
).depend(
9999
msbuild.MSBuild(
100-
os.path.join(lz_path, "visual", "VS2017", 'lz4.sln'),
100+
os.path.join(lz_path, "build", "VS2017", 'lz4.sln'),
101101
project="liblz4-dll",
102102
working_directory=lazy.Evaluate(lambda: os.path.join(lz_path)),
103103
reltarget="Release"

0 commit comments

Comments
 (0)