Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Romain DEP.
gajim
Commits
c67da7dd
Commit
c67da7dd
authored
Dec 30, 2020
by
Philipp Hörist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Windows: Fix build
parent
4c126259
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
appveyor.yml
appveyor.yml
+2
-5
win/misc/create-launcher.py
win/misc/create-launcher.py
+1
-0
No files found.
appveyor.yml
View file @
c67da7dd
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
View file @
c67da7dd
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment