Philipp Hörist pushed to branch master at gajim / gajim
Commits:
a379e8dc by lovetox at 2020-12-30T22:42:30+01:00
Windows: Fix build
- - - - -
2 changed files:
- appveyor.yml
- win/misc/create-launcher.py
Changes:
=====================================
appveyor.yml
=====================================
@@ -1,3 +1,5 @@
+image: Visual Studio 2019
+
environment:
matrix:
- MSYSTEM: MINGW64
@@ -19,11 +21,6 @@ clone_depth: 1
install:
- set PATH=C:\msys64\usr\bin;%PATH%
- # Download new keyring until appveyor updates its installation
- - bash -lc "curl -O
http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz";
- - bash -lc "curl -O
http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig";
- - bash -lc "pacman-key --verify
msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
- - bash -lc "pacman -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz --noconfirm"
- bash -lc "pacman --needed --noconfirm -Syu"
# This is needed because without killing all processes -Su will fail
- ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process
=====================================
win/misc/create-launcher.py
=====================================
@@ -136,6 +136,7 @@ def get_resouce_code(filename, file_version, file_desc,
icon_path,
"""
def to_ver_list(v):
+ v = v.replace('-dev', '.')
return ",".join(map(str, (list(map(int, v.split("."))) + [0] * 4)[:4]))
file_version_list = to_ver_list(file_version)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a379e8dcdf2068586bcfe809b7d712cf86e0f8c4
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a379e8dcdf2068586bcfe809b7d712cf86e0f8c4
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
