From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 694E03858D33; Thu, 1 Feb 2024 11:09:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 694E03858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1706785798; bh=CbDSK8nnB5s65NxEML1TvCarw3l+yH5YgsUPOqqYDZU=; h=To:Subject:Date:From:From; b=brQFhHaK/Xfln5S6DktblkGQq96cw+2HOnqYdiiNToNQXlgPs52Tr/irF0zL7WBRa gSsY07PWNaCmH/XOPrI/BhOt0+ziz/1EVXIaPQDWzXpNlOuKvTKG9px7mMwL64uSdU UseLPIzgXog7cbGU13vwUXHqIQUyV/OYocJ8IVVM= To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program] branch master, updated. release_2.929 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 668cc4d7855fb025c171cd5fd86260845e5c2eb0 X-Git-Newrev: 9cee1581fcbf9c5a0fee2fd24b2789fe6216f947 Message-Id: <20240201110958.694E03858D33@sourceware.org> Date: Thu, 1 Feb 2024 11:09:58 +0000 (GMT) From: Jon Turney List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=9cee1581fcbf9c5a0fee2fd24b2789fe6216f947 commit 9cee1581fcbf9c5a0fee2fd24b2789fe6216f947 Author: Jon Turney Date: Mon Jan 22 14:29:01 2024 +0000 Make Windows <= 6.2 unsupported https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=8331b9dc1f7beaeec059227f5965e39e392d9ab9 commit 8331b9dc1f7beaeec059227f5965e39e392d9ab9 Author: Jon Turney Date: Fri Nov 17 12:49:40 2023 +0000 Improvements to how we deploy uncompressed executable Diff: --- Makefile.am | 6 ++++-- main.cc | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1c6168d6..b459d16f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -334,7 +334,7 @@ upx: strip release: upx @$(MKDIR_P) release cp stripped/setup.dbg release/setup-${VER}.${ARCH}.dbg - cp stripped/setup${EXEEXT} release/setup-uncompressed-${VER}.${ARCH}${EXEEXT} + cp stripped/setup${EXEEXT} release/setup-${VER}-uncompressed.${ARCH}${EXEEXT} cp upx/setup${EXEEXT} release/setup-${VER}.${ARCH}${EXEEXT} UPLOAD_HOST=cygwin-admin@cygwin.com @@ -342,8 +342,10 @@ UPLOAD_PATH=/www/sourceware/htdocs/cygwin/setup SIGN_KEYS="--enable-dsa2 --personal-digest-preferences=sha256 -u 1A698DE9E2E56300" upload: release - cd release ; scp setup-${VER}.$(ARCH).exe setup-${VER}.$(ARCH).dbg setup-uncompressed-${VER}.${ARCH}${EXEEXT} ${UPLOAD_HOST}:${UPLOAD_PATH} + cd release ; scp setup-${VER}.$(ARCH).exe setup-${VER}.$(ARCH).dbg setup-${VER}-uncompressed.${ARCH}${EXEEXT} ${UPLOAD_HOST}:${UPLOAD_PATH} ssh ${UPLOAD_HOST} gpg --batch ${SIGN_KEYS} --detach-sign ${UPLOAD_PATH}/setup-${VER}.$(ARCH).exe + ssh ${UPLOAD_HOST} gpg --batch ${SIGN_KEYS} --detach-sign ${UPLOAD_PATH}/setup-${VER}-uncompressed.$(ARCH).exe + ssh ${UPLOAD_HOST} "cd ${UPLOAD_PATH} && sha512sum *.exe > sha512.sum" clean-local: rm -rf stripped upx release diff --git a/main.cc b/main.cc index 01c90b95..198a943e 100644 --- a/main.cc +++ b/main.cc @@ -361,23 +361,24 @@ WinMain (HINSTANCE h, Logger ().exit (1, false); } else if ((OSMajorVersion () < 6) || - ((OSMajorVersion () == 6) && (OSMinorVersion() < 1))) + ((OSMajorVersion () == 6) && (OSMinorVersion() < 3))) { mbox (NULL, IDS_UNSUPPORTED_WINDOWS_VERSION, MB_ICONEXCLAMATION | MB_OK); Logger ().exit (1, false); } +#if 0 /* - Warn if Windows version is deprecated for Cygwin: Current plans are to - deprecate Windows 7 & 8 sometime during the Cygwin DLL 3.4 lifetime + Warn if Windows version is deprecated for Cygwin */ if (!DeprecatedOption && !elevate) { - if ((OSMajorVersion () == 6) && (OSMinorVersion() < 3)) + if ((OSMajorVersion () == 6) && (OSMinorVersion() < 4)) mbox (NULL, IDS_DEPRECATED_WINDOWS_VERSION, MB_ICONEXCLAMATION | MB_OK | MB_DSA_CHECKBOX); } +#endif } /* Set default DACL and Group. */