Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-windows
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-windows
Commits
1ad2bda1
Commit
1ad2bda1
authored
5 years ago
by
Ming Rui Zhang
Browse files
Options
Downloads
Patches
Plain Diff
script: use subprocess returncode and add more exit cases in make-client.py
Change-Id: Ic0a65e57bc83b6d5f5d5602f17b5cb8875be27e8
parent
890befc6
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
make-client.py
+14
-17
14 additions, 17 deletions
make-client.py
with
14 additions
and
17 deletions
make-client.py
+
14
−
17
View file @
1ad2bda1
...
@@ -26,10 +26,8 @@ def execute_cmd(cmd, with_shell=False, env_vars={}):
...
@@ -26,10 +26,8 @@ def execute_cmd(cmd, with_shell=False, env_vars={}):
env
=
env_vars
)
env
=
env_vars
)
else
:
else
:
p
=
subprocess
.
Popen
(
cmd
,
shell
=
with_shell
)
p
=
subprocess
.
Popen
(
cmd
,
shell
=
with_shell
)
_
,
perr
=
p
.
communicate
()
_
,
_
=
p
.
communicate
()
if
perr
:
return
p
.
returncode
return
1
return
0
def
getLatestVSVersion
():
def
getLatestVSVersion
():
args
=
[
args
=
[
...
@@ -78,14 +76,6 @@ def getVSEnv(arch='x64', platform='', version=''):
...
@@ -78,14 +76,6 @@ def getVSEnv(arch='x64', platform='', version=''):
out
=
stdout
.
decode
(
'
utf-8
'
,
errors
=
'
ignore
'
).
split
(
"
\r\n
"
)[
5
:
-
1
]
out
=
stdout
.
decode
(
'
utf-8
'
,
errors
=
'
ignore
'
).
split
(
"
\r\n
"
)[
5
:
-
1
]
return
dict
(
s
.
split
(
'
=
'
,
1
)
for
s
in
out
)
return
dict
(
s
.
split
(
'
=
'
,
1
)
for
s
in
out
)
def
getCMakeGenerator
(
vs_version
):
if
vs_version
==
'
15
'
:
return
'
\"
Visual Studio 15 2017 Win64
\"
'
else
:
return
'
\"
Visual Studio
'
+
vs_version
+
'
2019
\"
'
def
getVSEnvCmd
(
arch
=
'
x64
'
,
platform
=
''
,
version
=
''
):
def
getVSEnvCmd
(
arch
=
'
x64
'
,
platform
=
''
,
version
=
''
):
vcEnvInit
=
[
findVSLatestDir
()
+
r
'
\VC\Auxiliary\Build\"vcvarsall.bat
'
]
vcEnvInit
=
[
findVSLatestDir
()
+
r
'
\VC\Auxiliary\Build\"vcvarsall.bat
'
]
if
platform
!=
''
:
if
platform
!=
''
:
...
@@ -103,7 +93,6 @@ def build_project(msbuild, msbuild_args, proj, env_vars):
...
@@ -103,7 +93,6 @@ def build_project(msbuild, msbuild_args, proj, env_vars):
args
.
append
(
proj
)
args
.
append
(
proj
)
cmd
=
[
msbuild
]
cmd
=
[
msbuild
]
cmd
.
extend
(
args
)
cmd
.
extend
(
args
)
if
(
execute_cmd
(
cmd
,
True
,
env_vars
)):
if
(
execute_cmd
(
cmd
,
True
,
env_vars
)):
print
(
"
Build failed when building
"
,
proj
)
print
(
"
Build failed when building
"
,
proj
)
sys
.
exit
(
1
)
sys
.
exit
(
1
)
...
@@ -124,8 +113,12 @@ def deps(arch, toolset):
...
@@ -124,8 +113,12 @@ def deps(arch, toolset):
qrencode_path
=
'
qrencode-win32
'
qrencode_path
=
'
qrencode-win32
'
if
(
os
.
path
.
isdir
(
qrencode_path
)):
if
(
os
.
path
.
isdir
(
qrencode_path
)):
os
.
system
(
'
rmdir qrencode-win32 /s /q
'
)
os
.
system
(
'
rmdir qrencode-win32 /s /q
'
)
execute_cmd
(
"
git clone https://github.com/BlueDragon747/qrencode-win32.git
"
,
True
)
if
(
execute_cmd
(
"
git clone https://github.com/BlueDragon747/qrencode-win32.git
"
,
True
)):
execute_cmd
(
"
cd qrencode-win32 && git checkout d6495a2aa74d058d54ae0f1b9e9e545698de66ce &&
"
+
apply_cmd
+
'
..
\\
qrencode-win32.patch
'
,
True
)
print
(
"
Git clone failed when cloning from https://github.com/BlueDragon747/qrencode-win32.git
"
)
sys
.
exit
(
1
)
if
(
execute_cmd
(
"
cd qrencode-win32 && git checkout d6495a2aa74d058d54ae0f1b9e9e545698de66ce &&
"
+
apply_cmd
+
'
..
\\
qrencode-win32.patch
'
,
True
)):
print
(
"
Qrencode-win32 set up error
"
)
sys
.
exit
(
1
)
print
(
'
Building qrcodelib
'
)
print
(
'
Building qrcodelib
'
)
build
(
arch
,
''
,
''
,
'
Release-Lib
'
,
'
\\
qrencode-win32
\\
qrencode-win32
\\
vc8
\\
qrcodelib
\\
qrcodelib.vcxproj
'
,
''
,
False
)
build
(
arch
,
''
,
''
,
'
Release-Lib
'
,
'
\\
qrencode-win32
\\
qrencode-win32
\\
vc8
\\
qrcodelib
\\
qrcodelib.vcxproj
'
,
''
,
False
)
...
@@ -135,11 +128,15 @@ def build(arch, toolset, sdk_version, config_str, project_path_under_current_pat
...
@@ -135,11 +128,15 @@ def build(arch, toolset, sdk_version, config_str, project_path_under_current_pat
if
(
config_str
==
'
Release
'
):
if
(
config_str
==
'
Release
'
):
print
(
'
Generating project using qmake
'
+
config_str
+
'
|
'
+
arch
)
print
(
'
Generating project using qmake
'
+
config_str
+
'
|
'
+
arch
)
execute_cmd
(
"
C:
\\
Qt
\\
"
+
qtver
+
"
\\
msvc2017_64
\\
bin
\\
qmake.exe
"
+
"
-tp vc jami-qt.pro -o jami-qt.vcxproj
"
)
if
(
execute_cmd
(
"
C:
\\
Qt
\\
"
+
qtver
+
"
\\
msvc2017_64
\\
bin
\\
qmake.exe
"
+
"
-tp vc jami-qt.pro -o jami-qt.vcxproj
"
)):
print
(
"
Qmake vcxproj file generate error
"
)
sys
.
exit
(
1
)
configuration_type
=
'
Application
'
configuration_type
=
'
Application
'
elif
(
config_str
==
'
Beta
'
):
elif
(
config_str
==
'
Beta
'
):
print
(
'
Generating project using qmake
'
+
config_str
+
'
|
'
+
arch
)
print
(
'
Generating project using qmake
'
+
config_str
+
'
|
'
+
arch
)
execute_cmd
(
"
C:
\\
Qt
\\
"
+
qtver
+
"
\\
msvc2017_64
\\
bin
\\
qmake.exe
"
+
"
-tp vc jami-qt.pro -o jami-qt.vcxproj CONFIG+=Beta
"
)
if
(
execute_cmd
(
"
C:
\\
Qt
\\
"
+
qtver
+
"
\\
msvc2017_64
\\
bin
\\
qmake.exe
"
+
"
-tp vc jami-qt.pro -o jami-qt.vcxproj CONFIG+=Beta
"
)):
print
(
"
Beat: Qmake vcxproj file generate error
"
)
sys
.
exit
(
1
)
config_str
=
'
Release
'
config_str
=
'
Release
'
configuration_type
=
'
Application
'
configuration_type
=
'
Application
'
elif
(
config_str
==
'
ReleaseCompile
'
):
elif
(
config_str
==
'
ReleaseCompile
'
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment