Update for moving master to blender2.7 branch.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 20 Dec 2018 13:42:01 +0000 (14:42 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Dec 2018 11:01:05 +0000 (12:01 +0100)
.gitmodules
GNUmakefile
build_files/buildbot/slave_pack.py
build_files/windows/update_sources.cmd
release/scripts/addons
release/scripts/addons_contrib
source/tools

index 2f52bfc..c74374c 100644 (file)
@@ -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
index 02e081e..d31abe6 100644 (file)
@@ -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
 
 
 # -----------------------------------------------------------------------------
index a0b5e8c..27bebeb 100644 (file)
@@ -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"
index 22d93fa..ef11909 100644 (file)
@@ -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
index 6c3a46d..9cc2ad1 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6c3a46dc113de870a03191e4c0685238b0823acd
+Subproject commit 9cc2ad1eaf941d8ed3b5542a3d5cdfccec7ba60b
index 15b25a4..68a2d28 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 15b25a42783d1e516b5298d70b582fae2559ae17
+Subproject commit 68a2d28b24430133946f21d7deede1312d181aaf
index 11656eb..2278dd8 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 11656ebaf7f912cdb1b5eb39c5d0a3b5d492c1aa
+Subproject commit 2278dd8d6aea4d56632dee37196a5e341ce99283