[Powertop] Re: [PATCH 1/3 v1] Revert "configure.ac: version strings from git describe"

* [Powertop] Re: [PATCH 1/3 v1] Revert "configure.ac: version strings from git describe"
@ 2020-04-02 20:07 Kammela, Gayatri
  0 siblings, 0 replies; 6+ messages in thread
From: Kammela, Gayatri @ 2020-04-02 20:07 UTC (permalink / raw)
  To: powertop

[-- Attachment #1: Type: text/plain, Size: 5793 bytes --]

> -----Original Message-----
> From: Kammela, Gayatri <gayatri.kammela(a)intel.com>
> Sent: Thursday, April 2, 2020 9:27 AM
> To: Anthony Wong <yp(a)anthonywong.net>; powertop(a)lists.01.org; Joe
> Konno <joe.konno(a)linux.intel.com>
> Subject: [Powertop] Re: [PATCH 1/3 v1] Revert "configure.ac: version strings
> from git describe"
> 
> > -----Original Message-----
> > From: Anthony Wong <yp(a)anthonywong.net>
> > Sent: Wednesday, April 1, 2020 10:55 PM
> > To: powertop(a)lists.01.org; Joe Konno <joe.konno(a)linux.intel.com>
> > Subject: [Powertop] Re: [PATCH 1/3 v1] Revert "configure.ac: version
> > strings from git describe"
> >
> > This patch has not been fully applied to the github project, the
> > src/display.cpp part has been left out, making the program now fail to
> > compile.
> > Please see
> >
> https://github.com/fenrus75/powertop/commit/152a39949691d34e1c6d672
> > 72f3b63cbbe61bf81
> 
> Thanks for reporting this Anthony! Joe can you please fix the issue?
Sorry for the noise, the patch that Joe sent was not applied cleanly but his patch does take care of the src/display.cpp [1] part

[1]https://lists.01.org/hyperkitty/list/powertop(a)lists.01.org/thread/S5YD6QROVDHJSSWDO5A2UMZRESE777GJ/
> 
> >
> > --
> > Anthony
> >
> > On Wed, 12 Feb 2020 at 06:16, Joe Konno <joe.konno(a)linux.intel.com>
> > wrote:
> > >
> > > From: Joe Konno <joe.konno(a)intel.com>
> > >
> > > This doesn't work as well as I thought it would. So, let's remove it.
> > > As a result of the revert, remove a reference to a now-dead
> > > preprocessor define (PACKAGE_SHORT_VERSION).
> > >
> > > This reverts commit 2daaaf54d07340610af759cc7f4c41742abb3277.
> > >
> > > Signed-off-by: Joe Konno <joe.konno(a)intel.com>
> > > ---
> > >  .gitignore      |  1 -
> > >  Makefile.am     |  2 --
> > >  autogen.sh      |  1 -
> > >  configure.ac    |  5 +----
> > >  scripts/version | 13 -------------
> > >  src/display.cpp |  2 +-
> > >  6 files changed, 2 insertions(+), 22 deletions(-)  delete mode
> > > 100644 scripts/version
> > >
> > > diff --git a/.gitignore b/.gitignore index
> > > 8358ca4c6c0f..c1fc2be37afe 100644
> > > --- a/.gitignore
> > > +++ b/.gitignore
> > > @@ -89,5 +89,4 @@ Makefile.in
> > >  /src/powertop
> > >  /stamp-h1
> > >  /stamp-po
> > > -/version*
> > >  tags
> > > diff --git a/Makefile.am b/Makefile.am index
> > > ffb5e91b2834..22429e0ce562 100644
> > > --- a/Makefile.am
> > > +++ b/Makefile.am
> > > @@ -15,6 +15,4 @@ EXTRA_DIST = \
> > >         TODO \
> > >         Android.mk \
> > >         COPYING \
> > > -       version-long \
> > > -       version-short \
> > >         autogen.sh
> > > diff --git a/autogen.sh b/autogen.sh index
> > > 444f9998f806..e210037d70e0 100755
> > > --- a/autogen.sh
> > > +++ b/autogen.sh
> > > @@ -1,4 +1,3 @@
> > >  #!/bin/sh
> > >
> > > -sh scripts/version
> > >  autoreconf --install --verbose
> > > diff --git a/configure.ac b/configure.ac index
> > > ca7f1d5cefea..b3a6b2ca2639 100644
> > > --- a/configure.ac
> > > +++ b/configure.ac
> > > @@ -2,8 +2,7 @@
> > >  # Process this file with autoconf to produce a configure script.
> > >
> > >  AC_PREREQ([2.68])
> > > -AC_INIT([powertop], m4_esyscmd_s([cat version-long]),
> > > -       [powertop(a)lists.01.org], [], [https://01.org/powertop])
> > > +AC_INIT([powertop], [2.12-pre], [powertop(a)lists.01.org], [],
> > > +[https://01.org/powertop])
> > >  AM_INIT_AUTOMAKE([
> > >         -Wall
> > >         1.12.2
> > > @@ -152,8 +151,6 @@ AC_SEARCH_LIBS([inet_aton], [resolv], [], [
> > >         AC_MSG_ERROR([libresolv is required but was not found])  ],
> > > [])
> > >
> > > -AC_DEFINE([PACKAGE_SHORT_VERSION], m4_esyscmd_s([cat version-
> > short]),
> > > -       [Short package version])
> > >
> > >  AS_IF([`pkg-config --exists bash-completion`], [
> > >         bashcompletiondir=`pkg-config --variable=completionsdir
> > > --define-variable=prefix=${prefix} bash-completion` diff --git
> > > a/scripts/version b/scripts/version deleted file mode 100644 index
> > > 348b13d9f785..000000000000
> > > --- a/scripts/version
> > > +++ /dev/null
> > > @@ -1,13 +0,0 @@
> > > -#!/bin/sh
> > > -
> > > -git branch > /dev/null 2>&1
> > > -if [ "$?" = "0" ]; then
> > > -       LONG=$(git describe --abbrev=7 --tags --always --dirty 2> /dev/null)
> > > -       SHORT=\"$(git describe --tags --abbrev=0 2> /dev/null)\"
> > > -else
> > > -       LONG="RUN-VERSION-SCRIPT-IN-GIT-REPOSITORY-ONLY"
> > > -       SHORT=\"$LONG\"
> > > -fi
> > > -
> > > -echo $LONG  > version-long
> > > -echo $SHORT > version-short
> > > diff --git a/src/display.cpp b/src/display.cpp index
> > > 7b3a7a2f2073..71311446728d 100644
> > > --- a/src/display.cpp
> > > +++ b/src/display.cpp
> > > @@ -117,7 +117,7 @@ void show_tab(unsigned int tab)
> > >
> > >         wattrset(tab_bar, A_REVERSE);
> > >         mvwprintw(tab_bar, 0,0, "%120s", "");
> > > -       mvwprintw(tab_bar, 0,0, "PowerTOP %s",
> > PACKAGE_SHORT_VERSION);
> > > +       mvwprintw(tab_bar, 0,0, "PowerTOP %s", PACKAGE_VERSION);
> > >
> > >         bottom_line = newwin(1, 0, LINES-1, 0);
> > >         wattrset(bottom_line, A_REVERSE);
> > > --
> > > 2.25.0
> > > _______________________________________________
> > > PowerTop mailing list -- powertop(a)lists.01.org To unsubscribe send
> > > an email to powertop-leave(a)lists.01.org
> > _______________________________________________
> > PowerTop mailing list -- powertop(a)lists.01.org To unsubscribe send an
> > email to powertop-leave(a)lists.01.org
> _______________________________________________
> PowerTop mailing list -- powertop(a)lists.01.org To unsubscribe send an email
> to powertop-leave(a)lists.01.org

^ permalink raw reply	[flat|nested] 6+ messages in thread