Fix printing of version number in “ccache --version”

Closes #225.

diff --git a/.gitignore b/.gitignore
index a9b9524627bcbfc8014b03b6c55e45d49316391d..2d45219eec0eb75591cf4a856cf76c7a47a0ce41 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,7 @@ configure
 dev.mk
 dev_mode_disabled
 perfdir.*
+src/version.c
 testdir.*
 unittest/run
 unittest/suites.h
-version.c

diff --git a/configure.ac b/configure.ac
index d055b9e419405bf77758d66d78231159c859920d..26ad4bb9ebd303258b6bb55e22631092e659e6a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -161,7 +161,7 @@ if test ! -f $srcdir/dev_mode_disabled && test "$RUN_FROM_BUILD_FARM" != yes; th
     AC_CONFIG_FILES([dev.mk])
     include_dev_mk='include dev.mk'
     version=`(git --git-dir=$srcdir/.git describe --dirty 2>/dev/null || echo vunknown) | sed -e 's/v//' -e 's/-/+/' -e 's/-/_/g'`
-    echo "const char CCACHE_VERSION@<:@@:>@ = \"$version\";" >version.c
+    echo "const char CCACHE_VERSION@<:@@:>@ = \"$version\";" >src/version.c
 else
     AC_MSG_NOTICE(Developer mode disabled)
 fi

diff --git a/dev.mk.in b/dev.mk.in
index 6a20c9e9597d4a0c6f7c6a016246ed0c2deae830..c75837efc3e848a5ff8dadabc820dc4da2f26365 100644 (file)
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -51,8 +51,8 @@ headers = \
     unittest/util.h
 
 files_to_clean += *.tar.bz2 *.tar.gz *.tar.xz *.xml .deps/* perfdir.*
-files_to_distclean += $(built_dist_files) version.c unittest/suites.h
-files_to_distclean += .deps version.c dev.mk
+files_to_distclean += $(built_dist_files) src/version.c unittest/suites.h
+files_to_distclean += .deps dev.mk
 
 source_dist_files = \
     $(base_sources) \
@@ -95,10 +95,10 @@ uncrustify_exclude_files = \
     src/hashtable_itr.c \
     src/snprintf.c
 
-ifneq ($(shell sed 's/.*"\(.*\)".*/\1/' version.c 2>/dev/null),$(version))
-  $(shell echo 'const char CCACHE_VERSION[] = "$(version)";' >version.c)
+ifneq ($(shell sed 's/.*"\(.*\)".*/\1/' src/version.c 2>/dev/null),$(version))
+  $(shell echo 'const char CCACHE_VERSION[] = "$(version)";' >src/version.c)
 endif
-version.o: version.c
+src/version.o: src/version.c
 
 %_lookup.c: %.gperf
        $(GPERF) $< | awk '/#ifdef __GNUC__/ { ++i; if (i == 2) { print "static"; }} {print}' >$@

diff --git a/doc/NEWS.txt b/doc/NEWS.txt
index 6176107365c2f93d3334e61b67cb682012cf7e85..2fd9255d0293fabcee281f8ce7a4deb77cdd2a1b 100644 (file)
--- a/doc/NEWS.txt
+++ b/doc/NEWS.txt
@@ -1,6 +1,16 @@
 ccache news
 ===========
 
+ccache 3.4.1
+------------
+Unreleased
+
+Bug fixes
+~~~~~~~~~
+
+- Fixed printing of version number in `ccache --version`.
+
+
 ccache 3.4
 ----------
 Release date: 2018-02-11