diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-20 16:42:01 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-21 14:01:05 +0300 |
| commit | e72f989cf49132c94be139705baf78228bea5d7b (patch) | |
| tree | ede964c3d4ed1f99f0981287d1dd157eb4b31138 /build_files | |
| parent | b52465bd32def94daa2113c308d78433eac6c628 (diff) | |
Update for moving master to blender2.7 branch.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 8 | ||||
| -rw-r--r-- | build_files/windows/update_sources.cmd | 8 |
2 files changed, 10 insertions, 6 deletions
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 |