From 63ee49b5e10bc64d53b829315a4c8119208ed6e5 Mon Sep 17 00:00:00 2001 From: Ariel Calzada Date: Fri, 11 Feb 2022 08:47:51 -0500 Subject: [PATCH 1/3] Adjust build scripts --- resources/command_runner/build_resources.sh | 7 ++++--- resources/create_sandbox/build_resources.sh | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/command_runner/build_resources.sh b/resources/command_runner/build_resources.sh index e1d8dd3..4b29a16 100755 --- a/resources/command_runner/build_resources.sh +++ b/resources/command_runner/build_resources.sh @@ -12,6 +12,7 @@ # The path to where the PySide binaries are installed PYTHON_BASE="/Applications/Shotgun.app/Contents/Resources/Python/bin" +PYTHON_BASE="/Applications/Shotgun.app/Contents/Resources/Python" # Remove any problematic profiles from pngs. for f in *.png; do mogrify $f; done @@ -24,15 +25,15 @@ function build_qt { $1 $2 > $UI_PYTHON_PATH/$3.py # replace PySide imports with tank.platform.qt and remove line containing Created by date - sed -i "" -e "s/from PySide import/from tank.platform.qt import/g" -e "/# Created:/d" $UI_PYTHON_PATH/$3.py + sed -i $UI_PYTHON_PATH/$3.py -e "s/from PySide import/from tank.platform.qt import/g" -e "/# Created:/d" } function build_ui { - build_qt "${PYTHON_BASE}/python ${PYTHON_BASE}/pyside-uic --from-imports" "$1.ui" "$1" + build_qt "${PYTHON_BASE}/bin/python ${PYTHON_BASE}/bin/pyside-uic --from-imports" "$1.ui" "$1" } function build_res { - build_qt "${PYTHON_BASE}/pyside-rcc -py3" "$1.qrc" "$1_rc" + build_qt "${PYTHON_BASE}/bin/pyside-rcc -py3" "$1.qrc" "$1_rc" } diff --git a/resources/create_sandbox/build_resources.sh b/resources/create_sandbox/build_resources.sh index b78d160..cf4eedd 100755 --- a/resources/create_sandbox/build_resources.sh +++ b/resources/create_sandbox/build_resources.sh @@ -12,6 +12,7 @@ # The path to where the PySide binaries are installed PYTHON_BASE="/Applications/Shotgun.app/Contents/Resources/Python/bin" +PYTHON_BASE="/Applications/Shotgun.app/Contents/Resources/Python" # Remove any problematic profiles from pngs. for f in *.png; do mogrify $f; done @@ -24,15 +25,15 @@ function build_qt { $1 $2 > $UI_PYTHON_PATH/$3.py # replace PySide imports with tank.platform.qt and remove line containing Created by date - sed -i "" -e "s/from PySide import/from tank.platform.qt import/g" -e "/# Created:/d" $UI_PYTHON_PATH/$3.py + sed -i $UI_PYTHON_PATH/$3.py -e "s/from PySide import/from tank.platform.qt import/g" -e "/# Created:/d" } function build_ui { - build_qt "${PYTHON_BASE}/python ${PYTHON_BASE}/pyside-uic --from-imports" "$1.ui" "$1" + build_qt "${PYTHON_BASE}/bin/python ${PYTHON_BASE}/bin/pyside-uic --from-imports" "$1.ui" "$1" } function build_res { - build_qt "${PYTHON_BASE}/pyside-rcc -py3" "$1.qrc" "$1_rc" + build_qt "${PYTHON_BASE}/bin/pyside-rcc -py3" "$1.qrc" "$1_rc" } From 478481f79550a1f3a69062290dee2d838b9668bc Mon Sep 17 00:00:00 2001 From: Ariel Calzada Date: Fri, 11 Feb 2022 09:30:18 -0500 Subject: [PATCH 2/3] Adjust build scripts --- resources/command_runner/build_resources.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/command_runner/build_resources.sh b/resources/command_runner/build_resources.sh index 4b29a16..e674a5c 100755 --- a/resources/command_runner/build_resources.sh +++ b/resources/command_runner/build_resources.sh @@ -11,7 +11,6 @@ # not expressly granted therein are reserved by Shotgun Software Inc. # The path to where the PySide binaries are installed -PYTHON_BASE="/Applications/Shotgun.app/Contents/Resources/Python/bin" PYTHON_BASE="/Applications/Shotgun.app/Contents/Resources/Python" # Remove any problematic profiles from pngs. From 7df8c1e09450844c7e954c3f86816569b8af9aeb Mon Sep 17 00:00:00 2001 From: Ariel Calzada Date: Fri, 11 Feb 2022 09:31:00 -0500 Subject: [PATCH 3/3] Adjust build scripts --- resources/create_sandbox/build_resources.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/create_sandbox/build_resources.sh b/resources/create_sandbox/build_resources.sh index cf4eedd..801fc69 100755 --- a/resources/create_sandbox/build_resources.sh +++ b/resources/create_sandbox/build_resources.sh @@ -11,7 +11,6 @@ # not expressly granted therein are reserved by Shotgun Software Inc. # The path to where the PySide binaries are installed -PYTHON_BASE="/Applications/Shotgun.app/Contents/Resources/Python/bin" PYTHON_BASE="/Applications/Shotgun.app/Contents/Resources/Python" # Remove any problematic profiles from pngs.