Move tools to site_scons/site_tools, which is the canonical scons too…

…ls directory.
godotengine · Nov 19, 2024 · 00766c9 · 00766c9
1 parent c20a84e
commit 00766c9
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 3 deletions.
diff --git a/SConstruct b/SConstruct
@@ -27,7 +27,7 @@ if profile:
     elif os.path.isfile(profile + ".py"):
         customs.append(profile + ".py")
 opts = Variables(customs, ARGUMENTS)
-cpp_tool = Tool("godotcpp", toolpath=["tools"])
+cpp_tool = Tool("godotcpp", toolpath=["site_scons/site_tools"])
 cpp_tool.options(opts, env)
 opts.Update(env)
 

diff --git a/tools/android.py → site_scons/site_tools/android.py b/tools/android.py → site_scons/site_tools/android.py
diff --git a/tools/common_compiler_flags.py → ...scons/site_tools/common_compiler_flags.py b/tools/common_compiler_flags.py → ...scons/site_tools/common_compiler_flags.py
diff --git a/tools/godotcpp.py → site_scons/site_tools/godotcpp.py b/tools/godotcpp.py → site_scons/site_tools/godotcpp.py
@@ -52,8 +52,8 @@ def validate_parent_dir(key, val, env):
 def get_platform_tools_paths(env):
     path = env.get("custom_tools", None)
     if path is None:
-        return ["tools"]
-    return [normalize_path(path, env), "tools"]
+        return ["site_scons/site_tools"]
+    return [normalize_path(path, env), "site_scons/site_tools"]
 
 
 def get_custom_platforms(env):

diff --git a/tools/ios.py → site_scons/site_tools/ios.py b/tools/ios.py → site_scons/site_tools/ios.py
diff --git a/tools/linux.py → site_scons/site_tools/linux.py b/tools/linux.py → site_scons/site_tools/linux.py
diff --git a/tools/macos.py → site_scons/site_tools/macos.py b/tools/macos.py → site_scons/site_tools/macos.py
diff --git a/tools/my_spawn.py → site_scons/site_tools/my_spawn.py b/tools/my_spawn.py → site_scons/site_tools/my_spawn.py
diff --git a/tools/web.py → site_scons/site_tools/web.py b/tools/web.py → site_scons/site_tools/web.py
diff --git a/tools/windows.py → site_scons/site_tools/windows.py b/tools/windows.py → site_scons/site_tools/windows.py