Merge pull request #6 from TheFoundryVisionmongers/feature/adding_win…

…dows_build Fixed up windows Startup example and build script
wwfxuk · May 8, 2019 · 2690cdb · 2690cdb
2 parents 76ef3c4 + 367891c
commit 2690cdb
Show file tree

Hide file tree

Showing 9 changed files with 178 additions and 246 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *.pyc
 .vscode
+*.dll
 *.so
 src/build
 
diff --git a/resources/Katana/ShotgunAsset/UIPlugins/ShotgunBrowserWidgetDelegate.py b/resources/Katana/ShotgunAsset/UIPlugins/ShotgunBrowserWidgetDelegate.py
@@ -80,7 +80,6 @@ def configureAssetBrowser(self, browser):
             workFilesBrowser, workFilesIndex = self.__addWorkfilesBrowser(
                 browser, hints
             )
-            print "inputPath", inputPath
             if utils.isShotgunPublishPath(inputPath):
                 loaderBrowser.setLocation(inputPath)
                 browser.setCurrentIndex(index)

diff --git a/resources/Katana/ShotgunAsset/python/shotgun_asset/utils/publish_utils.py b/resources/Katana/ShotgunAsset/python/shotgun_asset/utils/publish_utils.py
@@ -86,9 +86,6 @@ def convertShotgunPublishDataToAssetIdFields(sgPubData):
     return assetFields
 
 
-def getShotgunAssetIdFromShotgunPublishData(sgPubData):
-    assetFields = convertShotgunPublishDataToAssetIdFields(sgPubData)
-    return createShotgunAssetIdFromAssetFields(assetFields)
 
 
 def resolveAssetIdFromVersionPolicy(assetId, policy, engine):

diff --git a/resources/Katana/ShotgunAsset/python/shotgun_asset/utils/utils.py b/resources/Katana/ShotgunAsset/python/shotgun_asset/utils/utils.py
@@ -102,45 +102,12 @@ def createShotgunAssetIdFromAssetFields(assetFields):
     return sgAssetPlugin.buildAssetId(assetFields)
 
 
-# def getTemplateFromContext(
-#     context,
-#     isFolder=None,
-#     engine=None,
-#     isPublish=None
-# ):
-    if not engine:
-        engine = publish_utils.getCurrentEngine()
-    tkCore = engine.sgtk
-    allTemplateNames = [k for k in tkCore.templates.keys() if "katana" in k]
-    templatePrefix = "katana_"
-    templateSuffix = "_work"
-    if isFolder:
-        templatePrefix = templatePrefix+"folder_"
-    if isPublish:
-        templateSuffix = "_publish"
-    if context.entity is None:
-        return engine.get_template_by_name("katana_project_work")
-    elif context.entity:
-        templateEntityName = context.entity["type"].lower()
-        if context.step:
-            templateContextStep = context.step["type"].lower()
-            template = engine.get_template_by_name(
-                "{0}{1}_{2}{3}".format(
-                    templatePrefix,
-                    templateEntityName,
-                    templateContextStep,
-                    templateSuffix
-                )
-            )
-            if template:
-                return template
-        return engine.get_template_by_name(
-            "{0}{1}{2}".format(
-                templatePrefix,
-                templateEntityName,
-                templateSuffix
-            )
-        )
+def getShotgunAssetIdFromShotgunPublishData(sgPubData):
+    assetFields = publish_utils.convertShotgunPublishDataToAssetIdFields(
+        sgPubData
+    )
+    return createShotgunAssetIdFromAssetFields(assetFields)
+
 
 
 def resolvePathFromTemplate(

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(ShotgunAssetAPI
     PRIVATE
     Katana::FnAssetPlugin
     Katana::FnAsset
+    ${PYTHON_LIB}
 )
 
 install(

diff --git a/src/build_script.bat b/src/build_script.bat
@@ -0,0 +1,20 @@
+
+rm -rf build && mkdir build && cd build 
+
+SET TK_KATANA=C:/workspace/shotgun/tk-katana
+SET KATANA_LOCATION="C:/Program Files/Foundry/Katana3.2dev"
+SET INSTALL_PREFIX=%TK_KATANA%/resources/Katana/ShotgunAsset
+SET KATANA_PYTHON=%KATANA_LOCATION%/bin/include/include/
+SET PYTHON_LIB="C:\Program Files\Foundry\Katana3.2dev\bin\python27.lib"
+:: Pybind required for importomatic version changing.
+SET PYBIND_INCLUDE_DIR=C:/Users/james.pedlingham/Documents/Git/pybind11/include
+
+cmake .. ^
+    -DCMAKE_GENERATOR_PLATFORM=x64 ^
+    -DPYBIND_INCLUDE_DIR=%PYBIND_INCLUDE_DIR% ^
+    -DPYTHON_INCLUDE_DIR=%KATANA_PYTHON% ^
+    -DKATANA_LOCATION=%KATANA_LOCATION% ^
+    -DPYTHON_LIB=%PYTHON_LIB% ^
+    -DCMAKE_INSTALL_PREFIX=%INSTALL_PREFIX%
+cmake --build . --target install
+