SG-9252: Merges tk-desktop2 into the basic config. (#67)

* Merges tk-desktop2 into the basic config.

* Latest apps and engines.

Author: thebeeland

env/includes/common/apps.yml

@@ -40,7 +40,7 @@ common.apps.tk-multi-setframerange:
 common.apps.tk-multi-publish2.location:
   type: app_store
   name: tk-multi-publish2
-  version: v2.2.2
+  version: v2.3.0
 
 common.apps.tk-multi-loader2.location:
   type: app_store

env/includes/common/engines.yml

@@ -13,55 +13,61 @@
 
 # 3dsMax
 common.engines.tk-3dsmaxplus.location:
-    type: app_store
-    name: tk-3dsmaxplus
-    version: v0.5.3
+  type: app_store
+  name: tk-3dsmaxplus
+  version: v0.5.3
 
 # Houdini
 common.engines.tk-houdini.location:
-    type: app_store
-    name: tk-houdini
-    version: v1.5.6
+  type: app_store
+  name: tk-houdini
+  version: v1.5.6
 
 # Maya
 common.engines.tk-maya.location:
-    type: app_store
-    name: tk-maya
-    version: v0.9.4
+  type: app_store
+  name: tk-maya
+  version: v0.9.4
 
 # Nuke
 common.engines.tk-nuke.location:
-    type: app_store
-    name: tk-nuke
-    version: v0.11.4
+  type: app_store
+  name: tk-nuke
+  version: v0.11.4
 
 # Photoshop
 common.engines.tk-photoshopcc.location:
-    type: app_store
-    name: tk-photoshopcc
-    version: v1.6.3
+  type: app_store
+  name: tk-photoshopcc
+  version: v1.6.3
 
 # Flame
 common.engines.tk-flame.location:
-    type: app_store
-    name: tk-flame
-    version: v1.14.6
+  type: app_store
+  name: tk-flame
+  version: v1.14.7
 
 # Desktop
 common.engines.tk-desktop.location:
-    type: app_store
-    name: tk-desktop
-    version: v2.4.12
+  type: app_store
+  name: tk-desktop
+  version: v2.4.12
+
+# Desktop2
+common.engines.tk-desktop2.location:
+  type: app_store
+  name: tk-desktop2
+  version: v0.3.1
 
 # Shell
 common.engines.tk-shell.location:
-    type: app_store
-    name: tk-shell
-    version: v0.6.0
+  type: app_store
+  name: tk-shell
+  version: v0.6.0
 
 # shotgun
 common.engines.tk-shotgun.location:
-    type: app_store
-    name: tk-shotgun
-    version: v0.8.2
+  type: app_store
+  name: tk-shotgun
+  version: v0.8.2
 

env/includes/common/frameworks.yml

@@ -24,7 +24,7 @@ frameworks:
       name: tk-framework-shotgunutils
   tk-framework-shotgunutils_v5.x.x:
     location:
-      version: v5.4.5
+      version: v5.5.0
       type: app_store
       name: tk-framework-shotgunutils
   tk-framework-adminui_v0.x.x:

env/includes/desktop2/all.yml

@@ -0,0 +1,36 @@
+# Copyright (c) 2016 Shotgun Software Inc.
+#
+# CONFIDENTIAL AND PROPRIETARY
+#
+# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
+# Source Code License included in this distribution package. See LICENSE.
+# By accessing, using, copying or modifying this work you indicate your
+# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
+# not expressly granted therein are reserved by Shotgun Software Inc.
+#
+
+# this configuration defines the behavior of the Shotgun Desktop when it
+# is running in any configuration except the site configuration.
+
+includes:
+- ../common/engines.yml
+- ../common/frameworks.yml
+- ../common/apps.yml
+- ../common/settings/tk-multi-publish2.yml
+
+desktop2.all:
+  apps:
+
+    tk-multi-publish2:
+      collector: "{self}/collector.py"
+      publish_plugins:
+        - '@common.settings.tk-multi-publish2.publish_file'
+        - '@common.settings.tk-multi-publish2.upload_version'
+      location: "@common.apps.tk-multi-publish2.location"
+
+    tk-multi-launchapp:
+      scan_all_projects: true
+      use_software_entity: true
+      location: "@common.apps.tk-multi-launchapp.location"
+
+  location: "@common.engines.tk-desktop2.location"

env/includes/desktop2/site.yml

@@ -0,0 +1,22 @@
+# Copyright (c) 2016 Shotgun Software Inc.
+#
+# CONFIDENTIAL AND PROPRIETARY
+#
+# This work is provided "AS IS" and subject to the Shotgun Pipeline Toolkit
+# Source Code License included in this distribution package. See LICENSE.
+# By accessing, using, copying or modifying this work you indicate your
+# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
+# not expressly granted therein are reserved by Shotgun Software Inc.
+#
+
+# this configuration defines the behavior of the Shotgun Desktop when it
+# is running in its site level configuration
+
+includes:
+- ../common/engines.yml
+- ../common/frameworks.yml
+
+desktop2.site:
+  apps:
+  location: "@common.engines.tk-desktop2.location"
+

env/project.yml

@@ -18,6 +18,7 @@ includes:
 - includes/nuke/project.yml
 - includes/flame/project.yml
 - includes/desktop/project.yml
+- includes/desktop2/all.yml
 - includes/shell/project.yml
 - includes/photoshopcc/project.yml
 - includes/3dsmax/project.yml
@@ -29,6 +30,7 @@ engines:
   tk-nuke: '@nuke.project'
   tk-nukestudio: '@nukestudio.project'
   tk-desktop: '@desktop.project'
+  tk-desktop2: '@desktop2.all'
   tk-shell: '@shell.project'
   tk-photoshopcc: '@photoshopcc.project'
   tk-3dsmaxplus: '@3dsmax.project'

env/shot.yml

@@ -13,6 +13,7 @@ description: Toolkit configuration to be loaded whenever an association with a
              shot has been established.
 
 includes:
+- includes/desktop2/all.yml
 - includes/houdini/shot.yml
 - includes/maya/shot.yml
 - includes/nuke/shot.yml
@@ -23,6 +24,7 @@ includes:
 - includes/shotgun/all.yml
 
 engines:
+  tk-desktop2: '@desktop2.all'
   tk-houdini: '@houdini.shot'
   tk-maya: '@maya.shot'
   tk-nuke: '@nuke.shot'

env/site.yml

@@ -18,6 +18,7 @@ includes:
 - includes/maya/site.yml
 - includes/nuke/site.yml
 - includes/desktop/site.yml
+- includes/desktop2/site.yml
 - includes/shell/site.yml
 - includes/photoshopcc/site.yml
 - includes/3dsmax/site.yml
@@ -29,6 +30,7 @@ engines:
   tk-nuke: '@nuke.site'
   tk-nukestudio: '@nuke.site'
   tk-desktop: '@desktop.site'
+  tk-desktop2: '@desktop2.site'
   tk-shell: '@shell.site'
   tk-photoshopcc: '@photoshopcc.site'
   tk-3dsmaxplus: '@3dsmax.site'