Skip to content
Snippets Groups Projects
Commit 7488e866 authored by Jenkins's avatar Jenkins
Browse files

submodules: update nightly branch

parents eba9b85e 0d9f4e8a
No related branches found
Tags android/release_218
No related merge requests found
client-android @ 9d327802
Subproject commit 51185754b7100495526eb4d972aff8bd82619242
Subproject commit 9d327802ab2def22641aa5cc8935c37710f2efe6
daemon @ 33823822
Subproject commit fbeda916293f7b0d99fc16de5bc44e94b218cdd6
Subproject commit 33823822334c3170c02d33945a1fd065111be291
......@@ -15,11 +15,11 @@ def execute_cmd(cmd, with_shell=False):
def build_daemon(parsed_args):
make_cmd = os.path.dirname(this_dir) + '\\daemon\\msvc\\winmake.py'
os.chdir(os.path.dirname(this_dir) + '\\daemon\\msvc')
execute_cmd('cmake -DCMAKE_CONFIGURATION_TYPES="ReleaseLib_win32" -DCMAKE_VS_PLATFORM_NAME="x64" -G "Visual Studio 16 2019" -A x64 -T $(DefaultPlatformToolset) ..')
make_cmd = os.path.dirname(this_dir) + '\\daemon\\compat\\msvc\\winmake.py'
os.chdir(os.path.dirname(this_dir) + '\\daemon\\compat\\msvc')
status_code = execute_cmd('python ' + make_cmd + ' -iv -t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -b daemon')
os.chdir(os.path.dirname(this_dir))
return execute_cmd('python ' + make_cmd + ' -iv -t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -b daemon')
return status_code
def build_lrc(parsed_args):
......@@ -36,7 +36,7 @@ def build_client(parsed_args):
if not os.path.exists('./x64/Release/qt.conf'):
ret &= not execute_cmd(
'powershell -ExecutionPolicy Unrestricted -File copy-runtime-files.ps1', True)
'powershell -ExecutionPolicy Unrestricted -File copy-runtime-files.ps1' + ' "Release" ' + '"' + parsed_args.qtver + '"', True)
return ret
def parse_args():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment