lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 12:03:18 +02:00
Code Activity

build: add command option to generate installer directly

Browse source 
Change-Id: I663f4c7d736d62063f897d9551fc2e97ad5360ef
This commit is contained in:
Ming Rui Zhang 2021-11-15 15:10:39 -05:00 • committed by Andreas Traczyk
parent 46251d5338
commit 3ac51f325a
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
JamiInstaller/JamiInstaller.wixproj
View file

@ -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>

17
make-client.py
View file

@ -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()