Update for moving blender2.8 to master.
This commit is contained in:
parent
4f6b4ceb6c
commit
c9df453ce7
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"project_id" : "Blender",
|
"project_id" : "Blender",
|
||||||
"conduit_uri" : "https://developer.blender.org/",
|
"conduit_uri" : "https://developer.blender.org/",
|
||||||
"git.default-relative-commit" : "origin/blender2.8",
|
"git.default-relative-commit" : "origin/master",
|
||||||
"arc.land.update.default" : "rebase",
|
"arc.land.update.default" : "rebase",
|
||||||
"arc.land.onto.default" : "blender2.8"
|
"arc.land.onto.default" : "master"
|
||||||
}
|
}
|
||||||
|
4
.gitmodules
vendored
4
.gitmodules
vendored
@ -1,12 +1,12 @@
|
|||||||
[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
|
branch = master
|
||||||
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 = blender2.8
|
branch = master
|
||||||
ignore = all
|
ignore = all
|
||||||
[submodule "release/datafiles/locale"]
|
[submodule "release/datafiles/locale"]
|
||||||
path = release/datafiles/locale
|
path = release/datafiles/locale
|
||||||
|
@ -458,9 +458,8 @@ update: .FORCE
|
|||||||
fi
|
fi
|
||||||
git pull --rebase
|
git pull --rebase
|
||||||
git submodule update --init --recursive
|
git submodule update --init --recursive
|
||||||
# Use blender2.8 branch for submodules that have it.
|
git submodule foreach git checkout master
|
||||||
git submodule foreach "git checkout blender2.8 || git checkout master"
|
git submodule foreach git pull --rebase origin master
|
||||||
git submodule foreach git pull --rebase origin
|
|
||||||
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
@ -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))
|
||||||
@ -173,8 +173,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"
|
||||||
|
@ -11,10 +11,6 @@ if "%GIT%" == "" (
|
|||||||
goto EOF
|
goto EOF
|
||||||
)
|
)
|
||||||
"%GIT%" pull --rebase
|
"%GIT%" pull --rebase
|
||||||
"%GIT%" submodule update --init --recursive
|
"%GIT%" submodule foreach git pull --rebase origin master
|
||||||
rem Use blender2.8 branch for submodules that have it.
|
|
||||||
"%GIT%" submodule foreach "git checkout blender2.8 || git checkout master"
|
|
||||||
"%GIT%" submodule foreach git pull --rebase origin
|
|
||||||
|
|
||||||
|
:EOF
|
||||||
:EOF
|
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit f89d1c9581c03160485a7b4b09fa5d538331fdeb
|
Subproject commit 0457976a872000993202763abe7503c76b461122
|
@ -1 +1 @@
|
|||||||
Subproject commit 41d528d76b99e689e09915f5dcd589480579ef3a
|
Subproject commit ceb054a0f923fa49cd9e8ef20322261a26160151
|
@ -1 +1 @@
|
|||||||
Subproject commit 30d4611eacb1c5b27a5e9d2432cb12843054abc9
|
Subproject commit 2278dd8d6aea4d56632dee37196a5e341ce99283
|
Loading…
Reference in New Issue
Block a user