[Bf-blender-cvs] [873003975b6] temp-bundled-assets: initial bundling

[Jacques Lucke]

Commit: 873003975b6a1895134231d0746c34b79a4f130f
Author: Jacques Lucke
Date:   Wed Jan 18 14:28:51 2023 +0100
Branches: temp-bundled-assets
https://developer.blender.org/rB873003975b6a1895134231d0746c34b79a4f130f

initial bundling

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

M	build_files/utils/make_update.py
M	source/creator/CMakeLists.txt

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

diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py
index fbadeecd597..bf01a7a7f76 100755
--- a/build_files/utils/make_update.py
+++ b/build_files/utils/make_update.py
@@ -104,6 +104,19 @@ def svn_update(args: argparse.Namespace, release_version: Optional[str]) -> None
             svn_url_tests = svn_url + lib_tests
             call(svn_non_interactive + ["checkout", svn_url_tests, lib_tests_dirpath])
 
+    lib_assets = "assets"
+    lib_assets_dirpath = os.path.join(lib_dirpath, lib_assets)
+
+    if os.path.exists(lib_assets_dirpath):
+        print_stage("Checking out Assets")
+
+        if make_utils.command_missing(args.svn_command):
+            sys.stderr.write("svn not found, can't checkout assets\n")
+            sys.exit(1)
+
+        svn_url_assets = svn_url + lib_assets
+        call(svn_non_interactive + ["checkout", svn_url_assets, lib_assets_dirpath])
+
     # Update precompiled libraries and tests
 
     if not os.path.isdir(lib_dirpath):
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 1cf908b4821..d02b8cfe4ec 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1471,6 +1471,20 @@ install(
 )
 
 
+# -----------------------------------------------------------------------------
+# Bundle assets
+
+set(ASSET_BUNDLE_DIR ${CMAKE_SOURCE_DIR}/../lib/assets)
+
+if(EXISTS "${ASSET_BUNDLE_DIR}")
+  install(
+    DIRECTORY ${ASSET_BUNDLE_DIR}
+    DESTINATION ${TARGETDIR_VER}/datafiles
+    PATTERN ".svn" EXCLUDE
+  )
+endif()
+
+
 # -----------------------------------------------------------------------------
 # Setup link libraries