Blender 3.6: Switch SVN to Git submodules using Git-LFS #118628

Sergey Sharybin · 2024-02-22T17:50:46+01:00

Sergey Sharybin commented

2024-02-22 17:50:46 +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

Pull Request: #117946

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 Pull Request: https://projects.blender.org/blender/blender/pulls/117946

Sergey Sharybin added 1 commit 2024-02-22 17:50:54 +01:00

buildbot/vexp-code-patch-linux-x86_64 Build done. Details

buildbot/vexp-code-patch-lint Build done. Details

buildbot/vexp-code-patch-darwin-x86_64 Build done. Details

buildbot/vexp-code-patch-windows-amd64 Build done. Details

buildbot/vexp-code-patch-darwin-arm64 Build done. Details

buildbot/vexp-code-patch-coordinator Build done. Details

5bf0f35d90 Switch SVN to Git submodules using Git-LFS

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

Pull Request: #117946

Sergey Sharybin changed title from ~~Switch SVN to Git submodules using Git-LFS~~ to Blender 3.6: Switch SVN to Git submodules using Git-LFS

2024-02-22 17:51:10 +01:00

Sergey Sharybin commented

2024-02-22 17:51:53 +01:00

@blender-bot build

Sergey Sharybin commented

2024-02-22 18:18:30 +01:00

@blender-bot build

Sergey Sharybin added 1 commit 2024-02-22 18:30:22 +01:00

9d2c71c8b9 Fix invalid hardcoded path to LIBDIR

Was only affecting buildbot compilation.
No need to set it explicitly, the submodule takes care of it.

Sergey Sharybin added 1 commit 2024-02-22 18:41:14 +01:00

d7832342c7 Icons: Update for now toolbar icons blend file location

Sergey Sharybin added 1 commit 2024-02-22 18:42:43 +01:00

buildbot/vexp-code-patch-linux-x86_64 Build done. Details

buildbot/vexp-code-patch-lint Build done. Details

buildbot/vexp-code-patch-windows-amd64 Build done. Details

buildbot/vexp-code-patch-darwin-arm64 Build done. Details

buildbot/vexp-code-patch-darwin-x86_64 Build done. Details

buildbot/vexp-code-patch-coordinator Build done. Details

d90718c4dd make.bat: fix make update not working properly

Git escaped a quote and used all of the cli arguments as the
folder name.

Also fixes:
- Progress on the initial clone so it doesn't appear stuck
- re-detect python after updating libs, so you don't have to run
  make update twice on a fresh clone.
- Hide python not found warning unless the lib folder exists (this
  seemingly got lost in one of the merges)

Sergey Sharybin commented

2024-02-22 18:42:56 +01:00

@blender-bot build

Sergey Sharybin commented

2024-02-22 18:51:55 +01:00

@blender-bot build

Sergey Sharybin added 1 commit 2024-02-22 19:56:14 +01:00

df124d664e Update submodule hashes

Points to proper libraries with .gitignore.

Sergey Sharybin merged commit a99d9ba635 into blender-v3.6-release

2024-02-22 19:57:52 +01:00

Sergey Sharybin referenced this issue from a commit

2024-02-22 19:57:53 +01:00

Blender 3.6: Switch SVN to Git submodules using Git-LFS

Sergey Sharybin deleted branch blender36_lfs

2024-02-22 19:57:54 +01:00

Sergey Sharybin commented

2024-02-22 19:59:24 +01:00

@lichtwerk @ThomasDinges Just tagging you here, to raise awareness that the patch looked good, and has landed to 3.6.

I'll be baby-sitting the build, to ensure it is green after the land. Will leave it up to you to decide whether it needs to be mentioned in 3.6 LTS notes.

@lichtwerk @ThomasDinges Just tagging you here, to raise awareness that the patch looked good, and has landed to 3.6. I'll be baby-sitting the build, to ensure it is green after the land. Will leave it up to you to decide whether it needs to be mentioned in 3.6 LTS notes.

Bastien Montagne referenced this pull request

2024-02-22 20:26:59 +01:00

Blender LTS: Maintenance Task 3.6 #109399

Sign in to join this conversation.

No reviewers