diff options
| author | Micah Lee <micah@micahflee.com> | 2016-09-04 19:54:45 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2016-09-04 19:54:45 -0700 |
| commit | 8e8ea9c357ca0aab9f3840141692d4c83f2a17b9 (patch) | |
| tree | 9322c2317f2f3cc312c09dcf513e9cfc77ab6280 | |
| parent | 3f1180c404082ce9d8cdcd70071b4594a60727a6 (diff) | |
| download | onionshare-8e8ea9c357ca0aab9f3840141692d4c83f2a17b9.tar.gz onionshare-8e8ea9c357ca0aab9f3840141692d4c83f2a17b9.zip | |
Added resources to cx_Freeze setup, and make those resources findable by the app
| -rw-r--r-- | onionshare/helpers.py | 10 | ||||
| -rw-r--r-- | setup.py | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/onionshare/helpers.py b/onionshare/helpers.py index 814d0207..04e70c12 100644 --- a/onionshare/helpers.py +++ b/onionshare/helpers.py @@ -37,9 +37,15 @@ def get_resource_path(filename): if p == 'Linux' and sys.argv and sys.argv[0].startswith('/usr/bin/onionshare'): # OnionShare is installed systemwide in Linux resources_dir = os.path.join(sys.prefix, 'share/onionshare') - elif getattr(sys, 'frozen', False): # Check if app is "frozen" with pyinstaller + elif getattr(sys, 'frozen', False): # Check if app is "frozen" with pyinstaller, cx_Freeze # https://pythonhosted.org/PyInstaller/#run-time-information - resources_dir = sys._MEIPASS + # http://cx-freeze.readthedocs.io/en/latest/faq.html#using-data-files + if p == 'Windows': + # Windows is using cx_Freeze + resources_dir = os.path.join(os.path.dirname(sys.executable), 'resources') + else: + # OS X is using PyInstaller + resources_dir = sys._MEIPASS else: # Look for resources directory relative to python file resources_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))), 'resources') @@ -86,7 +86,8 @@ if os == 'Windows': options={ "build_exe": { "packages": [], - "excludes": [] + "excludes": [], + "include_files": ['resources'] } }, executables=[ |