Commit: 38d684168759382dac015ead3e768dc015bb817c
Author: Sergey Sharybin
Date: Mon Jun 16 15:16:18 2014 +0600
https://developer.blender.org/rB38d684168759382dac015ead3e768dc015bb817c
Need to consider blender-v* a release branch, not just blender-
This is because of blender-tiles branch we've got..
===================================================================
M build_files/cmake/buildinfo.cmake
M build_files/scons/tools/Blender.py
===================================================================
diff --git a/build_files/cmake/buildinfo.cmake
b/build_files/cmake/buildinfo.cmake
index 31b1cff..3660b3e 100644
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -85,7 +85,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
endif()
endif()
- if(MY_WC_BRANCH MATCHES "^blender-")
+ if(MY_WC_BRANCH MATCHES "^blender-v")
set(MY_WC_BRANCH "master")
endif()
diff --git a/build_files/scons/tools/Blender.py
b/build_files/scons/tools/Blender.py
index 5074762..ee35586 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -457,7 +457,7 @@ def buildinfo(lenv, build_type):
unpushed_log = os.popen('git log --oneline
@{u}..').read().strip()
has_local_changes = unpushed_log != ''
- if build_branch.startswith('blender-'):
+ if build_branch.startswith('blender-v'):
build_branch = 'master'
if has_local_changes:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
