5:27 a.m.
From: Joe Konno <joe.konno(a)intel.com>
Hey gang,
This is a series using 'git describe' to construct version strings. But, there
are caveats.
With autotools, there doesn't seem to be a reliable way to capture code state
in incremental builds (git repo or no), "dirty" code (git repo or no), code
modified in a snapshot (git repo or no), or from a released tarball. The
autotools versioning workflow assumes you unpack/checkout the code, run
configure once, and build once, with no changes made. Assuming that workflow,
this series provides "dynamic"* version information.
That said: once generated, the PACKAGE_VERSION strings in config.h are
effectively static-- irrespective of code changes or commits-- until all
autotools artifacts are removed and autogen.sh run again.
Thanks to eSyr for the note on reproducible builds in a prior review,
specifically the point about time stamps built into the binary. Credit given in
the first patch. ^_^
Joe Konno (3):
main.cpp: remove __DATE__ from --version
configure.ac: version strings from git describe
search/replace POWERTOP_VERSION and SHORT_VERSION
.gitignore | 1 +
Makefile.am | 2 ++
autogen.sh | 1 +
configure.ac | 5 ++++-
scripts/version | 13 +++++++++++++
src/display.cpp | 2 +-
src/lib.h | 3 ---
src/main.cpp | 4 ++--
src/perf/perf.cpp | 2 +-
src/report/report.cpp | 2 +-
10 files changed, 26 insertions(+), 9 deletions(-)
create mode 100644 scripts/version
--
1.8.3.1
5:27 a.m.
New subject: [Powertop] [PATCH v1 1/3] main.cpp: remove __DATE__ from --version
From: Joe Konno <joe.konno(a)intel.com>
Suggested-by: eSyr <evgsyr(a)gmail.com>
Signed-off-by: Joe Konno <joe.konno(a)intel.com>
---
src/main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main.cpp b/src/main.cpp
index 991dd9a68474..e6e41b1ce84d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -99,7 +99,7 @@ static const struct option long_options[] =
static void print_version()
{
- printf(_("PowerTOP version " POWERTOP_VERSION ", compiled on "
__DATE__ "\n"));
+ printf(_("PowerTOP version " POWERTOP_VERSION "\n"));
}
static bool set_refresh_timeout()
--
1.8.3.1
5:27 a.m.
New subject: [Powertop] [PATCH v1 2/3] configure.ac: version strings from git describe
From: Joe Konno <joe.konno(a)intel.com>
There are two version strings we need during runtime: a long version
(for reports and --version), and a short version for the ncurses UI. Use
a utility script to generate those strings (version-long and
version-short) which will be cat'ed by configure and bundled when 'make
dist' is run.
Signed-off-by: Joe Konno <joe.konno(a)intel.com>
---
.gitignore | 1 +
Makefile.am | 2 ++
autogen.sh | 1 +
configure.ac | 5 ++++-
scripts/version | 13 +++++++++++++
5 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 scripts/version
diff --git a/.gitignore b/.gitignore
index 7eb138a094ce..ef817dc076bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,4 +87,5 @@ Makefile.in
/src/powertop
/stamp-h1
/stamp-po
+/version*
tags
diff --git a/Makefile.am b/Makefile.am
index b519d110a118..3aabb22eca6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,4 +14,6 @@ EXTRA_DIST = \
TODO \
Android.mk \
COPYING \
+ version-long \
+ version-short \
autogen.sh
diff --git a/autogen.sh b/autogen.sh
index e210037d70e0..444f9998f806 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,4 @@
#!/bin/sh
+sh scripts/version
autoreconf --install --verbose
diff --git a/configure.ac b/configure.ac
index 646b402101bb..ccfbf7ee0bb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.68])
-AC_INIT([powertop], [2.9-pre], [powertop(a)lists.01.org], [], [https://01.org/powertop])
+AC_INIT([powertop], m4_esyscmd_s([cat version-long]),
+ [powertop(a)lists.01.org], [], [https://01.org/powertop])
AM_INIT_AUTOMAKE([
-Wall
1.12.2
@@ -149,5 +150,7 @@ 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])
AC_OUTPUT
diff --git a/scripts/version b/scripts/version
new file mode 100644
index 000000000000..348b13d9f785
--- /dev/null
+++ b/scripts/version
@@ -0,0 +1,13 @@
+#!/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
--
1.8.3.1
11:53 a.m.
New subject: [Powertop] [PATCH v1 2/3] configure.ac: version strings from git describe
On Fri, Aug 05, 2016 at 12:27:20PM -0700, Joe Konno wrote:
From: Joe Konno <joe.konno(a)intel.com>
There are two version strings we need during runtime: a long version
(for reports and --version), and a short version for the ncurses UI. Use
a utility script to generate those strings (version-long and
version-short) which will be cat'ed by configure and bundled when 'make
dist' is run.
Signed-off-by: Joe Konno <joe.konno(a)intel.com>
What happens if I build this from a distributed package, i.e.
./configure
make dist
ta xzf powertop-version.tar.gz
cd powertop-version
./configure
make
This would normally create a package with no git version info so the version
scripts couldn't work.
This could obviously be regarded as an unsupported case but if so then I think
it should be said so explicitly.
/MF
---
.gitignore | 1 +
Makefile.am | 2 ++
autogen.sh | 1 +
configure.ac | 5 ++++-
scripts/version | 13 +++++++++++++
5 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 scripts/version
diff --git a/.gitignore b/.gitignore
index 7eb138a094ce..ef817dc076bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,4 +87,5 @@ Makefile.in
/src/powertop
/stamp-h1
/stamp-po
+/version*
tags
diff --git a/Makefile.am b/Makefile.am
index b519d110a118..3aabb22eca6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,4 +14,6 @@ EXTRA_DIST = \
TODO \
Android.mk \
COPYING \
+ version-long \
+ version-short \
autogen.sh
diff --git a/autogen.sh b/autogen.sh
index e210037d70e0..444f9998f806 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,4 @@
#!/bin/sh
+sh scripts/version
autoreconf --install --verbose
diff --git a/configure.ac b/configure.ac
index 646b402101bb..ccfbf7ee0bb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.68])
-AC_INIT([powertop], [2.9-pre], [powertop(a)lists.01.org], [], [https://01.org/powertop])
+AC_INIT([powertop], m4_esyscmd_s([cat version-long]),
+ [powertop(a)lists.01.org], [], [https://01.org/powertop])
AM_INIT_AUTOMAKE([
-Wall
1.12.2
@@ -149,5 +150,7 @@ 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])
AC_OUTPUT
diff --git a/scripts/version b/scripts/version
new file mode 100644
index 000000000000..348b13d9f785
--- /dev/null
+++ b/scripts/version
@@ -0,0 +1,13 @@
+#!/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
--
1.8.3.1
_______________________________________________
PowerTop mailing list
PowerTop(a)lists.01.org
https://lists.01.org/mailman/listinfo/powertop
10:14 p.m.
New subject: [Powertop] [PATCH v1 2/3] configure.ac: version strings from git describe
On Sat, Aug 6, 2016 at 4:53 AM, Magnus Fromreide <magfr(a)lysator.liu.se> wrote:
On Fri, Aug 05, 2016 at 12:27:20PM -0700, Joe Konno wrote:
> From: Joe Konno <joe.konno(a)intel.com>
>
> There are two version strings we need during runtime: a long version
> (for reports and --version), and a short version for the ncurses UI. Use
> a utility script to generate those strings (version-long and
> version-short) which will be cat'ed by configure and bundled when 'make
> dist' is run.
>
> Signed-off-by: Joe Konno <joe.konno(a)intel.com>
What happens if I build this from a distributed package, i.e.
./configure
make dist
ta xzf powertop-version.tar.gz
cd powertop-version
./configure
make
This would normally create a package with no git version info so the version
scripts couldn't work.
This could obviously be regarded as an unsupported case but if so then I think
it should be said so explicitly.
Version script is called from autogen, configure
just uses already generated files (which are in dist tarball), so there is no problem
(since it is expected that autogen is called within git repo). If one wants to support
case of autogen-out-of-git-repo, he should add version script to dist and modify it like
this:
---8<---
#!/bin/sh
: "${LONG_VERSION_PATH=version-long}"
: "${SHORT_VERSION_PATH=version-short}"
: "${DIST_SUFFIX=-dist}"
LONG=$(cat "${LONG_VERSION_PATH}" 2>/dev/null)
SHORT=$(cat "${SHORT_VERSION_PATH}" 2>/dev/null)
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
[ -z "$LONG" -a -n "$SHORT" ] && LONG="${SHORT}"
[ -z "$SHORT" -a -n "$LONG" ] && SHORT="${LONG}"
if [ -z "$SHORT" -a -z "$LONG" ]
then
SHORT="${SHORT_VERSION-unknown}"
LONG="${LONG_VERSION-unknown}"
fi
LONG="${LONG%${DIST_SUFFIX}}${DIST_SUFFIX}"
SHORT="${SHORT%${DIST_SUFFIX}}${DIST_SUFFIX}"
fi
echo $LONG > "${LONG_VERSION_PATH}"
echo $SHORT > "${SHORT_VERSION_PATH}"
--->8---
Two main points here — reading cached values at the start of the script and adding a dist
prefix in order to signalize that this is out-of-repo configuration.
--
Eugene "eSyr" Syromyatnikov
mailto:evgSyr@gmail.com
xmpp:eSyr@jabber.{ru|org}
1:49 a.m.
New subject: [Powertop] [PATCH v1 2/3] configure.ac: version strings from git describe
Thank you both for the review and feedback. Some inlined comments below.
On Sat, 6 Aug 2016 15:14:18 +0300
Евгений Сыромятников <evgsyr(a)gmail.com> wrote:
On Sat, Aug 6, 2016 at 4:53 AM, Magnus Fromreide
<magfr(a)lysator.liu.se> wrote:
> On Fri, Aug 05, 2016 at 12:27:20PM -0700, Joe Konno wrote:
>> From: Joe Konno <joe.konno(a)intel.com>
>>
>> There are two version strings we need during runtime: a long version
>> (for reports and --version), and a short version for the ncurses UI. Use
>> a utility script to generate those strings (version-long and
>> version-short) which will be cat'ed by configure and bundled when 'make
>> dist' is run.
>>
>> Signed-off-by: Joe Konno <joe.konno(a)intel.com>
>
> What happens if I build this from a distributed package, i.e.
>
> ./configure
> make dist
> ta xzf powertop-version.tar.gz
> cd powertop-version
> ./configure
> make
>
> This would normally create a package with no git version info so the version
> scripts couldn't work.
>
> This could obviously be regarded as an unsupported case but if so then I
> think it should be said so explicitly.
My assumption is that autogen.sh is run from within a git repo, for any project
using git for version control. I'll add that verbiage to the commit message for
clarity, though. Thanks for the feedback!
Version script is called from autogen, configure just uses already
generated
files (which are in dist tarball), so there is no problem (since it is
expected that autogen is called within git repo). If one wants to support
case of autogen-out-of-git-repo, he should add version script to dist and
modify it like this:
My concern with the version script supporting the 'autogen out of git repo'
scenario-- using eSyr's sample code below as a reference point-- is loss of
connection to the git repository and the state of code when the version strings
are assembled.
My preference is to only support generation of version strings within a git
repository. This is to maintain something like version integrity, mapping code
state to 'git describe' strings. Nivedita and I will only run 'make dist'
inside a git repo when we cut release tarballs for that reason.
If folks want to support the 'autogen out of git repo' scenario, please speak
up, since I don't plan to support it. I hope my justification is clear-- if it
isn't, we can discuss this further. ^_^
---8<---
#!/bin/sh
: "${LONG_VERSION_PATH=version-long}"
: "${SHORT_VERSION_PATH=version-short}"
: "${DIST_SUFFIX=-dist}"
LONG=$(cat "${LONG_VERSION_PATH}" 2>/dev/null)
SHORT=$(cat "${SHORT_VERSION_PATH}" 2>/dev/null)
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
[ -z "$LONG" -a -n "$SHORT" ] && LONG="${SHORT}"
[ -z "$SHORT" -a -n "$LONG" ] && SHORT="${LONG}"
if [ -z "$SHORT" -a -z "$LONG" ]
then
SHORT="${SHORT_VERSION-unknown}"
LONG="${LONG_VERSION-unknown}"
fi
LONG="${LONG%${DIST_SUFFIX}}${DIST_SUFFIX}"
SHORT="${SHORT%${DIST_SUFFIX}}${DIST_SUFFIX}"
fi
echo $LONG > "${LONG_VERSION_PATH}"
echo $SHORT > "${SHORT_VERSION_PATH}"
--->8---
Two main points here — reading cached values at the start of the script and
adding a dist prefix in order to signalize that this is out-of-repo
configuration.
5:27 a.m.
New subject: [Powertop] [PATCH v1 3/3] search/replace POWERTOP_VERSION and SHORT_VERSION
From: Joe Konno <joe.konno(a)intel.com>
Across the codebase, do the following replacements:
POWERTOP_VERSION becomes PACKAGE_VERSION
SHORT_VERSION becomes PACKAGE_SHORT_VERSION
PACKAGE_VERSION now contains a git describe string, and
PACKAGE_SHORT_VERSION will contain an abbreviated describe string for
use in the ncurses UI.
Signed-off-by: Joe Konno <joe.konno(a)intel.com>
---
src/display.cpp | 2 +-
src/lib.h | 3 ---
src/main.cpp | 4 ++--
src/perf/perf.cpp | 2 +-
src/report/report.cpp | 2 +-
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/display.cpp b/src/display.cpp
index 57e3e45a1f75..10ee48a0b99b 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", POWERTOP_SHORT_VERSION);
+ mvwprintw(tab_bar, 0,0, "PowerTOP %s", PACKAGE_SHORT_VERSION);
bottom_line = newwin(1, 0, LINES-1, 0);
wattrset(bottom_line, A_REVERSE);
diff --git a/src/lib.h b/src/lib.h
index c3324efdff1b..b64bb0f5433f 100644
--- a/src/lib.h
+++ b/src/lib.h
@@ -41,9 +41,6 @@
#define _(STRING) (STRING)
#endif
-#define POWERTOP_VERSION "v" PACKAGE_VERSION
-#define POWERTOP_SHORT_VERSION PACKAGE_VERSION
-
extern int is_turbo(uint64_t freq, uint64_t max, uint64_t maxmo);
extern int get_max_cpu(void);
diff --git a/src/main.cpp b/src/main.cpp
index e6e41b1ce84d..7467f0fd6acc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -99,7 +99,7 @@ static const struct option long_options[] =
static void print_version()
{
- printf(_("PowerTOP version " POWERTOP_VERSION "\n"));
+ printf(_("PowerTOP version " PACKAGE_VERSION "\n"));
}
static bool set_refresh_timeout()
@@ -323,7 +323,7 @@ static void checkroot() {
uid = getuid();
if (uid != 0) {
- printf(_("PowerTOP " POWERTOP_VERSION " must be run with root
privileges.\n"));
+ printf(_("PowerTOP " PACKAGE_VERSION " must be run with root
privileges.\n"));
printf(_("exiting...\n"));
exit(EXIT_FAILURE);
}
diff --git a/src/perf/perf.cpp b/src/perf/perf.cpp
index b1103a769ce0..9ed0ba8ec3ef 100644
--- a/src/perf/perf.cpp
+++ b/src/perf/perf.cpp
@@ -114,7 +114,7 @@ void perf_event::create_perf_event(char *eventname, int _cpu)
if (err == EMFILE)
fprintf(stderr, _("Too many open files, please increase the limit of open file
descriptors.\n"));
else {
- fprintf(stderr, _("PowerTOP %s needs the kernel to support the 'perf'
subsystem\n"), POWERTOP_VERSION);
+ fprintf(stderr, _("PowerTOP %s needs the kernel to support the 'perf'
subsystem\n"), PACKAGE_VERSION);
fprintf(stderr, _("as well as support for trace points in the kernel:\n"));
fprintf(stderr,
"CONFIG_PERF_EVENTS=y\nCONFIG_PERF_COUNTERS=y\nCONFIG_TRACEPOINTS=y\nCONFIG_TRACING=y\n");
}
diff --git a/src/report/report.cpp b/src/report/report.cpp
index ddb2e3065502..f0f31ee8cea5 100644
--- a/src/report/report.cpp
+++ b/src/report/report.cpp
@@ -120,7 +120,7 @@ static void system_info(void)
/* Set array of data in row Major order */
string *system_data = new string[sys_table.rows * sys_table.cols];
system_data[0]=__("PowerTOP Version");
- snprintf(version_date, sizeof(version_date), "%s ran at %s", POWERTOP_VERSION,
ctime(&now));
+ snprintf(version_date, sizeof(version_date), "%s ran at %s", PACKAGE_VERSION,
ctime(&now));
system_data[1]=version_date;
str = read_sysfs_string("/proc/version");
--
1.8.3.1
5:59 a.m.
New subject: [Powertop] [PATCH v2 0/3] Versions strings from git describe
From: Joe Konno <joe.konno(a)intel.com>
Hey gang,
Thanks to Magnus and eSyr for the review and feedback. I changed the commit
message in patch 2/3 to clarify use of the version script. No other changes
made to that patch or the others in the series.
See the v1 cover letter for the particulars of this series:
* https://lists.01.org/pipermail/powertop/2016-August/001948.html
Joe Konno (3):
main.cpp: remove __DATE__ from --version
configure.ac: version strings from git describe
search/replace POWERTOP_VERSION and SHORT_VERSION
.gitignore | 1 +
Makefile.am | 2 ++
autogen.sh | 1 +
configure.ac | 5 ++++-
scripts/version | 13 +++++++++++++
src/display.cpp | 2 +-
src/lib.h | 3 ---
src/main.cpp | 4 ++--
src/perf/perf.cpp | 2 +-
src/report/report.cpp | 2 +-
10 files changed, 26 insertions(+), 9 deletions(-)
create mode 100644 scripts/version
--
1.8.3.1
5:59 a.m.
New subject: [Powertop] [PATCH v2 1/3] main.cpp: remove __DATE__ from --version
From: Joe Konno <joe.konno(a)intel.com>
v2: no change from v1
Suggested-by: eSyr <evgsyr(a)gmail.com>
Signed-off-by: Joe Konno <joe.konno(a)intel.com>
---
src/main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main.cpp b/src/main.cpp
index 991dd9a68474..e6e41b1ce84d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -99,7 +99,7 @@ static const struct option long_options[] =
static void print_version()
{
- printf(_("PowerTOP version " POWERTOP_VERSION ", compiled on "
__DATE__ "\n"));
+ printf(_("PowerTOP version " POWERTOP_VERSION "\n"));
}
static bool set_refresh_timeout()
--
1.8.3.1
5:59 a.m.
New subject: [Powertop] [PATCH v2 2/3] configure.ac: version strings from git describe
From: Joe Konno <joe.konno(a)intel.com>
There are two version strings we need during runtime: a long version
(for reports and --version), and a short version for the ncurses UI. Use
a utility script to generate those strings (version-long and
version-short) which will be cat'ed by configure and bundled when 'make
dist' is run.
Note: the version script will only run correctly within a clone of the
PowerTOP git repository. Consumers of a tarball, generated by 'make
dist', should not run autogen.sh or the version script. All necessary
configuration or build artifacts will be included in the tarball.
v2 (Magnus): Changed commit message to include note about intended
execution of the version script (and, by extension, autogen.sh).
Signed-off-by: Joe Konno <joe.konno(a)intel.com>
---
.gitignore | 1 +
Makefile.am | 2 ++
autogen.sh | 1 +
configure.ac | 5 ++++-
scripts/version | 13 +++++++++++++
5 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 scripts/version
diff --git a/.gitignore b/.gitignore
index 7eb138a094ce..ef817dc076bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,4 +87,5 @@ Makefile.in
/src/powertop
/stamp-h1
/stamp-po
+/version*
tags
diff --git a/Makefile.am b/Makefile.am
index b519d110a118..3aabb22eca6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,4 +14,6 @@ EXTRA_DIST = \
TODO \
Android.mk \
COPYING \
+ version-long \
+ version-short \
autogen.sh
diff --git a/autogen.sh b/autogen.sh
index e210037d70e0..444f9998f806 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,4 @@
#!/bin/sh
+sh scripts/version
autoreconf --install --verbose
diff --git a/configure.ac b/configure.ac
index 646b402101bb..ccfbf7ee0bb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.68])
-AC_INIT([powertop], [2.9-pre], [powertop(a)lists.01.org], [], [https://01.org/powertop])
+AC_INIT([powertop], m4_esyscmd_s([cat version-long]),
+ [powertop(a)lists.01.org], [], [https://01.org/powertop])
AM_INIT_AUTOMAKE([
-Wall
1.12.2
@@ -149,5 +150,7 @@ 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])
AC_OUTPUT
diff --git a/scripts/version b/scripts/version
new file mode 100644
index 000000000000..348b13d9f785
--- /dev/null
+++ b/scripts/version
@@ -0,0 +1,13 @@
+#!/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
--
1.8.3.1
5:59 a.m.
New subject: [Powertop] [PATCH v2 3/3] search/replace POWERTOP_VERSION and SHORT_VERSION
From: Joe Konno <joe.konno(a)intel.com>
Across the codebase, do the following replacements:
POWERTOP_VERSION becomes PACKAGE_VERSION
SHORT_VERSION becomes PACKAGE_SHORT_VERSION
PACKAGE_VERSION now contains a git describe string, and
PACKAGE_SHORT_VERSION will contain an abbreviated describe string for
use in the ncurses UI.
v2: no change from v1
Signed-off-by: Joe Konno <joe.konno(a)intel.com>
---
src/display.cpp | 2 +-
src/lib.h | 3 ---
src/main.cpp | 4 ++--
src/perf/perf.cpp | 2 +-
src/report/report.cpp | 2 +-
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/display.cpp b/src/display.cpp
index 57e3e45a1f75..10ee48a0b99b 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", POWERTOP_SHORT_VERSION);
+ mvwprintw(tab_bar, 0,0, "PowerTOP %s", PACKAGE_SHORT_VERSION);
bottom_line = newwin(1, 0, LINES-1, 0);
wattrset(bottom_line, A_REVERSE);
diff --git a/src/lib.h b/src/lib.h
index c3324efdff1b..b64bb0f5433f 100644
--- a/src/lib.h
+++ b/src/lib.h
@@ -41,9 +41,6 @@
#define _(STRING) (STRING)
#endif
-#define POWERTOP_VERSION "v" PACKAGE_VERSION
-#define POWERTOP_SHORT_VERSION PACKAGE_VERSION
-
extern int is_turbo(uint64_t freq, uint64_t max, uint64_t maxmo);
extern int get_max_cpu(void);
diff --git a/src/main.cpp b/src/main.cpp
index e6e41b1ce84d..7467f0fd6acc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -99,7 +99,7 @@ static const struct option long_options[] =
static void print_version()
{
- printf(_("PowerTOP version " POWERTOP_VERSION "\n"));
+ printf(_("PowerTOP version " PACKAGE_VERSION "\n"));
}
static bool set_refresh_timeout()
@@ -323,7 +323,7 @@ static void checkroot() {
uid = getuid();
if (uid != 0) {
- printf(_("PowerTOP " POWERTOP_VERSION " must be run with root
privileges.\n"));
+ printf(_("PowerTOP " PACKAGE_VERSION " must be run with root
privileges.\n"));
printf(_("exiting...\n"));
exit(EXIT_FAILURE);
}
diff --git a/src/perf/perf.cpp b/src/perf/perf.cpp
index b1103a769ce0..9ed0ba8ec3ef 100644
--- a/src/perf/perf.cpp
+++ b/src/perf/perf.cpp
@@ -114,7 +114,7 @@ void perf_event::create_perf_event(char *eventname, int _cpu)
if (err == EMFILE)
fprintf(stderr, _("Too many open files, please increase the limit of open file
descriptors.\n"));
else {
- fprintf(stderr, _("PowerTOP %s needs the kernel to support the 'perf'
subsystem\n"), POWERTOP_VERSION);
+ fprintf(stderr, _("PowerTOP %s needs the kernel to support the 'perf'
subsystem\n"), PACKAGE_VERSION);
fprintf(stderr, _("as well as support for trace points in the kernel:\n"));
fprintf(stderr,
"CONFIG_PERF_EVENTS=y\nCONFIG_PERF_COUNTERS=y\nCONFIG_TRACEPOINTS=y\nCONFIG_TRACING=y\n");
}
diff --git a/src/report/report.cpp b/src/report/report.cpp
index ddb2e3065502..f0f31ee8cea5 100644
--- a/src/report/report.cpp
+++ b/src/report/report.cpp
@@ -120,7 +120,7 @@ static void system_info(void)
/* Set array of data in row Major order */
string *system_data = new string[sys_table.rows * sys_table.cols];
system_data[0]=__("PowerTOP Version");
- snprintf(version_date, sizeof(version_date), "%s ran at %s", POWERTOP_VERSION,
ctime(&now));
+ snprintf(version_date, sizeof(version_date), "%s ran at %s", PACKAGE_VERSION,
ctime(&now));
system_data[1]=version_date;
str = read_sysfs_string("/proc/version");
--
1.8.3.1
2231
days inactive
2235
days old
10 comments
3 participants
participants (3)
-
Joe Konno -
Magnus Fromreide -
Евгений Сыромятников