Deluge
diff options
| author | Calum Lind <calumlind+deluge@gmail.com> | 2015-08-27 11:27:37 +0100 |
|---|---|---|
| committer | Calum Lind <calumlind+deluge@gmail.com> | 2015-08-27 11:27:49 +0100 |
| commit | 8345237dcc9ba32e5ea503c7f5358fde43d3dc35 (patch) | |
| tree | ff8ea343b9e5d978f0f5fd9b7dfb1b9bf689d9d3 /packaging | |
| parent | 50f6f2d3ec86c613525461ffadb8bef722525520 (diff) | |
| download | deluge-8345237dcc9ba32e5ea503c7f5358fde43d3dc35.tar.gz deluge-8345237dcc9ba32e5ea503c7f5358fde43d3dc35.tar.bz2 deluge-8345237dcc9ba32e5ea503c7f5358fde43d3dc35.zip | |
[Packaging] bbfreeze updates
* No need for data_files to be installed on windows
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/win32/deluge-bbfreeze.py | 7 | ||||
| -rw-r--r-- | packaging/win32/deluge-win32-installer.nsi | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/packaging/win32/deluge-bbfreeze.py b/packaging/win32/deluge-bbfreeze.py index 73c7a323d..bf49f886e 100644 --- a/packaging/win32/deluge-bbfreeze.py +++ b/packaging/win32/deluge-bbfreeze.py @@ -54,9 +54,8 @@ build_version = deluge.common.get_version() python_path = os.path.dirname(sys.executable) if python_path.endswith("Scripts"): python_path = python_path[:-8] -python_path += os.path.sep -gtk_root = os.path.join(gtk.__path__[0], "..", "runtime") + os.path.sep -build_dir = "..\\build-win32\\deluge-bbfreeze-" + build_version + "\\" +gtk_root = os.path.join(gtk.__path__[0], "..", "runtime") +build_dir = os.path.join("build-win32", "deluge-bbfreeze-" + build_version) if DEBUG: print("Python Path: %s" % python_path) @@ -89,7 +88,7 @@ fzr.setIcon(os.path.join(os.path.dirname(deluge.common.__file__), "ui", "data", # Hide cmd console popup for these console entries force gui_script True. force_gui = ["deluge-web", "deluged", "deluge-console"] script_list = [] -for script in glob.glob(python_path + "Scripts\\deluge*-script.py*"): +for script in glob.glob(os.path.join(python_path, "Scripts\\deluge*-script.py*")): # Copy the scripts to remove the '-script' suffix before adding to freezer. new_script = script.replace("-script", "") shutil.copy(script, new_script) diff --git a/packaging/win32/deluge-win32-installer.nsi b/packaging/win32/deluge-win32-installer.nsi index b78e8836e..bbf825c86 100644 --- a/packaging/win32/deluge-win32-installer.nsi +++ b/packaging/win32/deluge-win32-installer.nsi @@ -25,7 +25,7 @@ SetCompressorDictSize 64 !define PROGRAM_WEB_SITE "http://deluge-torrent.org" # Python files generated with bbfreeze -!define BUILD_DIR "..\build-win32" +!define BUILD_DIR "build-win32" !define BBFREEZE_DIR "${BUILD_DIR}\deluge-bbfreeze-${PROGRAM_VERSION}" # --- Interface settings --- |