public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: uname: allow to specify external release info
Date: Thu, 24 Nov 2022 19:51:17 +0000 (GMT)	[thread overview]
Message-ID: <20221124195117.495AA382EF21@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=afa957ae5b8187996e0c7c500e2b747cd55347e9

commit afa957ae5b8187996e0c7c500e2b747cd55347e9
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Thu Nov 24 12:23:09 2022 +0100

    Cygwin: uname: allow to specify external release info
    
    When creating regular Cygwin test releases we need a way to
    automate unambiguous version information based on the output
    of `git describe'.  Allow to inject a release string via a
    preprocessor macro CYGPORT__RELEASE_INFO.  Change the default
    release info to recognize a local, non-distro build.
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/uname.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
index 7e0d8849b..e893660c6 100644
--- a/winsup/cygwin/uname.cc
+++ b/winsup/cygwin/uname.cc
@@ -42,11 +42,15 @@ uname_x (struct utsname *name)
       cygwin_gethostname (buf, sizeof buf - 1);
       strncat (name->nodename, buf, sizeof (name->nodename) - 1);
       /* release */
-      __small_sprintf (name->release, "%d.%d.%d-%d.",
+#ifdef CYGPORT_RELEASE_INFO
+      stpcpy (name->release, __XSTRING (CYGPORT_RELEASE_INFO));
+#else
+      __small_sprintf (name->release, "%d.%d.%d-0.%d.local.",
 		       cygwin_version.dll_major / 1000,
 		       cygwin_version.dll_major % 1000,
 		       cygwin_version.dll_minor,
 		       cygwin_version.api_minor);
+#endif
       /* version */
       stpcpy (name->version, cygwin_version.dll_build_date);
       strcat (name->version, " UTC");

                 reply	other threads:[~2022-11-24 19:51 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221124195117.495AA382EF21@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).