kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Update for moving master to blender2.7 branch.

Browse Source
This commit is contained in:
Brecht Van Lommel 2018-12-20 14:42:01 +01:00
parent b52465bd32
commit e72f989cf4
7 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -2,12 +2,12 @@
path = release/scripts/addons path = release/scripts/addons
url = ../blender-addons.git url = ../blender-addons.git
ignore = all ignore = all
branch = master branch = blender2.7
[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
ignore = all ignore = all
branch = master branch = blender2.7
[submodule "release/datafiles/locale"] [submodule "release/datafiles/locale"]
path = release/datafiles/locale path = release/datafiles/locale
url = ../blender-translations.git url = ../blender-translations.git

5
GNUmakefile
View File

@ -445,8 +445,9 @@ update: .FORCE
fi fi
git pull --rebase git pull --rebase
git submodule update --init --recursive git submodule update --init --recursive
git submodule foreach git checkout master # Use blender2.7 branch for submodules that have it.
git submodule foreach git pull --rebase origin master git submodule foreach "git checkout blender2.7 || git checkout master"
git submodule foreach git pull --rebase origin
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

8
build_files/buildbot/slave_pack.py
View File

@ -107,8 +107,8 @@ if builder.find('cmake') != -1:
if builder.endswith('vc2015'): if builder.endswith('vc2015'):
platform += "-vc14" platform += "-vc14"
builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform) builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform)
# NOTE: Blender 2.8 is already respected by blender_full_version. # NOTE: Blender 2.7 is already respected by blender_full_version.
if branch != '' and branch != 'blender2.8': if branch != '' and branch != 'blender2.7':
builderified_name = branch + "-" + builderified_name builderified_name = branch + "-" + builderified_name
os.rename(result_file, "{}.zip".format(builderified_name)) os.rename(result_file, "{}.zip".format(builderified_name))
@ -174,8 +174,8 @@ if builder.find('cmake') != -1:
blender_hash, blender_hash,
blender_glibc, blender_glibc,
blender_arch) blender_arch)
# NOTE: Blender 2.8 is already respected by blender_full_version. # NOTE: Blender 2.7 is already respected by blender_full_version.
if branch != '' and branch != 'blender2.8': if branch != '' and branch != 'blender2.7':
package_name = branch + "-" + package_name package_name = branch + "-" + package_name
upload_filename = package_name + ".tar.bz2" upload_filename = package_name + ".tar.bz2"

6
build_files/windows/update_sources.cmd
View File

@ -11,6 +11,10 @@ if "%GIT%" == "" (
goto EOF goto EOF
) )
"%GIT%" pull --rebase "%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 :EOF

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 6c3a46dc113de870a03191e4c0685238b0823acd Subproject commit 9cc2ad1eaf941d8ed3b5542a3d5cdfccec7ba60b

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit 15b25a42783d1e516b5298d70b582fae2559ae17 Subproject commit 68a2d28b24430133946f21d7deede1312d181aaf

2
source/tools

@ -1 +1 @@
Subproject commit 11656ebaf7f912cdb1b5eb39c5d0a3b5d492c1aa Subproject commit 2278dd8d6aea4d56632dee37196a5e341ce99283