Change gtest branch from master to main

Add Nehrim repo

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),
@@ -147,7 +150,7 @@ for author, git_path, path, branch, dependencies, Build in [
                                                 "#define VER_FILEVERSION_STR.*\n",
                                                 "#define VER_FILEVERSION_STR \"{}\"\n"
                                                 .format(config['override_build_version']))
- 
+
         #begin build
         vs_cmake_step = cmake.CMakeVS().arguments(cmake_param).install()
 
@@ -232,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"))

targets.md

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

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))))