[Bf-blender-cvs] [cf8773b525e] master: Cleanup: remove make_quicky and enum generation utilities

Campbell Barton noreply at git.blender.org
Mon Apr 12 04:05:11 CEST 2021


Commit: cf8773b525ecf4fc00fca967eb879606b53d4fde
Author: Campbell Barton
Date:   Mon Apr 12 11:56:54 2021 +1000
Branches: master
https://developer.blender.org/rBcf8773b525ecf4fc00fca967eb879606b53d4fde

Cleanup: remove make_quicky and enum generation utilities

- Remove `make_quicky` as on modern systems linking is the main
  bottleneck, and there isn't such a gain from partial builds.

- Remove enum generator as `PyC_StringEnumItems` & `EnumPropertyItem`
  are used in most places to access enums from Python, otherwise macros
  are added via macros.

===================================================================

D	build_files/cmake/example_scripts/make_quicky.py
D	source/blender/python/simple_enum_gen.py

===================================================================

diff --git a/build_files/cmake/example_scripts/make_quicky.py b/build_files/cmake/example_scripts/make_quicky.py
deleted file mode 100755
index 51985e930ae..00000000000
--- a/build_files/cmake/example_scripts/make_quicky.py
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env python3
-
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-
-def print_help(targets):
-    print("CMake quicky wrapper, no valid targets given.")
-    print(" * targets can contain a subset of the full target name.")
-    print(" * arguments with a '-' prefix are passed onto make.")
-    print(" * this must run from the cmake build dir")
-    print(" * alias this with a short command for speedy access, in bash:")
-    print("   alias mk='../blender/build_files/cmake/example_scripts/make_quicky.py'")
-    print("")
-    print(" eg: make_quicky.py -j3 extern python")
-    print(" ...will execute")
-    print(" make -j3 extern_binreloc extern_glew bf_python bf_python_ext blender/fast")
-    print("")
-    print("Target List:")
-    for t in targets:
-        print("    %s" % t)
-    print("...exiting")
-
-
-def main():
-    targets = set()
-
-    # collect targets
-    makefile = open("Makefile", "r")
-    for line in makefile:
-        line = line.rstrip()
-        if not line or line[0] in ". \t@$#":
-            continue
-
-        line = line.split("#", 1)[0]
-        if ":" not in line:
-            continue
-
-        line = line.split(":", 1)[0]
-
-        if "/" in line:  # cmake terget options, dont need these
-            continue
-
-        targets.add(line)
-    makefile.close()
-
-    # remove cmake targets
-    bad = set([
-        "help",
-        "clean",
-        "all",
-        "preinstall",
-        "install",
-        "default_target",
-        "edit_cache",
-        "cmake_force",
-        "rebuild_cache",
-        "depend",
-        "cmake_check_build_system",
-    ])
-
-    targets -= set(bad)
-
-    # parse args
-    targets = list(targets)
-    targets.sort()
-
-    import sys
-    if len(sys.argv) == 1:
-        print_help(targets)
-        return
-
-    targets_new = []
-    args = []
-    for arg in sys.argv[1:]:
-        if arg[0] in "/-":
-            args.append(arg)
-        else:
-            found = False
-            for t in targets:
-                if arg in t and t not in targets_new:
-                    targets_new.append(t)
-                    found = True
-
-            if not found:
-                print("Error '%s' not found in...")
-                for t in targets:
-                    print("    %s" % t)
-                print("...aborting.")
-                return
-
-    # execute
-    cmd = ["make"] + args + targets_new + ["blender/fast"]
-    print("cmake building with targets: %s" % " ".join(targets_new))
-    print("executing: %s" % " ".join(cmd))
-
-    import subprocess
-    subprocess.call(cmd)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/source/blender/python/simple_enum_gen.py b/source/blender/python/simple_enum_gen.py
deleted file mode 100644
index 861701f4b4c..00000000000
--- a/source/blender/python/simple_enum_gen.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# <pep8 compliant>
-
-defs = """
-    SPACE_EMPTY,
-    SPACE_VIEW3D,
-    SPACE_IPO,
-    SPACE_OUTLINER,
-    SPACE_BUTS,
-    SPACE_FILE,
-    SPACE_IMAGE,
-    SPACE_INFO,
-    SPACE_SEQ,
-    SPACE_TEXT,
-    SPACE_IMASEL, #Deprecated
-    SPACE_SOUND, #Deprecated
-    SPACE_ACTION,
-    SPACE_NLA,
-    SPACE_SCRIPT, #Deprecated
-    SPACE_TIME, #Deprecated
-    SPACE_NODE,
-    SPACEICONMAX
-"""
-
-print('\tmod = PyModule_New("dummy");')
-print('\tPyModule_AddObject(submodule, "key", mod);')
-
-for d in defs.split('\n'):
-
-    d = d.replace(',', ' ')
-    w = d.split()
-
-    if not w:
-        continue
-
-    try:
-        w.remove("#define")
-    except:
-        pass
-
-    # print w
-
-    val = w[0]
-    py_val = w[0]
-
-    print('\tPyModule_AddObject(mod, "%s", PyLong_FromSize_t(%s));' % (val, py_val))



More information about the Bf-blender-cvs mailing list