Switch SVN to Git submodules using Git-LFS #117946

Sergey Sharybin · 2024-02-07T16:21:02+01:00

Sergey Sharybin commented

2024-02-07 16:21:02 +01:00

This change makes it so build system and update utilities for Blender builds
are using pre-compiled libraries and other resources attached as Git modules
instead of using checkout of SVN repositories in the parent folder.

The directory layout:

  * release/datafiles/
    * assets/        -> blender-assets.git
      * publish/
      * ...
      * README.txt
  * lib/
    * darwin_x64/    -> lib-darwin_x64.git
    * darwin_arm64/  -> lib-darwin_arm64.git
    * linux_x64/     -> lib-linux_x64.git
    * windows_x64/   -> lib-windows_x64.git
  * tests/
    * data/         -> blender-test-data.git

The changes about configuring the actual Git sub-modules are not included
into this patch, as those require repository to actually exist before it
can be used.

The assets submodule is enabled by default, and the rest of them are
disabled. This means that if someone runs git submodule update --init
they will not get heavy libraries. The platform-specific and tests
related submodules are enabled when using make update or make test.

All the submodules are tracked: this means that when new commits are
done to the submodule, the blender.git repository is to be updated to
point them to the new hash. This causes some extra manual work, but it
allows to more easily update Blender and its dependencies to known good
state when performing operations like bisect.

Ref #108978

This change makes it so build system and update utilities for Blender builds are using pre-compiled libraries and other resources attached as Git modules instead of using checkout of SVN repositories in the parent folder. The directory layout: ``` * release/datafiles/ * assets/ -> blender-assets.git * publish/ * ... * README.txt * lib/ * darwin_x64/ -> lib-darwin_x64.git * darwin_arm64/ -> lib-darwin_arm64.git * linux_x64/ -> lib-linux_x64.git * windows_x64/ -> lib-windows_x64.git * tests/ * data/ -> blender-test-data.git ``` The changes about configuring the actual Git sub-modules are not included into this patch, as those require repository to actually exist before it can be used. The assets submodule is enabled by default, and the rest of them are disabled. This means that if someone runs `git submodule update --init` they will not get heavy libraries. The platform-specific and tests related submodules are enabled when using `make update` or `make test`. All the submodules are tracked: this means that when new commits are done to the submodule, the blender.git repository is to be updated to point them to the new hash. This causes some extra manual work, but it allows to more easily update Blender and its dependencies to known good state when performing operations like bisect. Ref #108978

🚀 1

Sergey Sharybin referenced this pull request

2024-02-07 16:28:43 +01:00

Migration of libraries to Git LFS #108978

Sergey Sharybin force-pushed lib_git_lfs from f95ac48083 to 35e3387bef

2024-02-22 13:41:01 +01:00

Compare

Sergey changed target branch from main to blender-v4.1-release

2024-02-22 13:41:13 +01:00

Sergey Sharybin added 2 commits 2024-02-22 13:45:15 +01:00

4798b75af6 Add submodules for libraries

a406dba1b9 Add configuration for submodules