diff --git a/client-android b/client-android index 23f4d79ee02698a84b52c5a578d936b9504484d8..ce0e8b15da8be7248e0def4f9de74f97559a6ca6 160000 --- a/client-android +++ b/client-android @@ -1 +1 @@ -Subproject commit 23f4d79ee02698a84b52c5a578d936b9504484d8 +Subproject commit ce0e8b15da8be7248e0def4f9de74f97559a6ca6 diff --git a/daemon b/daemon index 4ad78be57ff4008e65134dd676abffd653071fb8..6a883a9a0b678b316bfab3b2cfe972dc2e65d376 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit 4ad78be57ff4008e65134dd676abffd653071fb8 +Subproject commit 6a883a9a0b678b316bfab3b2cfe972dc2e65d376 diff --git a/make-ring.py b/make-ring.py index df6d63be90375a69322e65b7ae9617e0d0ec4b05..14e1f1c6d43f45b1145b7050833cf9b1f5f0bce2 100755 --- a/make-ring.py +++ b/make-ring.py @@ -285,12 +285,13 @@ def run_install(args): return subprocess.run([ sys.executable, os.path.join(os.getcwd(), "scripts/build-windows.py"), "--toolset", args.toolset, - "--sdk", args.sdk + "--sdk", args.sdk, + "--qtver", args.qtver ], check=True) # Unix-like platforms environ = os.environ.copy() - + install_args = ['-p', str(multiprocessing.cpu_count())] if args.static: install_args.append('-s') @@ -308,7 +309,7 @@ def run_install(args): proc = subprocess.run(["brew", "--prefix", "qt5"], stdout=subprocess.PIPE, check=True, universal_newlines=True) - + environ['CMAKE_PREFIX_PATH'] = proc.stdout.rstrip("\n") environ['CONFIGURE_FLAGS'] = '--without-dbus' install_args += ("-c", "client-macosx") @@ -463,6 +464,7 @@ def parse_args(): if choose_distribution() == WIN32_DISTRIBUTION_NAME: ap.add_argument('--toolset', default=win_toolset_default, type=str, help='Windows use only, specify Visual Studio toolset version') ap.add_argument('--sdk', default=win_sdk_default, type=str, help='Windows use only, specify Windows SDK version') + ap.add_argument('--qtver', default='5.9.4', help='Sets the Qt version to build with') parsed_args = ap.parse_args() diff --git a/packaging/rules/debian-one-click-install/rules b/packaging/rules/debian-one-click-install/rules index 572aa88a6b69fccabdfb2b5a4c7ea7974380cea3..67cd76696b25e922a7cd439f748768e407d46129 100755 --- a/packaging/rules/debian-one-click-install/rules +++ b/packaging/rules/debian-one-click-install/rules @@ -50,7 +50,8 @@ override_dh_auto_configure: --disable-natpmp \ --enable-gnutls && \ make list && \ - make -j$(NO_CPUS) V=1 + make -j$(NO_CPUS) V=1 && \ + make -j$(NO_CPUS) .ffmpeg V=1 cd daemon && \ ./autogen.sh && \ ./configure \ diff --git a/scripts/build-package-windows.ps1 b/scripts/build-package-windows.ps1 index 328e26f9cc9ce734a8151599a656d85679c90d75..efc5a1cc5e0d45b6855aedc09c8f488c49ffafd4 100644 --- a/scripts/build-package-windows.ps1 +++ b/scripts/build-package-windows.ps1 @@ -46,9 +46,11 @@ if(Test-Path -Path "C:\Strawberry"){ } if(!(Test-Path -Path "C:\msys64")){ - if(!(Test-Path -Path "C:\tools\msys64")){ - $Env:Path += ";C:\tools\msys64\usr\bin" - $msys2_path = "C:\tools\msys64\usr\bin" + $Env:Path += ";C:\tools\msys64\usr\bin" + $msys2_path = "C:\tools\msys64\usr\bin" + if((Test-Path -Path "C:\tools\msys64")){ + $null = $packages.Remove('msys2') + write-host "MSYS2 64 installed" -ForegroundColor Green } } else { $null = $packages.Remove('msys2') diff --git a/scripts/build-windows.py b/scripts/build-windows.py index 3be0f7daf66b2c2af6b7dd614eaf808d0bc1a803..02181afbb0c9af7372fa6a098f0e32ba0932f4fc 100644 --- a/scripts/build-windows.py +++ b/scripts/build-windows.py @@ -16,12 +16,15 @@ 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) ..') + os.chdir(os.path.dirname(this_dir)) return execute_cmd('python ' + make_cmd + ' -iv -t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -b daemon') def build_lrc(parsed_args): make_cmd = os.path.dirname(this_dir) + '\\lrc\\make-lrc.py' - return execute_cmd('python ' + make_cmd + ' -gb ' + ' -t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk) + return execute_cmd('python ' + make_cmd + ' -gb ' + ' -t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -q ' + parsed_args.qtver) def build_client(parsed_args): @@ -29,7 +32,7 @@ def build_client(parsed_args): ret = 0 ret &= not execute_cmd('pandoc -f markdown -t html5 -o changelog.html changelog.md', True) ret &= not execute_cmd('python make-client.py -d') - ret &= not execute_cmd('python make-client.py -b ' + '-t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk) + ret &= not execute_cmd('python make-client.py -b ' + '-t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -q ' + parsed_args.qtver) if not os.path.exists('./x64/Release/qt.conf'): ret &= not execute_cmd( @@ -43,6 +46,8 @@ def parse_args(): help='Windows use only, specify Visual Studio toolset version') ap.add_argument('--sdk', default='', type=str, help='Windows use only, specify Windows SDK version') + ap.add_argument('--qtver', default='5.9.4', + help='Sets the Qt version to build with') parsed_args = ap.parse_args()