Switch SVN to Git submodules using Git-LFS #117946

Merged
Sergey Sharybin merged 3 commits from Sergey/blender:lib_git_lfs into blender-v4.1-release 2024-02-22 13:51:08 +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
Sergey Sharybin force-pushed lib_git_lfs from f95ac48083 to 35e3387bef 2024-02-22 13:41:01 +01:00 Compare
Sergey Sharybin 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
Sergey Sharybin changed title from WIP: Switch SVN to Git submodules using Git-LFS to Switch SVN to Git submodules using Git-LFS 2024-02-22 13:45:30 +01:00
Sergey Sharybin merged commit 3dc832a904 into blender-v4.1-release 2024-02-22 13:51:08 +01:00
Sergey Sharybin deleted branch lib_git_lfs 2024-02-22 13:51:11 +01:00
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Viewport & EEVEE
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Module
Viewport & EEVEE
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Severity
High
Severity
Low
Severity
Normal
Severity
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#117946
No description provided.