[Win32] Updated bbreeze script from develop branch

win32/deluge-bbfreeze.py

@@ -1,82 +1,128 @@
-import os, glob, sys
+import glob
+import os
+import re
 import shutil
+import sys
+
+import bbfreeze
+import gtk
+from win32verstamp import stamp
+
 import deluge.common
 
-# Get build_version from installed deluge
+
+class VersionInfo(object):
+    def __init__(self, version, internalname=None, originalfilename=None,
+                 comments=None, company=None, description=None,
+                 copyright=None, trademarks=None, product=None, dll=False,
+                 debug=False, verbose=True):
+        parts = version.split(".")
+        while len(parts) < 4:
+            parts.append("0")
+        self.version = ".".join(parts)
+        self.internal_name = internalname
+        self.original_filename = originalfilename
+        self.comments = comments
+        self.company = company
+        self.description = description
+        self.copyright = copyright
+        self.trademarks = trademarks
+        self.product = product
+        self.dll = dll
+        self.debug = debug
+        self.verbose = verbose
+
+# Get build_version from installed deluge.
 build_version = deluge.common.get_version()
 print "Deluge Version: %s" % build_version
-python_path = os.path.dirname(sys.executable) + "\\"
+
+python_path = os.path.dirname(sys.executable)
+if python_path.endswith("Scripts"):
+    python_path = python_path[:-8]
+python_path += os.path.sep
 print "Python Path: %s" % python_path
-gtk_root = python_path + "Lib\\site-packages\\gtk-2.0\\runtime\\"
 
-# Copy entry scripts with new name, which represents final .exe filename
+gtk_root = os.path.join(gtk.__path__[0], "..", "runtime") + os.path.sep
-shutil.copy(python_path + "Scripts\deluge-script.pyw", python_path + "Scripts\deluge.py")
-shutil.copy(python_path + "Scripts\deluge-script.pyw", python_path + "Scripts\deluge-debug.py")
-shutil.copy(python_path + "Scripts\deluged-script.py", python_path + "Scripts\deluged.py")
-shutil.copy(python_path + "Scripts\deluged-script.py", python_path + "Scripts\deluged-debug.py")
-shutil.copy(python_path + "Scripts\deluge-web-script.py", python_path + "Scripts\deluge-web.py")
-shutil.copy(python_path + "Scripts\deluge-web-script.py", python_path + "Scripts\deluge-web-debug.py")
-shutil.copy(python_path + "Scripts\deluge-gtk-script.pyw", python_path + "Scripts\deluge-gtk.py")
-shutil.copy(python_path + "Scripts\deluge-console-script.py", python_path + "Scripts\deluge-console.py")
 
-# Include python modules not picked up automatically by bbfreeze
+# Include python modules not picked up automatically by bbfreeze.
 includes = ("libtorrent", "cairo", "pangocairo", "atk", "pango", "twisted.internet.utils",
             "gio", "gzip", "email.mime.multipart", "email.mime.text", "_cffi_backend")
 excludes = ("numpy", "OpenGL", "psyco", "win32ui")
 
-dst = "..\\build-win32\\deluge-bbfreeze-" + build_version + "\\"
+build_dir = "..\\build-win32\\deluge-bbfreeze-" + build_version + "\\"
+
 
-# Need to override bbfreeze function so that it includes all gtk libraries
-# in the installer so users don't require a separate GTK+ installation.
-import bbfreeze.recipes
 def recipe_gtk_override(mf):
+    # Override bbfreeze function so that it includes all gtk libraries
+    # in the installer so users don't require a separate GTK+ installation.
     return True
 bbfreeze.recipes.recipe_gtk_and_friends = recipe_gtk_override
 
-from bbfreeze import Freezer
+fzr = bbfreeze.Freezer(build_dir, includes=includes, excludes=excludes)
-f = Freezer(dst, includes=includes, excludes=excludes)
+fzr.include_py = False
-f.include_py = False
+fzr.setIcon(os.path.join(os.path.dirname(deluge.common.__file__), "ui", "data", "pixmaps", "deluge.ico"))
-f.addScript(python_path + "Scripts\deluge.py", gui_only=True)
-f.addScript(python_path + "Scripts\deluge-debug.py", gui_only=False)
-f.addScript(python_path + "Scripts\deluged.py", gui_only=True)
-f.addScript(python_path + "Scripts\deluged-debug.py", gui_only=False)
-f.addScript(python_path + "Scripts\deluge-web.py", gui_only=True)
-f.addScript(python_path + "Scripts\deluge-web-debug.py", gui_only=False)
-f.addScript(python_path + "Scripts\deluge-gtk.py", gui_only=True)
-f.addScript(python_path + "Scripts\deluge-console.py", gui_only=False)
-f()    # starts the freezing process
 
-# add icons to the exe files
+# TODO: Can/should we grab the script list from setup.py entry_points somehow.
-import icon
-icon_path = os.path.join(os.path.dirname(__file__), "deluge.ico")
-icon.CopyIcons(dst+"deluge.exe", icon_path)
-icon.CopyIcons(dst+"deluge-debug.exe", icon_path)
-icon.CopyIcons(dst+"deluged.exe", icon_path)
-icon.CopyIcons(dst+"deluged-debug.exe", icon_path)
-icon.CopyIcons(dst+"deluge-web.exe", icon_path)
-icon.CopyIcons(dst+"deluge-web-debug.exe", icon_path)
-icon.CopyIcons(dst+"deluge-gtk.exe", icon_path)
-icon.CopyIcons(dst+"deluge-console.exe", icon_path)
 
-# exclude files which are already included in GTK or Windows
+# 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*"):
+    # Copy the scripts to remove the '-script' suffix before adding to freezer.
+    new_script = script.replace("-script", "")
+    shutil.copy(script, new_script)
+
+    script_splitext = os.path.splitext(os.path.basename(new_script))
+    if script_splitext[1] == "pyw" or script_splitext[0] in force_gui:
+        gui_script = True
+    else:
+        gui_script = False
+    try:
+        fzr.addScript(new_script, gui_only=gui_script)
+
+        script_list.append(new_script)
+    except:
+        os.remove(script)
+
+# Start the freezing process.
+fzr()
+
+# Clean up the duplicated scripts.
+for script in script_list:
+    os.remove(script)
+
+# Add version information to exe files.
+for script in script_list:
+    script_exe = os.path.splitext(os.path.basename(script))[0] + ".exe"
+    if not re.search('[a-zA-Z_-]', build_version):
+        versionInfo = VersionInfo(build_version,
+                                  description="Deluge Bittorrent Client",
+                                  company="Deluge Team",
+                                  product="Deluge",
+                                  copyright="GPLv3")
+        stamp(os.path.join(build_dir, script_exe), versionInfo)
+
+# Exclude files which are already included in GTK or Windows.
 excludeDlls = ("MSIMG32.dll", "MSVCR90.dll", "MSVCP90.dll", "POWRPROF.dll", "DNSAPI.dll", "USP10.dll")
-for file in excludeDlls:
+for dll in excludeDlls:
-    for filename in glob.glob(dst + file):
+    for filename in glob.glob(os.path.join(build_dir, dll)):
         print "removing file:", filename
         os.remove(filename)
 
-# copy gtk locale files
+# Copy gtk locale files.
 gtk_locale = os.path.join(gtk_root, 'share/locale')
 locale_include_list = ['gtk20.mo', 'locale.alias']
-def ignored_files(adir,filenames):
+
+
+def ignored_files(adir, filenames):
     return [
         filename for filename in filenames
         if not os.path.isdir(os.path.join(adir, filename))
         and filename not in locale_include_list
-        ]
+    ]
-shutil.copytree(gtk_locale, os.path.join(dst, 'share/locale'), ignore=ignored_files)
+shutil.copytree(gtk_locale, os.path.join(build_dir, 'share/locale'), ignore=ignored_files)
 
-# copy gtk theme files
+# Copy gtk theme files.
 theme_include_list = [
     [gtk_root, "share/icons/hicolor/index.theme"],
     [gtk_root, "lib/gtk-2.0/2.10.0/engines"],
@@ -84,19 +130,20 @@ theme_include_list = [
     ["DelugeStart Theme", "lib/gtk-2.0/2.10.0/engines/libmurrine.dll"],
     ["DelugeStart Theme", "share/themes/DelugeStart"],
     ["DelugeStart Theme", "etc/gtk-2.0/gtkrc"]
-    ]
+]
 for path_root, path in theme_include_list:
     full_path = os.path.join(path_root, path)
     if os.path.isdir(full_path):
-        shutil.copytree(full_path, os.path.join(dst, path))
+        shutil.copytree(full_path, os.path.join(build_dir, path))
     else:
-        dst_dir = os.path.join(dst, os.path.dirname(path))
+        dst_dir = os.path.join(build_dir, os.path.dirname(path))
         try:
             os.makedirs(dst_dir)
         except:
             pass
         shutil.copy(full_path, dst_dir)
 
+# Copy version info to file for nsis script.
 file = open('VERSION.tmp', 'w')
 file.write("build_version = \"%s\"" % build_version)
 file.close()