Some tweaks to support blender 2.8 slaves

master.cfg

@@ -4,10 +4,10 @@
 # <pep8 compliant>
 
 # List of the branches being built automatically overnight
-NIGHT_SCHEDULE_BRANCHES = [None]
+NIGHT_SCHEDULE_BRANCHES = [None, "blender2.8"]
 
 # List of the branches available for force build
-FORCE_SCHEDULE_BRANCHES = ["master", "gooseberry", "experimental-build"]
+FORCE_SCHEDULE_BRANCHES = ["master", "blender2.8", "experimental-build"]
 
 """
 Stock Twisted directory lister doesn't provide any information about last file
@@ -127,7 +127,14 @@ def schedule_force_build(name):
                 project=forcesched.FixedParameter(name="project", default="", hide=True)),
             # For now, hide other codebases.
             forcesched.CodebaseParameter(hide=True, codebase="blender-translations"),
-            forcesched.CodebaseParameter(hide=True, codebase="blender-addons"),
+            forcesched.CodebaseParameter(
+                codebase="blender-addons",
+                branch=forcesched.ChoiceStringParameter(
+                    name="branch", choices=["master", "blender2.8"], default="master"),
+                repository=forcesched.FixedParameter(name="repository", default="", hide=True),
+                project=forcesched.FixedParameter(name="project", default="", hide=True),
+                revision=forcesched.FixedParameter(name="revision", default="", hide=True),
+            ),
             forcesched.CodebaseParameter(hide=True, codebase="blender-addons-contrib"),
             forcesched.CodebaseParameter(hide=True, codebase="blender-dev-tools"),
             forcesched.CodebaseParameter(hide=True, codebase="lib svn")],
@@ -139,12 +146,16 @@ def schedule_build(name, hour, minute=0):
         scheduler_name = "nightly " + name
         if current_branch:
             scheduler_name += ' ' + current_branch
+        # Use special addons submodule branch when building blender2.8 branch.
+        addons_branch = "master"
+        if current_branch == "blender2.8":
+            addons_branch = "blender2.8"
         c['schedulers'].append(timed.Nightly(name=scheduler_name,
             codebases={
                 "blender": {"repository": ""},
                 "blender-translations": {"repository": "", "branch": "master"},
                 "blender-addons": {"repository": "", "branch": "master"},
-                "blender-addons-contrib": {"repository": "", "branch": "master"},
+                "blender-addons-contrib": {"repository": "", "branch": addons_branch},
                 "blender-dev-tools": {"repository": "", "branch": "master"},
                 "lib svn": {"repository": "", "branch": "trunk"}},
             branch=current_branch,
@@ -224,9 +235,8 @@ def git_step(branch=''):
                    submodules=True)
 
 
-def git_submodules_update():
+def git_submodules_update(branch):
-    command = ['git', 'submodule', 'foreach', '--recursive',
+    command = ['git', 'submodule', 'update', '--remote']
-               'git', 'pull', 'origin', 'master']
     return ShellCommand(name='Submodules Update',
                         command=command,
                         description='updating',

templates/directory.html

@@ -45,7 +45,7 @@
 {% endfor %}
 
 {% for f in files|sort %}
-  {% if ("mingw" in f.text) or ('gooseberry' in f.text) or ("experimental" in f.text) or ("vc1" in f.text) or ("vc9" in f.text) or ("multiview" in f.text) %}
+  {% if ("mingw" in f.text) or ("vc1" in f.text) or ("blender-2.8" in f.text) or ("experimental" in f.text) %}
   {% else %}
   <tr class="file {{ row_class.next() }}">
     {% if "mingw32" in f.text %}
@@ -118,16 +118,13 @@
 {% endif %}
 {% endfor %}
 
-<tr>
+</table>
-<td>&nbsp;</th>
+
-<td>&nbsp;</th>
+<table class="table table-striped table-hover box">
-<td>&nbsp;</th>
+<tr></tr>
-<td>&nbsp;</th>
-<td>&nbsp;</th>
-</tr>
 
 {% for f in files|sort %}
-  {% if (not (("mingw" in f.text) or ("vc1" in f.text) or ("vc9" in f.text) or ("multiview" in f.text) or ("gooseberry" in f.text) )) %}
+  {% if (not (("mingw" in f.text) or ("vc1" in f.text))) %}
   {% else %}
   <tr class="file {{ row_class.next() }}">
     {% if "mingw32" in f.text %}
@@ -153,23 +150,64 @@
     {% endif %}
     </td>
 
+    <td>
+    {% if "mingw" in f.text %}
+       Experimental MinGW
+    {% elif "vc14" in f.text %}
+       Experimental Build Branch by  VS 2015<br/><span style="font-weight: normal;">(Windows Vista/7/8/10)</span>
+    {% else %}
+       Official
+    {% endif %}
+    </td>
+
+    <td><a class="info" onclick="ga('send', 'event', 'button', 'download', '{{f.text}}');" href="{{ f.href }}">{{ f.text }}</a></td>
+    <td>{{ f.size }}</td>
+    <td>{{ f.lastmodified }}</td>
+  </tr>
+  {% endif %}
+{% endfor %}
+</table>
+
+<table class="table table-striped table-hover box">
+<tr></tr>
+
+{% for f in files|sort %}
+  {% if ("blender-2.8" in f.text) %}
+  <tr class="file {{ row_class.next() }}">
+    {% if "mingw32" in f.text %}
+        <td><i class="fa fa-windows"></i> Windows 32 bit
+    {% elif "win32" in f.text %}
+        <td><i class="fa fa-windows"></i> Windows 32 bit
+    {% elif "mingw64" in f.text %}
+        <td><i class="fa fa-windows"></i> Windows 64 bit
+    {% elif "win64" in f.text %}
+        <td><i class="fa fa-windows"></i> Windows 64 bit
+    {% elif "OSX" in f.text %}
+       {% if "x86_64" in f.text %}
+          <td><i class="fa fa-apple"></i> Mac OS X 64 bit
+       {% else %}
+          <td><i class="fa fa-apple"></i> Mac OS X 32 bit
+       {% endif %}
+    {% elif "linux" in f.text %}
+       {% if "x86_64" in f.text %}
+             <td><i class="fa fa-linux"></i> Linux 64 bit
+       {% else %}
+             <td><i class="fa fa-linux"></i> Linux 32 bit
+       {% endif %}
+    {% endif %}
+    </td>
+
     <td>
     {% if "mingw" in f.text %}
        Experimental MinGW
     {% elif "vc14" in f.text %}
        Experimental VS 2015<br/><span style="font-weight: normal;">(Windows Vista/7/8/10)</span>
-    {% elif "vc11" in f.text %}
-       Experimental VS 2012<br/><span style="font-weight: normal;">(Windows Vista/7/8/10)</span>
-    {% elif "vc9" in f.text %}
-       Legacy VS 2008<br/><span style="font-weight: normal;">(Windows XP/Vista/7/8/10)</span>
     {% elif "win32-vc12" in f.text %}
        Official Preview VS 2013<br/><span style="font-weight: normal;">(Windows XP/Vista/7/8/10)</span>
     {% elif "win64-vc12" in f.text %}
        Official Preview VS 2013<br/><span style="font-weight: normal;">(Windows Vista/7/8/10)</span>
-    {% elif "multiview" in f.text %}
+    {% elif "blender-2.8" in f.text %}
-       Multiview Branch<br/><span style="font-weight: normal;">(Stereoscopic 3D)</span>
+       Blender 2.8 Branch
-    {% elif "gooseberry" in f.text %}
-       Gooseberry Branch
     {% else %}
        Official
     {% endif %}