diff options
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | GNUmakefile | 5 | ||||
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 8 | ||||
| -rw-r--r-- | build_files/windows/update_sources.cmd | 8 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 | ||||
| m--------- | source/tools | 0 |
7 files changed, 15 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules index 2f52bfce372..c74374cf8d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,12 +2,12 @@ path = release/scripts/addons url = ../blender-addons.git ignore = all - branch = master + branch = blender2.7 [submodule "release/scripts/addons_contrib"] path = release/scripts/addons_contrib url = ../blender-addons-contrib.git ignore = all - branch = master + branch = blender2.7 [submodule "release/datafiles/locale"] path = release/datafiles/locale url = ../blender-translations.git diff --git a/GNUmakefile b/GNUmakefile index 02e081e03df..d31abe66f37 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -445,8 +445,9 @@ update: .FORCE fi git pull --rebase git submodule update --init --recursive - git submodule foreach git checkout master - git submodule foreach git pull --rebase origin master + # Use blender2.7 branch for submodules that have it. + git submodule foreach "git checkout blender2.7 || git checkout master" + git submodule foreach git pull --rebase origin # ----------------------------------------------------------------------------- diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index a0b5e8c6517..27bebeb109e 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -107,8 +107,8 @@ if builder.find('cmake') != -1: if builder.endswith('vc2015'): platform += "-vc14" builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform) - # NOTE: Blender 2.8 is already respected by blender_full_version. - if branch != '' and branch != 'blender2.8': + # NOTE: Blender 2.7 is already respected by blender_full_version. + if branch != '' and branch != 'blender2.7': builderified_name = branch + "-" + builderified_name os.rename(result_file, "{}.zip".format(builderified_name)) @@ -174,8 +174,8 @@ if builder.find('cmake') != -1: blender_hash, blender_glibc, blender_arch) - # NOTE: Blender 2.8 is already respected by blender_full_version. - if branch != '' and branch != 'blender2.8': + # NOTE: Blender 2.7 is already respected by blender_full_version. + if branch != '' and branch != 'blender2.7': package_name = branch + "-" + package_name upload_filename = package_name + ".tar.bz2" diff --git a/build_files/windows/update_sources.cmd b/build_files/windows/update_sources.cmd index 22d93fabb95..ef11909b93d 100644 --- a/build_files/windows/update_sources.cmd +++ b/build_files/windows/update_sources.cmd @@ -11,6 +11,10 @@ if "%GIT%" == "" ( goto EOF ) "%GIT%" pull --rebase -"%GIT%" submodule foreach git pull --rebase origin master +"%GIT%" submodule update --init --recursive +rem Use blender2.7 branch for submodules that have it. +"%GIT%" submodule foreach "git checkout blender2.7 || git checkout master" +"%GIT%" submodule foreach git pull --rebase origin -:EOF
\ No newline at end of file + +:EOF diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 6c3a46dc113de870a03191e4c0685238b0823ac +Subproject 9cc2ad1eaf941d8ed3b5542a3d5cdfccec7ba60 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject 15b25a42783d1e516b5298d70b582fae2559ae1 +Subproject 68a2d28b24430133946f21d7deede1312d181aa diff --git a/source/tools b/source/tools -Subproject 11656ebaf7f912cdb1b5eb39c5d0a3b5d492c1a +Subproject 2278dd8d6aea4d56632dee37196a5e341ce9928 |