From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 3D91B382EF18; Thu, 24 Nov 2022 19:51:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3D91B382EF18 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669319472; bh=Xc7bEbmakqIf4MTz4OhG9+9WPp7xIrAa2Svg9dxSNPM=; h=From:To:Subject:Date:From; b=EvbxWm9OOKM1Fkbux/EjGHzSPIjLWoPCvyae8EHQTMzGzBmBMD7xJQlY2dxKqrRgE OIu3ehx+nroqnPrtOYf9xvjabgyzH0qluum3Gc50IqmZ7zkVzqQRvnqnXQCUehtZIo CXg6+oDfHx7Ov3fd9Y0oa9S/v/cJuyPhcAEIiTfc= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: drop snapshot handling X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: b7aca332cec94ca059a675024106924968742156 X-Git-Newrev: 244be41a1f8dee5c9c8ee48742172fcce0010571 Message-Id: <20221124195112.3D91B382EF18@sourceware.org> Date: Thu, 24 Nov 2022 19:51:12 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D244be41a1f8= dee5c9c8ee48742172fcce0010571 commit 244be41a1f8dee5c9c8ee48742172fcce0010571 Author: Corinna Vinschen Date: Thu Nov 24 12:20:50 2022 +0100 Cygwin: drop snapshot handling =20 We're going to switch to regular test releases, rather than the old, handcrafted snapshots method. =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/scripts/mkvers.sh | 19 +------------------ winsup/cygwin/uname.cc | 12 +----------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/winsup/cygwin/scripts/mkvers.sh b/winsup/cygwin/scripts/mkvers= .sh index b2db73cc7..96af936ec 100755 --- a/winsup/cygwin/scripts/mkvers.sh +++ b/winsup/cygwin/scripts/mkvers.sh @@ -105,15 +105,6 @@ wv_cvs_tag=3D"$cvs_tag" # and set dir accordingly. dir=3D$(echo $dir | sed -e 's%/include/cygwin.*$%%' -e 's%include/cygwin.*= $%.%') =20 -# Look in $dir for a a ".snapshot-date" file. If one is found then this -# information will be saved for output to the DLL. -# -if [ -r "$dir/.snapshot-date" ]; then - read snapshotdate < "$dir/.snapshot-date" - snapshot=3D"snapshot date -$snapshotdate" -fi - # # Scan the version.h file for strings that begin with CYGWIN_INFO or # CYGWIN_VERSION. Perform crude parsing on the lines to get the values @@ -129,7 +120,6 @@ fi \2%p' $incfile | sed -e 's/["\\]//g' -e '/^_/y/ABCDEFGHIJKLMNOPQRSTUVWXYZ= _/abcdefghijklmnopqrstuvwxyz /'; echo ' build date'; echo $build_date; [ -n "$cvs_tag" ] && echo "$cvs_tag"; - [ -n "$snapshot" ] && echo "$snapshot" ) | while read var; do read val cat <&9 =20 trap "rm -f /tmp/mkvers.$$" 0 1 2 15 =20 -if [ -n "$snapshotdate" ]; then - usedate=3D"$(echo $snapshotdate \ - | sed -e 's/\(....\)\(..\)\(..\)-\(..:..\).*$/\1-\2-\3 \4SNP/')" -else - usedate=3D"$builddate" -fi - # # Finally, output the shared ID and set up the cygwin_version structure # for use by Cygwin itself. @@ -163,7 +146,7 @@ cygwin_version_info cygwin_version =3D CYGWIN_VERSION_DLL_MAJOR, CYGWIN_VERSION_DLL_MINOR, CYGWIN_VERSION_SHARED_DATA, CYGWIN_VERSION_MOUNT_REGISTRY, - "$usedate", + "$builddate", #ifdef DEBUGGING CYGWIN_VERSION_DLL_IDENTIFIER "S" shared_data_version "-$builddate" #else diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc index 136b1c57a..7e0d8849b 100644 --- a/winsup/cygwin/uname.cc +++ b/winsup/cygwin/uname.cc @@ -32,7 +32,6 @@ uname_x (struct utsname *name) __try { char buf[NI_MAXHOST + 1] ATTRIBUTE_NONSTRING; - char *snp =3D strstr (cygwin_version.dll_build_date, "SNP"); =20 memset (name, 0, sizeof (*name)); /* sysname */ @@ -50,8 +49,6 @@ uname_x (struct utsname *name) cygwin_version.api_minor); /* version */ stpcpy (name->version, cygwin_version.dll_build_date); - if (snp) - name->version[snp - cygwin_version.dll_build_date] =3D '\0'; strcat (name->version, " UTC"); /* machine */ switch (wincap.cpu_arch ()) @@ -63,8 +60,6 @@ uname_x (struct utsname *name) strcpy (name->machine, "unknown"); break; } - if (snp) - strcat (name->release, ".snap"); /* domainame */ memset (buf, 0, sizeof buf); getdomainname (buf, sizeof buf - 1); @@ -91,8 +86,6 @@ uname (struct utsname *in_name) struct old_utsname *name =3D (struct old_utsname *) in_name; __try { - char *snp =3D strstr (cygwin_version.dll_build_date, "SNP"); - memset (name, 0, sizeof (*name)); __small_sprintf (name->sysname, "CYGWIN_%s", wincap.osname ()); =20 @@ -100,11 +93,10 @@ uname (struct utsname *in_name) cygwin_gethostname (name->nodename, sizeof (name->nodename) - 1); =20 /* Cygwin dll release */ - __small_sprintf (name->release, "%d.%d.%d%s(%d.%d/%d/%d)", + __small_sprintf (name->release, "%d.%d.%d(%d.%d/%d/%d)", cygwin_version.dll_major / 1000, cygwin_version.dll_major % 1000, cygwin_version.dll_minor, - snp ? "s" : "", cygwin_version.api_major, cygwin_version.api_minor, cygwin_version.shared_data, @@ -112,8 +104,6 @@ uname (struct utsname *in_name) =20 /* Cygwin "version" aka build date */ strcpy (name->version, cygwin_version.dll_build_date); - if (snp) - name->version[snp - cygwin_version.dll_build_date] =3D '\0'; =20 /* CPU type */ switch (wincap.cpu_arch ())