From d4bc7bad78ca0bfd8c003d13ecf892b1f04bc9f6 Mon Sep 17 00:00:00 2001 From: kleuter Date: Mon, 4 Dec 2023 20:14:52 +0100 Subject: [PATCH] 6.6.1 build script --- {6.6.0 => 6.6.1}/_tools/7z.dll | Bin {6.6.0 => 6.6.1}/_tools/7z.exe | Bin {6.6.0 => 6.6.1}/_tools/cmake.7z | Bin {6.6.0 => 6.6.1}/_tools/ninja.exe | Bin {6.6.0 => 6.6.1}/_tools/openssl-1.1.1k-WIN32.7z | Bin {6.6.0 => 6.6.1}/_tools/openssl-1.1.1k-WIN64A.7z | Bin {6.6.0 => 6.6.1}/_tools/wget.exe | Bin {6.6.0 => 6.6.1}/compile_win.pl | 6 +++--- 8 files changed, 3 insertions(+), 3 deletions(-) rename {6.6.0 => 6.6.1}/_tools/7z.dll (100%) rename {6.6.0 => 6.6.1}/_tools/7z.exe (100%) rename {6.6.0 => 6.6.1}/_tools/cmake.7z (100%) rename {6.6.0 => 6.6.1}/_tools/ninja.exe (100%) rename {6.6.0 => 6.6.1}/_tools/openssl-1.1.1k-WIN32.7z (100%) rename {6.6.0 => 6.6.1}/_tools/openssl-1.1.1k-WIN64A.7z (100%) rename {6.6.0 => 6.6.1}/_tools/wget.exe (100%) rename {6.6.0 => 6.6.1}/compile_win.pl (97%) diff --git a/6.6.0/_tools/7z.dll b/6.6.1/_tools/7z.dll similarity index 100% rename from 6.6.0/_tools/7z.dll rename to 6.6.1/_tools/7z.dll diff --git a/6.6.0/_tools/7z.exe b/6.6.1/_tools/7z.exe similarity index 100% rename from 6.6.0/_tools/7z.exe rename to 6.6.1/_tools/7z.exe diff --git a/6.6.0/_tools/cmake.7z b/6.6.1/_tools/cmake.7z similarity index 100% rename from 6.6.0/_tools/cmake.7z rename to 6.6.1/_tools/cmake.7z diff --git a/6.6.0/_tools/ninja.exe b/6.6.1/_tools/ninja.exe similarity index 100% rename from 6.6.0/_tools/ninja.exe rename to 6.6.1/_tools/ninja.exe diff --git a/6.6.0/_tools/openssl-1.1.1k-WIN32.7z b/6.6.1/_tools/openssl-1.1.1k-WIN32.7z similarity index 100% rename from 6.6.0/_tools/openssl-1.1.1k-WIN32.7z rename to 6.6.1/_tools/openssl-1.1.1k-WIN32.7z diff --git a/6.6.0/_tools/openssl-1.1.1k-WIN64A.7z b/6.6.1/_tools/openssl-1.1.1k-WIN64A.7z similarity index 100% rename from 6.6.0/_tools/openssl-1.1.1k-WIN64A.7z rename to 6.6.1/_tools/openssl-1.1.1k-WIN64A.7z diff --git a/6.6.0/_tools/wget.exe b/6.6.1/_tools/wget.exe similarity index 100% rename from 6.6.0/_tools/wget.exe rename to 6.6.1/_tools/wget.exe diff --git a/6.6.0/compile_win.pl b/6.6.1/compile_win.pl similarity index 97% rename from 6.6.0/compile_win.pl rename to 6.6.1/compile_win.pl index f903209..f51581e 100644 --- a/6.6.0/compile_win.pl +++ b/6.6.1/compile_win.pl @@ -36,9 +36,9 @@ printLineToBat ("SET PATH=%_ROOT%\\qtbase\\bin;%_ROOT%\\gnuwin32\\bin;%PATH%"); printLineToBat ("SET OPENSSL_LIBS=-lUser32 -lAdvapi32 -lGdi32 -llibcrypto -llibssl"); printLineToBat ("cd _tools"); -printLineToBat ("7z x cmake.7z -aoa"); +printLineToBat ("7z x cmake.7z -aoa -y"); -printLineToBat ("7z x $openssl_7z -o$openssl_dir") if (-e "_tools\\$openssl_7z"); +printLineToBat ("7z x $openssl_7z -o$openssl_dir -y") if (-e "_tools\\$openssl_7z"); printLineToBat ("cd .."); printLineToBat ("IF EXIST qt6-build GOTO SECOND_STEP"); @@ -52,7 +52,7 @@ printLineToBat ("if \"%~1\"==\"step2\" goto step2"); printLineToBat ("IF EXIST $openssl_dir\\build GOTO OPENSSL_ALREAD_COMPILED"); printLineToBat ("wget --no-check-certificate $openssl_download"); printLineToBat ("7z x openssl-$openssl_version.tar.gz"); -printLineToBat ("7z x openssl-$openssl_version.tar -o$openssl_dir"); +printLineToBat ("7z x openssl-$openssl_version.tar -o$openssl_dir -y"); printLineToBat ("mv $openssl_dir\\openssl-$openssl_version\\* $openssl_dir"); printLineToBat ("rmdir $openssl_dir\\openssl-$openssl_version"); # empty now printLineToBat ("rm openssl-$openssl_version.tar.gz");