Refactor build system, move src folder to top level

Author: Faless

godot-git-plugin/.editorconfig .editorconfiggodot-git-plugin/.editorconfig renamed to .editorconfig

@@ -10,6 +10,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: DoozyX/clang-format-lint-action@v0.18.2
         with:
-          source: "godot-git-plugin/src"
+          source: "src"
           extensions: "h,cpp"
           clangFormatVersion: 18

.github/workflows/clang-format.yml

@@ -19,11 +19,7 @@ extension_api.json
 
 # Binaries
 __pycache__/
-build/
-bin/
-macos/
-linux/
-win64/
+/bin/
 *.lib
 *.a
 *.obj

.gitignore

@@ -2,12 +2,12 @@
 	path = godot-cpp
 	url = https://github.com/godotengine/godot-cpp
 [submodule "thirdparty/git2/libgit2"]
-	path = thirdparty/git2/libgit2
-	url = https://github.com/libgit2/libgit2
+	path = thirdparty/libgit2
+	url = https://github.com/libgit2/libgit2.git
 	ignore = untracked
 [submodule "thirdparty/ssh2/libssh2"]
-	path = thirdparty/ssh2/libssh2
-	url = https://github.com/libssh2/libssh2
+	path = thirdparty/libssh2
+	url = https://github.com/libssh2/libssh2.git
 [submodule "thirdparty/mbedtls"]
 	path = thirdparty/mbedtls
 	url = https://github.com/Mbed-TLS/mbedtls.git

.gitmodules

@@ -2,18 +2,12 @@
 
 import os
 
-EnsureSConsVersion(3, 1, 2)
-EnsurePythonVersion(3, 6)
+EnsureSConsVersion(3, 0, 0)
+EnsurePythonVersion(3, 5)
 
 opts = Variables([], ARGUMENTS)
 
-env = Environment(ENV=os.environ)
-
-# Define our options
-opts.Add(PathVariable("target_path",
-         "The path where the lib is installed.", "addons/godot-git-plugin/"))
-opts.Add(PathVariable("target_name", "The library name.",
-         "libgit_plugin", PathVariable.PathAccept))
+env = Environment()
 
 # Updates the environment with the option variables.
 opts.Update(env)
@@ -23,28 +17,36 @@ if ARGUMENTS.get("custom_api_file", "") != "":
 
 ARGUMENTS["target"] = "editor"
 env = SConscript("godot-cpp/SConstruct").Clone()
-env.PrependENVPath("PATH", os.getenv("PATH"))  # Prepend PATH, done upstream in recent godot-cpp verions.
 
-# Force linking with LTO on windows MSVC, silence the linker complaining that libgit uses LTO but we are not linking with it.
+# Prepend PATH to allow using custom toolchains, done upstream in recent godot-cpp verions.
+env.PrependENVPath("PATH", os.getenv("PATH"))
+
 if env["platform"] == "windows" and env.get("is_msvc", False):
+    # Force linking with LTO on windows MSVC, silence the linker complaining that libgit uses LTO but we are not linking with it.
     env.AppendUnique(LINKFLAGS=["/LTCG"])
+    # Do not treat empty pdb as errors.
+    env.AppendUnique(LINKFLAGS=["/IGNORE:4099"])
 
 env.Tool("cmake", toolpath=["tools"])
 env.Tool("mbedtls", toolpath=["tools"])
 env.Tool("ssh2", toolpath=["tools"])
 env.Tool("git2", toolpath=["tools"])
 
-opts.Update(env)
-
 mbedtls = env.BuildMbedTLS()
 ssh2 = env.BuildSSH2(mbedtls)
 mbedtls += ssh2
 git2 = env.BuildGIT2(mbedtls)
 
-Export("mbedtls")
-Export("env")
+env.Append(CPPPATH=[".", "src/"])
+env.Append(CPPPATH=["#thirdparty/git2/libgit2/include/"])
+
+lib_sources = Glob("src/*.cpp")
+env.Depends(lib_sources, mbedtls)
 
-SConscript("godot-git-plugin/SCsub")
+library = env.SharedLibrary(
+    target="bin/addons/godot-git-plugin/lib/libgit_plugin{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
+    source=lib_sources
+)
+extension = env.InstallAs("bin/addons/godot-git-plugin/git_plugin.gdextension", "misc/git_plugin.gdextension")
 
-# Generates help for the -h scons option.
-Help(opts.GenerateHelpText(env))
+Default(library + extension)

SConstruct

@@ -0,0 +1,16 @@
+[configuration]
+
+entry_symbol = "git_plugin_init"
+compatibility_minimum = "4.1.0"
+
+[libraries]
+
+macos.editor = "lib/libgit_plugin.macos.editor.universal.dylib"
+windows.editor.x86_32 = "lib/libgit_plugin.windows.editor.x86_32.dll"
+windows.editor.x86_64 = "lib/libgit_plugin.windows.editor.x86_64.dll"
+windows.editor.arm64 = "lib/libgit_plugin.windows.editor.arm64.dll"
+linux.editor.x86_32 = "lib/libgit_plugin.linux.editor.x86_32.so"
+linux.editor.x86_64 = "lib/libgit_plugin.linux.editor.x86_64.so"
+linux.editor.arm32 = "lib/libgit_plugin.linux.editor.arm32.so"
+linux.editor.arm64 = "lib/libgit_plugin.linux.editor.arm64.so"
+linux.editor.rv64 = ""