lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-04-21 21:52:03 +02:00
Code Activity

build: Move build.py to extras/scripts/build-windows.py.

Browse source 
This build.py script is Windows-specific, as such we move it to
extras/scripts/build-windows.py in preparation for importing the main
cross-platform build.py script from the jami-project.git repository.

Change-Id: I7d7d98ffb67f7fcdea767d28fd8cdefabea98d4b
This commit is contained in:
Amin Bandali 2022-11-02 08:36:13 -04:00 • committed by Sébastien Blin
parent 60617a280c
commit adcdcc8c1e
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
build.py → extras/scripts/build-windows.py
View file

@ -19,7 +19,8 @@ vs_where_path = os.path.join(
host_is_64bit = (False, True)[platform.machine().endswith('64')] host_is_64bit = (False, True)[platform.machine().endswith('64')]
this_dir = os.path.dirname(os.path.realpath(__file__)) this_dir = os.path.dirname(os.path.realpath(__file__))
build_dir = os.path.join(this_dir, 'build') repo_root_dir = os.path.dirname(os.path.dirname(this_dir))
build_dir = os.path.join(repo_root_dir, 'build')
temp_path = os.environ['TEMP'] temp_path = os.environ['TEMP']
openssl_include_dir = 'C:\\Qt\\Tools\\OpenSSL\\Win_x64\\include\\openssl' openssl_include_dir = 'C:\\Qt\\Tools\\OpenSSL\\Win_x64\\include\\openssl'
@ -30,17 +31,17 @@ qt_root_path = os.getenv('QT_ROOT_DIRECTORY', qt_path)
# project path # project path
installer_project = os.path.join( installer_project = os.path.join(
this_dir, 'JamiInstaller', 'JamiInstaller.wixproj') repo_root_dir, 'JamiInstaller', 'JamiInstaller.wixproj')
unit_test_project = os.path.join(build_dir, 'tests', 'unittests.vcxproj') unit_test_project = os.path.join(build_dir, 'tests', 'unittests.vcxproj')
qml_test_project = os.path.join(build_dir, 'tests', 'qml_tests.vcxproj') qml_test_project = os.path.join(build_dir, 'tests', 'qml_tests.vcxproj')
# test executable command # test executable command
qml_test_exe = os.path.join(this_dir, 'x64', 'test', 'qml_tests.exe -input ') + \ qml_test_exe = os.path.join(repo_root_dir, 'x64', 'test', 'qml_tests.exe -input ') + \
os.path.join(this_dir, 'tests', 'qml') os.path.join(repo_root_dir, 'tests', 'qml')
unit_test_exe = os.path.join(this_dir, 'x64', 'test', 'unittests.exe') unit_test_exe = os.path.join(repo_root_dir, 'x64', 'test', 'unittests.exe')
def execute_cmd(cmd, with_shell=False, env_vars=None, cmd_dir=os.getcwd()): def execute_cmd(cmd, with_shell=False, env_vars=None, cmd_dir=repo_root_dir):
p = subprocess.Popen(cmd, p = subprocess.Popen(cmd,
shell=with_shell, shell=with_shell,
stdout=sys.stdout, stdout=sys.stdout,
@ -179,8 +180,8 @@ def build_deps():
'--ignore-whitespace', '--ignore-whitespace',
'--whitespace=fix' '--whitespace=fix'
] ]
qrencode_dir = os.path.join(this_dir, '3rdparty', 'qrencode-win32') qrencode_dir = os.path.join(repo_root_dir, '3rdparty', 'qrencode-win32')
patch_file = os.path.join(this_dir, 'qrencode-win32.patch') patch_file = os.path.join(repo_root_dir, 'qrencode-win32.patch')
apply_cmd.append(patch_file) apply_cmd.append(patch_file)
print(apply_cmd) print(apply_cmd)
if(execute_cmd(apply_cmd, False, None, qrencode_dir)): if(execute_cmd(apply_cmd, False, None, qrencode_dir)):
@ -206,7 +207,7 @@ def build(config_str, qtver, tests=False):
vs_env_vars.update(getVSEnv()) vs_env_vars.update(getVSEnv())
qt_dir = os.path.join(qt_root_path, qtver, qt_kit_path) qt_dir = os.path.join(qt_root_path, qtver, qt_kit_path)
daemon_dir = os.path.dirname(this_dir) + '\\daemon' daemon_dir = os.path.dirname(repo_root_dir) + '\\daemon'
daemon_bin_dir = daemon_dir + '\\build\\x64\\ReleaseLib_win32\\bin' daemon_bin_dir = daemon_dir + '\\build\\x64\\ReleaseLib_win32\\bin'
cmake_options = [ cmake_options = [
@ -251,9 +252,9 @@ def run_tests(mute_jamid, output_to_files):
test_exe_command_list[1] += ' -mutejamid' test_exe_command_list[1] += ' -mutejamid'
if output_to_files: if output_to_files:
test_exe_command_list[0] += ' -o ' + \ test_exe_command_list[0] += ' -o ' + \
os.path.join(this_dir, 'x64', 'test', 'qml_tests.txt') os.path.join(repo_root_dir, 'x64', 'test', 'qml_tests.txt')
test_exe_command_list[1] += ' > ' + \ test_exe_command_list[1] += ' > ' + \
os.path.join(this_dir, 'x64', 'test', 'unittests.txt') os.path.join(repo_root_dir, 'x64', 'test', 'unittests.txt')
test_result_code = 0 test_result_code = 0