diff --git a/.gitignore b/.gitignore index e40481e459..3150104e6c 100644 --- a/.gitignore +++ b/.gitignore @@ -274,3 +274,6 @@ BuildFiles/Mac/Space Station 14.app/Contents/MacOS/GodotSharpTools.dll BuildFiles/Mac/Space Station 14.app/Contents/MacOS/mscorlib.dll BuildFiles/Mac/Space Station 14.app/Contents/MacOS/libmonosgen-2.0.dylib BuildFiles/Windows/Godot/* + +# Working on the tools scripts is getting annoying okay? +.mypy_cache/ diff --git a/BuildChecker/.gitignore b/BuildChecker/.gitignore index 9e51762ac6..97fb21bb98 100644 --- a/BuildChecker/.gitignore +++ b/BuildChecker/.gitignore @@ -1 +1,2 @@ INSTALLED_HOOKS_VERSION +DISABLE_SUBMODULE_AUTOUPDATE diff --git a/BuildChecker/git_helper.py b/BuildChecker/git_helper.py index 53bdc103f7..329acbba8e 100644 --- a/BuildChecker/git_helper.py +++ b/BuildChecker/git_helper.py @@ -9,9 +9,11 @@ from pathlib import Path from typing import List SOLUTION_PATH = Path("..") / "SpaceStation14Content.sln" -CURRENT_HOOKS_VERSION = "1" # If this doesn't match the saved version we overwrite them all. +# If this doesn't match the saved version we overwrite them all. +CURRENT_HOOKS_VERSION = "2" QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet" + def run_command(command: List[str], capture: bool = False) -> subprocess.CompletedProcess: """ Runs a command with pretty output. @@ -40,6 +42,9 @@ def update_submodules(): Updates all submodules. """ + if os.path.isfile("DISABLE_SUBMODULE_AUTOUPDATE"): + return + # If the status doesn't match, force VS to reload the solution. # status = run_command(["git", "submodule", "status"], capture=True) run_command(["git", "submodule", "update", "--init", "--recursive"]) @@ -50,6 +55,7 @@ def update_submodules(): # print("Git submodules changed. Reloading solution.") # reset_solution() + def install_hooks(): """ Installs the necessary git hooks into .git/hooks. @@ -77,7 +83,8 @@ def install_hooks(): for filename in os.listdir(str(hooks_source_dir)): print("Copying hook {}".format(filename)) - shutil.copyfile(str(hooks_source_dir/filename), str(hooks_target_dir/filename)) + shutil.copyfile(str(hooks_source_dir/filename), + str(hooks_target_dir/filename)) def reset_solution(): @@ -91,6 +98,7 @@ def reset_solution(): with SOLUTION_PATH.open("w") as f: f.write(content) + if __name__ == '__main__': install_hooks() update_submodules() diff --git a/BuildChecker/hooks/post-checkout b/BuildChecker/hooks/post-checkout old mode 100644 new mode 100755 diff --git a/BuildChecker/hooks/post-merge b/BuildChecker/hooks/post-merge old mode 100644 new mode 100755 diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index 59d37c9658..3bb92d3a11 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -3,7 +3,7 @@ Debug - AnyCPU + x64 {A2E5F175-78AF-4DDD-8F97-E2D2552372ED} Library Properties @@ -107,4 +107,4 @@ - \ No newline at end of file + diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj index 400a41d82d..001f2bb0a2 100644 --- a/Content.Server/Content.Server.csproj +++ b/Content.Server/Content.Server.csproj @@ -3,7 +3,7 @@ Debug - AnyCPU + x64 {B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A} Library Properties @@ -135,4 +135,4 @@ - \ No newline at end of file + diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index 24981255e4..7fbb85f6de 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -3,7 +3,7 @@ Debug - AnyCPU + x64 {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5} Library Properties @@ -97,4 +97,4 @@ - \ No newline at end of file + diff --git a/README.md b/README.md index 6b6a3f3ad3..32a9cb153a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # space-station-14-content -This is the primary content repo for Space Station 14. To prevent people forking the engine, a "content" pack is loaded by the client and server. This content contains everything needed to play the game on one specific server. \ No newline at end of file +This is the primary content repo for Space Station 14. To prevent people forking the engine, a "content" pack is loaded by the client and server. This content contains everything needed to play the game on one specific server.