03806d0b67
This commit implements described in the #104573. The goal is to fix the confusion of the submodule hashes change, which are not ideal for any of the supported git-module configuration (they are either always visible causing confusion, or silently staged and committed, also causing confusion). This commit replaces submodules with a checkout of addons and addons_contrib, covered by the .gitignore, and locale and developer tools are moved to the main repository. This also changes the paths: - /release/scripts are moved to the /scripts - /source/tools are moved to the /tools - /release/datafiles/locale is moved to /locale This is done to avoid conflicts when using bisect, and also allow buildbot to automatically "recover" wgen building older or newer branches/patches. Running `make update` will initialize the local checkout to the changed repository configuration. Another aspect of the change is that the make update will support Github style of remote organization (origin remote pointing to thy fork, upstream remote pointing to the upstream blender/blender.git). Pull Request #104755
94 lines
2.3 KiB
Python
Executable File
94 lines
2.3 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
import os
|
|
import sys
|
|
|
|
PWD = os.path.dirname(__file__)
|
|
sys.path.append(os.path.join(PWD, "modules"))
|
|
|
|
from batch_edit_text import run
|
|
|
|
from typing import (
|
|
Optional,
|
|
)
|
|
|
|
SOURCE_DIR = os.path.normpath(os.path.abspath(os.path.normpath(os.path.join(PWD, "..", "..", ".."))))
|
|
|
|
# TODO, move to config file
|
|
SOURCE_DIRS = (
|
|
"source",
|
|
"intern/ghost",
|
|
)
|
|
|
|
SOURCE_EXT = (
|
|
# C/C++
|
|
".c", ".h", ".cpp", ".hpp", ".cc", ".hh", ".cxx", ".hxx", ".inl",
|
|
# Objective C
|
|
".m", ".mm",
|
|
)
|
|
|
|
|
|
def sort_struct_lists(fn: str, data_src: str) -> Optional[str]:
|
|
import re
|
|
|
|
# eg:
|
|
# struct Foo;
|
|
re_match_struct = re.compile(r"struct\s+[A-Za-z_][A-Za-z_0-9]*\s*;")
|
|
# eg:
|
|
# struct Foo Bar;
|
|
re_match_struct_type = re.compile(r"struct\s+[A-Za-z_][A-Za-z_0-9]*\s+[A-Za-z_][A-Za-z_0-9]*\s*;")
|
|
|
|
# typedef struct Foo Bar;
|
|
re_match_typedef_struct_type = re.compile(
|
|
r"typedef\s+struct\s+[A-Za-z_][A-Za-z_0-9]*\s+[A-Za-z_][A-Za-z_0-9]*\s*;")
|
|
|
|
re_match_enum = re.compile(r"enum\s+[A-Za-z_][A-Za-z_0-9]*\s*;")
|
|
|
|
# eg:
|
|
# extern char datatoc_splash_png[];
|
|
# re_match_datatoc = re.compile(r"extern\s+(char)\s+datatoc_[A-Za-z_].*;")
|
|
|
|
lines = data_src.splitlines(keepends=True)
|
|
|
|
def can_sort(l: str) -> Optional[int]:
|
|
if re_match_struct.match(l):
|
|
return 1
|
|
if re_match_struct_type.match(l):
|
|
return 2
|
|
if re_match_typedef_struct_type.match(l):
|
|
return 3
|
|
if re_match_enum.match(l):
|
|
return 4
|
|
# Disable for now.
|
|
# if re_match_datatoc.match(l):
|
|
# return 5
|
|
return None
|
|
|
|
i = 0
|
|
while i < len(lines):
|
|
i_type = can_sort(lines[i])
|
|
if i_type is not None:
|
|
j = i
|
|
while j + 1 < len(lines):
|
|
if can_sort(lines[j + 1]) != i_type:
|
|
break
|
|
j = j + 1
|
|
if i != j:
|
|
lines[i:j + 1] = list(sorted(lines[i:j + 1]))
|
|
i = j
|
|
i = i + 1
|
|
|
|
data_dst = "".join(lines)
|
|
if data_src != data_dst:
|
|
return data_dst
|
|
return None
|
|
|
|
|
|
run(
|
|
directories=[os.path.join(SOURCE_DIR, d) for d in SOURCE_DIRS],
|
|
is_text=lambda fn: fn.endswith(SOURCE_EXT),
|
|
text_operation=sort_struct_lists,
|
|
use_multiprocess=True,
|
|
)
|