Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
dbfe4cde
Commit
dbfe4cde
authored
3 years ago
by
Ming Rui Zhang
Browse files
Options
Downloads
Patches
Plain Diff
build: make-client.py clean up
Change-Id: Id225f4ec79b7e502941e11f68a3b8a241cbc472a
parent
374670af
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
make-client.py
+17
-21
17 additions, 21 deletions
make-client.py
with
17 additions
and
21 deletions
make-client.py
+
17
−
21
View file @
dbfe4cde
...
...
@@ -20,19 +20,18 @@ vs_where_path = os.path.join(
host_is_64bit
=
(
False
,
True
)[
platform
.
machine
().
endswith
(
'
64
'
)]
this_dir
=
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
))
build_dir
=
this_dir
+
'
\\
build
'
build_dir
=
os
.
path
.
join
(
this_dir
,
'
build
'
)
temp_path
=
os
.
environ
[
'
TEMP
'
]
# project path
jami_qt_project
=
build_dir
+
'
\\
jami-qt.vcxproj
'
unit_test_project
=
build_dir
+
'
\\
tests
\\
unittests.vcxproj
'
qml_test_project
=
build_dir
+
'
\\
tests
\\
qml_tests.vcxproj
'
jami_qt_project
=
os
.
path
.
join
(
build_dir
,
'
jami-qt.vcxproj
'
)
unit_test_project
=
os
.
path
.
join
(
build_dir
,
'
tests
'
,
'
unittests.vcxproj
'
)
qml_test_project
=
os
.
path
.
join
(
build_dir
,
'
tests
'
,
'
qml_tests.vcxproj
'
)
# test executable command
qml_test_exe
=
this_dir
+
'
\\
x64
\\
test
\\
qml_tests.exe -input
'
+
this_dir
+
'
\\
tests
\\
qml
'
unit_test_exe
=
this_dir
+
'
\\
x64
\\
test
\\
unittests.exe
'
windows_font_dir
=
'
C:
\\
Windows
\\
Fonts
'
qml_test_exe
=
os
.
path
.
join
(
this_dir
,
'
x64
'
,
'
test
'
,
'
qml_tests.exe -input
'
)
+
\
os
.
path
.
join
(
this_dir
,
'
tests
'
,
'
qml
'
)
unit_test_exe
=
os
.
path
.
join
(
this_dir
,
'
x64
'
,
'
test
'
,
'
unittests.exe
'
)
class
TestBuilding
(
Enum
):
NoTests
=
0
...
...
@@ -182,7 +181,8 @@ def deps(arch, toolset, qtver):
if
(
execute_cmd
(
"
git clone https://github.com/BlueDragon747/qrencode-win32.git
"
,
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
)):
if
(
execute_cmd
(
"
cd qrencode-win32 && git checkout d6495a2aa74d058d54ae0f1b9e9e545698de66ce &&
"
+
apply_cmd
+
os
.
path
.
join
(
'
..
'
,
'
qrencode-win32.patch
'
),
True
)):
print
(
"
qrencode-win32 set up error
"
)
sys
.
exit
(
1
)
...
...
@@ -197,7 +197,8 @@ def deps(arch, toolset, qtver):
msbuild_args
=
getMSBuildArgs
(
arch
,
'
Release-Lib
'
,
toolset
)
this_dir
=
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
))
proj_path
=
this_dir
+
'
\\
qrencode-win32
\\
qrencode-win32
\\
vc8
\\
qrcodelib
\\
qrcodelib.vcxproj
'
proj_path
=
os
.
path
.
join
(
this_dir
,
'
qrencode-win32
'
,
'
qrencode-win32
'
,
'
vc8
'
,
'
qrcodelib
'
,
'
qrcodelib.vcxproj
'
)
build_project
(
msbuild
,
msbuild_args
,
proj_path
,
vs_env_vars
)
...
...
@@ -211,14 +212,12 @@ def build(arch, toolset, sdk_version, config_str, project_path_under_current_pat
vs_env_vars
=
{}
vs_env_vars
.
update
(
getVSEnv
())
qt_dir
=
'
C:
\\
Qt
\\
'
+
qtver
qt_dir
=
os
.
path
.
join
(
"
C:
\\
"
,
'
Qt
'
,
qtver
)
cmake_gen
=
getCMakeGenerator
(
getLatestVSVersion
())
qt_minor_version
=
getQtVersionNumber
(
qtver
,
QtVerison
.
Minor
)
msvc_folder
=
'
\\
msvc2017_64
'
if
int
(
qt_minor_version
)
<=
14
else
'
\\
msvc2019_64
'
qt_cmake_dir
=
qt_dir
+
msvc_folder
+
'
\\
lib
\\
cmake
\\
'
cmake_prefix_path
=
qt_dir
+
msvc_folder
msvc_folder
=
'
msvc2019_64
'
qt_cmake_dir
=
os
.
path
.
join
(
qt_dir
,
msvc_folder
,
'
lib
'
,
'
cmake
'
)
cmake_prefix_path
=
os
.
path
.
join
(
qt_dir
,
msvc_folder
)
cmake_options
=
[
'
-DCMAKE_PREFIX_PATH=
'
+
cmake_prefix_path
,
'
-DQt5_DIR=
'
+
qt_cmake_dir
+
'
Qt5
'
,
...
...
@@ -308,8 +307,8 @@ def run_tests(mute_jamid, output_to_files):
test_exe_command_list
[
0
]
+=
'
-mutejamid
'
test_exe_command_list
[
1
]
+=
'
-mutejamid
'
if
output_to_files
:
test_exe_command_list
[
0
]
+=
'
-o
'
+
this_dir
+
'
\\
x64
\\
test
\\
qml_tests.txt
'
test_exe_command_list
[
1
]
+=
'
>
'
+
this_dir
+
'
\\
x64
\\
test
\\
unittests.txt
'
test_exe_command_list
[
0
]
+=
'
-o
'
+
os
.
path
.
join
(
this_dir
,
'
x64
'
,
'
test
'
,
'
qml_tests.txt
'
)
test_exe_command_list
[
1
]
+=
'
>
'
+
os
.
path
.
join
(
this_dir
,
'
x64
'
,
'
test
'
,
'
unittests.txt
'
)
test_result_code
=
0
...
...
@@ -317,9 +316,6 @@ def run_tests(mute_jamid, output_to_files):
os
.
environ
[
"
QT_QPA_PLATFORM
"
]
=
'
offscreen
'
os
.
environ
[
"
QT_QUICK_BACKEND
"
]
=
'
software
'
# provide font dir
os
.
environ
[
"
QT_QPA_FONTDIR
"
]
=
windows_font_dir
for
test_exe_command
in
test_exe_command_list
:
if
(
execute_cmd
(
test_exe_command
,
True
)):
test_result_code
=
1
...
...
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