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
3ac51f32
Commit
3ac51f32
authored
3 years ago
by
Ming Rui Zhang
Committed by
Andreas Traczyk
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
build: add command option to generate installer directly
Change-Id: I663f4c7d736d62063f897d9551fc2e97ad5360ef
parent
46251d53
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
JamiInstaller/JamiInstaller.wixproj
+1
-0
1 addition, 0 deletions
JamiInstaller/JamiInstaller.wixproj
make-client.py
+17
-0
17 additions, 0 deletions
make-client.py
with
18 additions
and
0 deletions
JamiInstaller/JamiInstaller.wixproj
+
1
−
0
View file @
3ac51f32
...
...
@@ -11,6 +11,7 @@
<OutputType>
Package
</OutputType>
<Name>
JamiInstaller
</Name>
<InstallerPlatform>
x64
</InstallerPlatform>
<DefineSolutionProperties>
false
</DefineSolutionProperties>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Release|x64' "
>
<OutputPath>
bin\$(Configuration)\
</OutputPath>
...
...
This diff is collapsed.
Click to expand it.
make-client.py
+
17
−
0
View file @
3ac51f32
...
...
@@ -29,6 +29,7 @@ qt_kit_path = 'msvc2019_64'
qt_root_path
=
os
.
getenv
(
'
QT_ROOT_DIRECTORY
'
,
qt_path
)
# project path
installer_project
=
os
.
path
.
join
(
this_dir
,
'
JamiInstaller
'
,
'
JamiInstaller.wixproj
'
)
unit_test_project
=
os
.
path
.
join
(
build_dir
,
'
tests
'
,
'
unittests.vcxproj
'
)
qml_test_project
=
os
.
path
.
join
(
build_dir
,
'
tests
'
,
'
qml_tests.vcxproj
'
)
...
...
@@ -261,6 +262,17 @@ def run_tests(mute_jamid, output_to_files):
test_result_code
=
1
sys
.
exit
(
test_result_code
)
def
generate_msi_installer
():
print
(
'
Generating application installer...
'
)
vs_env_vars
=
{}
vs_env_vars
.
update
(
getVSEnv
())
msbuild
=
findMSBuild
()
if
not
os
.
path
.
isfile
(
msbuild
):
raise
IOError
(
'
msbuild.exe not found. path=
'
+
msbuild
)
msbuild_args
=
getMSBuildArgs
(
'
x64
'
,
'
Release
'
)
build_project
(
msbuild
,
msbuild_args
,
installer_project
,
vs_env_vars
)
def
parse_args
():
ap
=
argparse
.
ArgumentParser
(
description
=
"
Client qt build tool
"
)
...
...
@@ -287,6 +299,8 @@ def parse_args():
'
-l
'
,
'
--logtests
'
,
action
=
'
store_true
'
,
default
=
False
,
help
=
'
Output tests log to files
'
)
subparser
.
add_parser
(
'
msi
'
)
parsed_args
=
ap
.
parse_args
()
return
parsed_args
...
...
@@ -315,6 +329,9 @@ def main():
if
parsed_args
.
runtests
:
run_tests
(
parsed_args
.
mutejamid
,
parsed_args
.
outputtofiles
)
if
parsed_args
.
subparser_name
==
'
msi
'
:
generate_msi_installer
()
if
__name__
==
'
__main__
'
:
main
()
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