Use Git submodule tracking feature

This way we can point submodules to different branches.

There are two side-effects to this:

- Git 1.8.2 becomes the minimal required version now
  to support this feature.

- Not sure how doing local changes in submodules followed
  by `make update` will behave. We don't use explicit rebase
  now.

  Perhaps this is not so bad, since it was already quite
  dangerous thing to do.
This commit is contained in:
Sergey Sharybin 2017-02-20 10:16:58 +01:00
parent 22119f976e
commit 86d8dc12c1
3 changed files with 6 additions and 2 deletions

4
.gitmodules vendored

@ -1,16 +1,20 @@
[submodule "release/scripts/addons"] [submodule "release/scripts/addons"]
path = release/scripts/addons path = release/scripts/addons
url = ../blender-addons.git url = ../blender-addons.git
branch = blender2.8
ignore = all ignore = all
[submodule "release/scripts/addons_contrib"] [submodule "release/scripts/addons_contrib"]
path = release/scripts/addons_contrib path = release/scripts/addons_contrib
url = ../blender-addons-contrib.git url = ../blender-addons-contrib.git
branch = master
ignore = all ignore = all
[submodule "release/datafiles/locale"] [submodule "release/datafiles/locale"]
path = release/datafiles/locale path = release/datafiles/locale
url = ../blender-translations.git url = ../blender-translations.git
branch = master
ignore = all ignore = all
[submodule "source/tools"] [submodule "source/tools"]
path = source/tools path = source/tools
url = ../blender-dev-tools.git url = ../blender-dev-tools.git
branch = master
ignore = all ignore = all

@ -402,7 +402,7 @@ update: .FORCE
svn update ../lib/* ; \ svn update ../lib/* ; \
fi fi
git pull --rebase git pull --rebase
git submodule foreach git pull --rebase origin master git submodule update --remote
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

@ -90,7 +90,7 @@ if NOT "%1" == "" (
) else if "%1" == "update" ( ) else if "%1" == "update" (
svn up ../lib/* svn up ../lib/*
git pull --rebase git pull --rebase
git submodule foreach git pull --rebase origin master git submodule update --remote
goto EOF goto EOF
) else if "%1" == "clean" ( ) else if "%1" == "clean" (
set MUST_CLEAN=1 set MUST_CLEAN=1