Add note to README to redirect to mob.

Update Trosski stylesheets

README.md

@@ -1,4 +1,9 @@
-[![Python Check status](https://ci.appveyor.com/api/projects/status/ev4wj7qmscr5b09d?svg=true)](https://ci.appveyor.com/project/Modorganizer2/modorganizer-umbrella)
+<!-- [![Python Check status](https://ci.appveyor.com/api/projects/status/ev4wj7qmscr5b09d?svg=true)](https://ci.appveyor.com/project/Modorganizer2/modorganizer-umbrella) -->
+[![No Maintenance Intended](https://unmaintained.tech/badge.svg)](https://unmaintained.tech/)
+
+> Tthis repository is archived and obsolete, see
+> https://github.com/ModOrganizer2/mob if you want to build ModOrganizer2.
+
 
 # modorganizer-umbrella
 An umbrella- (super-) project for [modorganizer](https://github.com/Modorganizer2/modorganizer).
@@ -18,7 +23,7 @@ Open there a console and copy in: ``git clone https://github.com/Modorganizer2/m
 Now you need to install all required software to build Mod Organizer.
 
 #### Manual Requirements
-* Qt 5.15.0: [Download Manager](http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe)
+* Qt 5.15.2: [Download Manager](http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe)
   #### Qt Packages required:
   * msvc2019-64
   * qtwebengine

config.py

@@ -81,37 +81,37 @@ config = {
 
     # manualy set all versions
     '7zip_version': '19.00',
-    'boost_version': '1.74.0',
+    'boost_version': '1.75.0',
     'boost_version_tag': '',
-    'fmt_version': '7.0.3',
+    'fmt_version': '7.1.3',
     'googletest_version': '1.8.0', # unused. We use the latest source
     'grep_version': '3.3',
-    'icu_version': '67',
-    'icu_version_minor': '1',
-    'loot_version': '0.16.1',
-    'loot_commit': 'gd8c9b98',
-    'loot_branch': '0.16.1',
-    'lz4_version': '1.9.2',
+    'icu_version': '68',
+    'icu_version_minor': '2',
+    'loot_version': '0.17.1',
+    'loot_commit': 'ge670605',
+    'loot_branch': '0.17.1',
+    'lz4_version': '1.9.3',
     'lz4_version_minor': '', # leave empty if no patch version (1.2.3.x)
     'nasm_version': '2.15.05',
-    'nuget_version': '5.7.0',
+    'nuget_version': '5.8.1',
     'nmm_version': '0.71.2',
-    'openssl_version': '1.1.1h',
-    'pyqt_version': '5.15.1',
-    'pyqt_pypi_hash': '1d/31/896dc3dfb6c81c70164019a6cbba6ab037e3af7653d9ca60ccc874ee4c27',
+    'openssl_version': '1.1.1i',
+    'pyqt_version': '5.15.2',
+    'pyqt_pypi_hash': '28/6c/640e3f5c734c296a7193079a86842a789edb7988dca39eab44579088a1d1',
     'pyqt_dev_version': '', # leave empty for a standard release
-    'pyqt_builder_version': '1.5.0',
+    'pyqt_builder_version': '1.7.0',
     'pyqt_sip_version': '12.8.1',
     'python_version': '3.8',
-    'python_version_minor': '.6',
+    'python_version_minor': '.7',
     'bzip2_version': '1.0.6', # For python
-    'sip_version': '5.4.0',
+    'sip_version': '5.5.0',
     'sip_dev_version': '', # leave empty for a standard release
-    'spdlog_version': 'v1.8.0',
+    'spdlog_version': 'v1.8.2',
     'qt_version': '5.15',
-    'qt_version_minor': '0',
+    'qt_version_minor': '2',
     'qt_version_appveyor': '5.15',
-    'qt_version_minor_appveyor': '1',
+    'qt_version_minor_appveyor': '2',
     'qt_vs_version': '16.0',
     'vc_platformtoolset': 'v142',
     'vc_TargetPlatformVersion': '10.0.19041.0',
@@ -127,6 +127,10 @@ config = {
     'paper-automata_version': '2.2',
     'paper-mono_version': '2.1',
     '1809-dark-mode_version': '2.0',
+    'ModOrganizer_Style_Morrowind_version': '1.1',
+    'Mod-Organizer-2-Skyrim-Stylesheet_version': '1.1',
+    'ModOrganizer_Style_Fallout3_version': '1.1',
+    'Mod-Organizer2-Fallout-4-Stylesheet_version': '1.1',
 
     #the usvfs version below will only be used if
     'usvfs_version': 'v0.4.8',

makefile.uni.py

@@ -66,6 +66,9 @@ for author, git_path, path, branch, dependencies, Build in [
     (config['Main_Author'], "modorganizer-game_oblivion", "game_oblivion", config['Build_Branch'], ["Qt5", "modorganizer-uibase",
                                                                                                    "modorganizer-game_gamebryo",
                                                                                                    "modorganizer-game_features"], True),
+    (config['Main_Author'], "modorganizer-game_nehrim", "game_nehrim", config['Build_Branch'], ["Qt5", "modorganizer-uibase",
+                                                                                                "modorganizer-game_gamebryo",
+                                                                                                "modorganizer-game_features"], True),
     (config['Main_Author'], "modorganizer-game_fallout3", "game_fallout3", config['Build_Branch'], ["Qt5", "modorganizer-uibase",
                                                                                                    "modorganizer-game_gamebryo",
                                                                                                    "modorganizer-game_features"], True),
@@ -107,6 +110,8 @@ for author, git_path, path, branch, dependencies, Build in [
     (config['Main_Author'], "modorganizer-installer_quick", "installer_quick", config['Build_Branch'], ["Qt5", "modorganizer-uibase", "modorganizer-game_features"], True),
     (config['Main_Author'], "modorganizer-installer_fomod", "installer_fomod", config['Build_Branch'], ["Qt5", "modorganizer-uibase", "modorganizer-game_features"], True),
     (config['Main_Author'], "modorganizer-installer_fomod_csharp", "installer_fomod_csharp", config['Build_Branch'], ["Qt5", "modorganizer-uibase", "modorganizer-game_features"], True),
+    (config['Main_Author'], "modorganizer-installer_wizard", "installer_wizard", config['Build_Branch'], ["Python", "PyQt5"], True),
+    (config['Main_Author'], "modorganizer-installer_omod", "installer_omod", config["Build_Branch"], ["Qt5", "modorganizer-uibase", "modorganizer-game_features"], True),
     (config['Main_Author'], "modorganizer-installer_ncc", "installer_ncc", config['Build_Branch'], ["Qt5", "modorganizer-uibase", "ncc", "modorganizer-game_features"], True),
     (config['Main_Author'], "modorganizer-bsa_extractor", "bsa_extractor", config['Build_Branch'], ["Qt5", "modorganizer-uibase", "modorganizer-bsatk"], True),
     (config['Main_Author'], "modorganizer-plugin_python", "plugin_python", config['Build_Branch'], ["Qt5", "boost", "modorganizer-uibase", "modorganizer-game_features",
@@ -129,7 +134,7 @@ for author, git_path, path, branch, dependencies, Build in [
                                                                                     "modorganizer-lootcli",
                                                                                     "usvfs", "githubpp",
                                                                                     "ncc", "openssl",
-                                                                                    "paper-light-and-dark", "paper-automata", "paper-mono", "1809-dark-mode"], True),
+                                                                                    "paper-light-and-dark", "paper-automata", "paper-mono", "1809-dark-mode", "ModOrganizer_Style_Morrowind"], True),
 ]:
     cmake_param = cmake_parameters() + ["-DCMAKE_INSTALL_PREFIX:PATH={}".format(config["paths"]["install"])]
     # build_step = cmake.CMake().arguments(cmake_param).install()
@@ -146,57 +151,30 @@ for author, git_path, path, branch, dependencies, Build in [
                                                 "#define VER_FILEVERSION_STR \"{}\"\n"
                                                 .format(config['override_build_version']))
 
-        if config['Appveyor_Build']:
-            appveyor_cmake_step = cmake.CMakeJOM().arguments(cmake_param).install()
+        #begin build
+        vs_cmake_step = cmake.CMakeVS().arguments(cmake_param).install()
 
-            if git_path != "cmake_common":
-                appveyor_cmake_step.depend("cmake_common")
+        if git_path != "cmake_common":
+            vs_cmake_step.depend("cmake_common")
 
-            for dep in dependencies:
-                appveyor_cmake_step.depend(dep)
+        for dep in dependencies:
+            vs_cmake_step.depend(dep)
 
-            pr_label = None
-            if os.getenv('APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH') is not None:
-                pr_user = os.getenv('APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME', '').split('/')[0]
-                pr_label = '{}:{}'.format(pr_user, os.getenv('APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH'))
+        #vs_target = "Clean;Build" if config['rebuild'] else "Build"
+        vs_msbuild_step = msbuild.MSBuild(os.path.join("vsbuild", "INSTALL.vcxproj"), None, None,
+                                          "{}".format("x64" if config['architecture'] == 'x86_64' else "x86"),
+                                          config['build_type'])
 
-            if os.getenv("APPVEYOR_PROJECT_NAME","") == git_path:
-                source_retrieval_step = appveyor.SetProjectFolder(os.getenv("APPVEYOR_BUILD_FOLDER", ""))
-            else:
-                source_retrieval_step = github.Source(author, git_path, branch, feature_branch=config['Feature_Branch'], super_repository=tl_repo,pr_label=pr_label).set_destination(path)
+        source_retrieval_step = github.Source(author, git_path, branch, feature_branch=config['Feature_Branch'], super_repository=tl_repo).set_destination(path)
 
-            if git_path == "modorganizer" and config['override_build_version']:
-                #add patching step that depends on source retrieval
-                patch_version_step.depend(source_retrieval_step)
-                appveyor_cmake_step.depend(patch_version_step)
-            else:
-                appveyor_cmake_step.depend(source_retrieval_step)
-
-            project.depend(appveyor_cmake_step)
+        if git_path == "modorganizer" and config['override_build_version']:
+            #add patching step that depends on source retrieval
+            patch_version_step.depend(source_retrieval_step)
+            vs_cmake_step.depend(patch_version_step)
         else:
-            vs_cmake_step = cmake.CMakeVS().arguments(cmake_param).install()
+            vs_cmake_step.depend(source_retrieval_step)
 
-            if git_path != "cmake_common":
-                vs_cmake_step.depend("cmake_common")
-
-            for dep in dependencies:
-                vs_cmake_step.depend(dep)
-
-            #vs_target = "Clean;Build" if config['rebuild'] else "Build"
-            vs_msbuild_step = msbuild.MSBuild(os.path.join("vsbuild", "INSTALL.vcxproj"), None, None,
-                                              "{}".format("x64" if config['architecture'] == 'x86_64' else "x86"),
-                                              config['build_type'])
-
-            source_retrieval_step = github.Source(author, git_path, branch, feature_branch=config['Feature_Branch'], super_repository=tl_repo).set_destination(path)
-
-            if git_path == "modorganizer" and config['override_build_version']:
-                #add patching step that depends on source retrieval
-                patch_version_step.depend(source_retrieval_step)
-                vs_cmake_step.depend(patch_version_step)
-            else:
-                vs_cmake_step.depend(source_retrieval_step)
-
-            project.depend(vs_msbuild_step.depend(vs_cmake_step))
+        project.depend(vs_msbuild_step.depend(vs_cmake_step))
     else:
         project.depend(github.Source(author, git_path, branch, feature_branch=config['Feature_Branch'], super_repository=tl_repo)
                        .set_destination(path))
@@ -257,12 +235,12 @@ def copy_licenses(context):
         sip_path = os.path.join(build_path, "sip-{}".format(config['sip_version']))
     shutil.copy(os.path.join(sip_path, "LICENSE"), os.path.join(license_path, "sip.txt"))
     shutil.copy(os.path.join(sip_path, "LICENSE-GPL2"), os.path.join(license_path, "GPL-v2.0.txt"))
+    # license path is different in the prebuilt archive
     if config['Appveyor_Build']:
-        shutil.copy(os.path.join(build_path, "modorganizer_super", "lootcli", "build", "src", "external", "src", "cpptoml", "LICENSE"), os.path.join(license_path, "cpptoml.txt"))
         shutil.copy(os.path.join(build_path, "python-{}{}".format(config['python_version'], config['python_version_minor']),"Licenses","Python","LICENSE"), os.path.join(license_path, "python.txt"))
     else:
-        shutil.copy(os.path.join(build_path, "modorganizer_super", "lootcli", "vsbuild", "src", "external", "src", "cpptoml", "LICENSE"), os.path.join(license_path, "cpptoml.txt"))
         shutil.copy(os.path.join(build_path, "python-{}{}".format(config['python_version'], config['python_version_minor']),"LICENSE"), os.path.join(license_path, "python.txt"))
+    shutil.copy(os.path.join(build_path, "modorganizer_super", "lootcli", "vsbuild", "src", "external", "src", "cpptoml", "LICENSE"), os.path.join(license_path, "cpptoml.txt"))
     shutil.copy(os.path.join(build_path, "openssl-{}".format(config['openssl_version']), "LICENSE"), os.path.join(license_path, "openssl.txt"))
 
     shutil.copy(os.path.join(build_path, "boost_{}".format(boost_tag_version.replace(".", "_")), "LICENSE_1_0.txt"), os.path.join(license_path, "boost.txt"))

patches/pyqt5_configure.patch

@@ -1,6 +1,6 @@
 --- builder.py	(date 1575938575861)
 +++ builder.py	(date 1575938575861)
-@@ -386,17 +386,29 @@
+@@ -441,17 +441,29 @@
                      'QMAKE_LFLAGS += -Wl,--version-script={}.exp'.format(
                              buildable.target))
  

targets.md

@@ -50,6 +50,8 @@ modorganizer-game_gamebryo
 
 modorganizer-game_oblivion
 
+modorganizer-game_nehrim
+
 modorganizer-game_fallout3
 
 modorganizer-game_fallout4

unibuild/modules/msbuild.py

@@ -89,6 +89,7 @@ class MSBuild(Builder):
                           "/consoleloggerparameters:Summary",
                           "/fileLogger",
                           "/property:RunCodeAnalysis=false",
+                          "/restore",
                           "/fileloggerparameters:Summary;Verbosity=" + lverbosity]
 
 

unibuild/projects/googletest.py

@@ -22,5 +22,5 @@ from unibuild.modules import cmake, github, build
 
 Project("GTest") \
   .depend(cmake.CMake().arguments(["-DCMAKE_BUILD_TYPE={0}".format(config["build_type"])])
-    .depend(github.Source("google", "googletest", "master")))
+    .depend(github.Source("google", "googletest", "main")))
       #.depend(github.Source("google", "googletest", "release-{}".format(googletest_version))))

unibuild/projects/lz4.py

@@ -50,7 +50,7 @@ def upgrade_args():
                 os.path.join(lz_path, "visual", "VS2017", 'lz4.sln'),
                 "/upgrade"]
     return [os.path.join(get_visual_studio(config["vs_version"]), "..", "..", "..", "Common7", "IDE", "devenv.exe"),
-            os.path.join(lz_path, "visual", "VS2017", 'lz4.sln'), "/upgrade"]
+            os.path.join(lz_path, "build", "VS2017", 'lz4.sln'), "/upgrade"]
 
 
 def copy_binaries(context):
@@ -59,7 +59,7 @@ def copy_binaries(context):
             os.path.join(lz_path, "bin")
         )
     shutil.copytree(
-        os.path.join(lz_path, "visual", "VS2017", "bin", "{}_Release".format(bitness())),
+        os.path.join(lz_path, "build", "VS2017", "bin", "{}_Release".format(bitness())),
         os.path.join(lz_path, "bin")
     )
     return True
@@ -97,7 +97,7 @@ else:
                     copy_binaries
                 ).depend(
                     msbuild.MSBuild(
-                        os.path.join(lz_path, "visual", "VS2017", 'lz4.sln'),
+                        os.path.join(lz_path, "build", "VS2017", 'lz4.sln'),
                         project="liblz4-dll",
                         working_directory=lazy.Evaluate(lambda: os.path.join(lz_path)),
                         reltarget="Release"

unibuild/projects/stylesheets.py

@@ -47,8 +47,8 @@ def copy_stylesheets(context, dir):
     copytree_fixed(src, dst)
     return True
 
-def create_stylesheet_project(author, name, filename=None, extension="7z"):
-    version = "v" + config[name + "_version"]
+def create_stylesheet_project(author, name, filename=None, version_prefix="", extension="7z"):
+    version = version_prefix + config[name + "_version"]
     if filename is None:
         filename = config[name + "_version"]
     dir = name + "-" + version
@@ -57,7 +57,11 @@ def create_stylesheet_project(author, name, filename=None, extension="7z"):
         .depend(build.Execute(lambda context: copy_stylesheets(context, dir))
         .depend(github.Release(author, name, version, filename, extension)))
 
-create_stylesheet_project("6788-00", "paper-light-and-dark")
-create_stylesheet_project("6788-00", "paper-automata", "Paper-Automata")
-create_stylesheet_project("6788-00", "paper-mono", "Paper-Mono")
-create_stylesheet_project("6788-00", "1809-dark-mode")
+create_stylesheet_project("6788-00", "paper-light-and-dark", version_prefix="v")
+create_stylesheet_project("6788-00", "paper-automata", "Paper-Automata", version_prefix="v")
+create_stylesheet_project("6788-00", "paper-mono", "Paper-Mono", version_prefix="v")
+create_stylesheet_project("6788-00", "1809-dark-mode", version_prefix="v")
+create_stylesheet_project("Trosski", "ModOrganizer_Style_Morrowind", "Morrowind-MO2-Stylesheet")
+create_stylesheet_project("Trosski", "Mod-Organizer-2-Skyrim-Stylesheet", "Skyrim-MO2-Stylesheet", version_prefix="v")
+create_stylesheet_project("Trosski", "ModOrganizer_Style_Fallout3", "Fallout3-MO2-Stylesheet", version_prefix="v")
+create_stylesheet_project("Trosski", "Mod-Organizer2-Fallout-4-Stylesheet", "Fallout4-MO2-Stylesheet", version_prefix="v")