Skip to content
This repository has been archived by the owner on Sep 22, 2021. It is now read-only.

Commit

Permalink
Merge pull request #24 from pypeclub/feature/PYPE-785_OSX-compatibility
Browse files Browse the repository at this point in the history
Feature/pype 785 osx compatibility
  • Loading branch information
mkolar authored May 12, 2020
2 parents bc6c541 + bb20bf0 commit af957b1
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 3 deletions.
4 changes: 2 additions & 2 deletions anatomy/roots.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"work": {
"windows": "P:/projects/work",
"linux": "/mnt/share/projects/work",
"darwin": "/darwin/path/work"
"darwin": "/Volumes/path/work"
},
"publish": {
"windows": "P:/projects/publish",
"linux": "/mnt/share/projects/publish",
"darwin": "/darwin/path/publish"
"darwin": "/Volumes/path/publish"
}
}
4 changes: 3 additions & 1 deletion environments/global.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"STUDIO_SOFT": "{PYP_SETUP_ROOT}/soft",
"FFMPEG_PATH": {
"windows": "{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/windows/bin",
"darwin": "{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/darwin/bin",
"linux": "{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/linux"
},
"DJV_PATH": {
Expand All @@ -26,7 +27,8 @@
"PYPE_PROJECT_CONFIGS": "{PYPE_SETUP_PATH}/../studio-project-configs",
"PYPE_PYTHON_EXE": {
"windows": "{VIRTUAL_ENV}/Scripts/python.exe",
"linux": "{VIRTUAL_ENV}/Scripts/python"
"linux": "{VIRTUAL_ENV}/Scripts/python",
"darwin": "{VIRTUAL_ENV}/bin/python"
},
"PYPE_LOG_MONGO_HOST": "localhost",
"PYPE_LOG_MONGO_PORT": "2707",
Expand Down
2 changes: 2 additions & 0 deletions launchers/darwin/blender_2.82
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
open -a blender $@
2 changes: 2 additions & 0 deletions launchers/darwin/python3
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
open /usr/bin/python3 --args $@
28 changes: 28 additions & 0 deletions system/storage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"studio": {
"projects": {
"path": {
"windows": "//network/path/to/projects",
"darwin": "/Volumes/path/to/projects",
"linux": "/mnt/share/projects"
},
"mount": {
"windows": "P:/mounted/path/to/projects",
"darwin": "/Volumes/path/to/projects",
"linux": "/mnt/share/core"
}
},
"core": {
"path": {
"windows": "//network/path/to/core",
"darwin": "/Volumes/path/to/core",
"linux": "/mnt/share/core"
},
"mount": {
"windows": "K:/network/path/to/core",
"darwin": "/Volumes/path/to/core",
"linux": "/mnt/share/core"
}
}
}
}

0 comments on commit af957b1

Please sign in to comment.