Skip to content

Commit

Permalink
Finally managed to get windows build again
Browse files Browse the repository at this point in the history
  • Loading branch information
kozec committed Jul 3, 2017
1 parent a5059a0 commit cae41d9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 19 deletions.
31 changes: 13 additions & 18 deletions build_windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,12 @@
#'libgirepository-1.0-1.dll',
#'libgmodule-2.0-0.dll',
#'libgladeui-2-6.dll',
'libpango-1.0-0.dll',
'libp11-kit-0.dll',
'libproxy.dll',
'libpango-1.0-0.dll',
'libpangocairo-1.0-0.dll',
'libpangoft2-1.0-0.dll',
'libpangowin32-1.0-0.dll',
'libffi-6.dll',
#'libgio-2.0-0.dll',
'libgnutls-28.dll',
'libharfbuzz-gobject-0.dll',
'libharfbuzz-0.dll',
#'libpng16-16.dll',
Expand All @@ -48,7 +45,6 @@
'libepoxy-0.dll',
'libjasper-1.dll',
'libjpeg-8.dll',
'libstdc++.dll',

'gspawn-win32-helper.exe',
'gspawn-win32-helper-console.exe',
Expand Down Expand Up @@ -97,14 +93,12 @@
executables = [
Executable(
"scripts/syncthing-gtk-exe.py",
compress = True,
targetName = "syncthing-gtk.exe",
base = "Win32GUI",
icon = "icons/st-logo-128.ico",
),
Executable(
"scripts/syncthing-gtk-exe.py",
compress = True,
targetName = "syncthing-gtk-console.exe",
base = "console",
icon = "icons/st-logo-128.ico",
Expand All @@ -115,18 +109,20 @@
get_version = lambda : "%s-win32" % (_get_version(),)

# Monkey-patch _AddVersionResource in cx_Freeze so win32verstamp will
# not bitch about non-numeric version
# not bitch about non-numeric version
RE_NUMBER = re.compile(r'v?([0-9]+).*')
extract_number = lambda x : RE_NUMBER.match(x).group(1) if \
RE_NUMBER.match(x) else "0"
win32version = lambda x : ".".join([ extract_number(i) for i in x.split(".")[0:4] ])
Freezer._AddVersionResource = lambda self, filename : \
stamp(filename, VersionInfo(
win32version(self.metadata.version),
comments = self.metadata.long_description,
description = self.metadata.description,
company = self.metadata.author,
product = self.metadata.name
Freezer._AddVersionResource = lambda self, exe : \
stamp(exe.targetName, VersionInfo(
win32version(self.metadata.version),
comments = self.metadata.long_description,
description = self.metadata.description,
company = self.metadata.author,
product = self.metadata.name,
copyright = exe.copyright,
trademarks = exe.trademarks
))

setup(
Expand All @@ -136,9 +132,8 @@
description = "Windows port of Syncthing GTK",
options = dict(
build_exe = dict(
compressed = False,
includes = ["gi"],
packages = ["gi"],
includes = [ "gi" ],
packages = [ "gi", "bcrypt", "cffi" ],
include_files = include_files
),
),
Expand Down
2 changes: 1 addition & 1 deletion syncthing_gtk/windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
log = logging.getLogger("windows.py")

SM_SHUTTINGDOWN = 0x2000
ST_INOTIFY_EXE = "syncthing-inotify-v0.8.3.exe"
ST_INOTIFY_EXE = "syncthing-inotify-v0.8.7.exe"

def fix_localized_system_error_messages():
"""
Expand Down

0 comments on commit cae41d9

Please sign in to comment.