Skip to content

SG-25524 tk-multi-devutils Rebranding #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
000paradox000 merged 3 commits into from
Mar 1, 2022
Merged

SG-25524 tk-multi-devutils Rebranding #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63ee49b
Adjust build scripts
000paradox000 Feb 11, 2022
478481f
Adjust build scripts
000paradox000 Feb 11, 2022
7df8c1e
Adjust build scripts
000paradox000 Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions resources/command_runner/build_resources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# 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.
for f in *.png; do mogrify $f; done
Expand All @@ -24,15 +24,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"
}


Expand Down
8 changes: 4 additions & 4 deletions resources/create_sandbox/build_resources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# 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.
for f in *.png; do mogrify $f; done
Expand All @@ -24,15 +24,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"
}


Expand Down