Rename CCACHE_CC to CCACHE_COMPILER

diff --git a/doc/MANUAL.txt b/doc/MANUAL.txt
index 50fc574d4228fe62b55e4bf863d7b4369dc99ecb..421b939c5d64b31584125c5c4378907926865312 100644 (file)
--- a/doc/MANUAL.txt
+++ b/doc/MANUAL.txt
@@ -262,7 +262,7 @@ IN DIFFERENT DIRECTORIES>>.
     This setting allows you to choose the number of directory levels in the
     cache directory. The default is 2. The minimum is 1 and the maximum is 8.
 
-*compiler* (*CCACHE_CC*)::
+*compiler* (*CCACHE_COMPILER* or (deprecated) *CCACHE_CC*)::
 
     This setting can be used to force the name of the compiler to use. If set
     to the empty string (which is the default), ccache works it out from the

diff --git a/doc/NEWS.txt b/doc/NEWS.txt
index f8c7d98fcce643f6a2e472825826db1cbb73fdb6..fa7e69f84d7fd5dcc5e38105925e73ac2444e576 100644 (file)
--- a/doc/NEWS.txt
+++ b/doc/NEWS.txt
@@ -1,6 +1,17 @@
 ccache news
 ===========
 
+ccache 3.5
+----------
+Release date: unknown
+
+New features and enhancements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Renamed `CCACHE_CC` to `CCACHE_COMPILER` (keeping the former as a deprecated
+  alias).
+
+
 ccache 3.4.1
 ------------
 Release date: 2018-02-11

diff --git a/src/envtoconfitems.gperf b/src/envtoconfitems.gperf
index 81d8444ae61f6f76bfd7bc386c376ad480e3309d..7b598b6f284f8236cfa1e0a4dc5420c377731692 100644 (file)
--- a/src/envtoconfitems.gperf
+++ b/src/envtoconfitems.gperf
@@ -10,6 +10,7 @@ struct env_to_conf_item;
 %%
 BASEDIR, "base_dir"
 CC, "compiler"
+COMPILER, "compiler"
 COMPILERCHECK, "compiler_check"
 COMPRESS, "compression"
 COMPRESSLEVEL, "compression_level"

diff --git a/src/envtoconfitems_lookup.c b/src/envtoconfitems_lookup.c
index 690ed94f56fcf287ead6416426019a7e00ccf23b..2b4f42dce267f6d08b2395d7bf4c6b5146fc6202 100644 (file)
--- a/src/envtoconfitems_lookup.c
+++ b/src/envtoconfitems_lookup.c
@@ -31,7 +31,7 @@
 
 #line 9 "src/envtoconfitems.gperf"
 struct env_to_conf_item;
-/* maximum key range = 42, duplicates = 0 */
+/* maximum key range = 47, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -45,32 +45,32 @@ envtoconfitems_hash (register const char *str, register unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 20,  0,  0, 10,
-       0, 44,  5, 15,  0, 44, 10, 25,  9,  0,
-       5, 10,  5, 15, 10,  5, 44, 44, 44, 44,
-       0, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-      44, 44, 44, 44, 44, 44, 44
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 20,  0,  0, 10,
+      35, 49,  5, 20,  0, 49, 10, 25,  0,  0,
+       5, 10,  5, 15, 10,  5, 49, 49, 49, 49,
+       0, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+      49, 49, 49, 49, 49, 49, 49
     };
   register int hval = len;
 
@@ -101,11 +101,11 @@ envtoconfitems_get (register const char *str, register unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 31,
+      TOTAL_KEYWORDS = 32,
       MIN_WORD_LENGTH = 2,
       MAX_WORD_LENGTH = 15,
       MIN_HASH_VALUE = 2,
-      MAX_HASH_VALUE = 43
+      MAX_HASH_VALUE = 48
     };
 
   static const struct env_to_conf_item wordlist[] =
@@ -113,75 +113,79 @@ envtoconfitems_get (register const char *str, register unsigned int len)
       {"",""}, {"",""},
 #line 12 "src/envtoconfitems.gperf"
       {"CC", "compiler"},
-#line 18 "src/envtoconfitems.gperf"
+#line 19 "src/envtoconfitems.gperf"
       {"DIR", "cache_dir"},
-#line 16 "src/envtoconfitems.gperf"
+#line 17 "src/envtoconfitems.gperf"
       {"CPP2", "run_second_cpp"},
       {"",""},
-#line 19 "src/envtoconfitems.gperf"
-      {"DIRECT", "direct_mode"},
 #line 20 "src/envtoconfitems.gperf"
+      {"DIRECT", "direct_mode"},
+#line 21 "src/envtoconfitems.gperf"
       {"DISABLE", "disable"},
-#line 17 "src/envtoconfitems.gperf"
-      {"COMMENTS", "keep_comments_cpp"},
-#line 31 "src/envtoconfitems.gperf"
+#line 13 "src/envtoconfitems.gperf"
+      {"COMPILER", "compiler"},
+#line 32 "src/envtoconfitems.gperf"
       {"PATH", "path"},
-#line 41 "src/envtoconfitems.gperf"
+#line 42 "src/envtoconfitems.gperf"
       {"UNIFY", "unify"},
-#line 32 "src/envtoconfitems.gperf"
+#line 33 "src/envtoconfitems.gperf"
       {"PREFIX", "prefix_command"},
-#line 36 "src/envtoconfitems.gperf"
+#line 37 "src/envtoconfitems.gperf"
       {"RECACHE", "recache"},
-#line 13 "src/envtoconfitems.gperf"
+#line 14 "src/envtoconfitems.gperf"
       {"COMPILERCHECK", "compiler_check"},
       {"",""},
-#line 33 "src/envtoconfitems.gperf"
+#line 34 "src/envtoconfitems.gperf"
       {"PREFIX_CPP", "prefix_command_cpp"},
-#line 30 "src/envtoconfitems.gperf"
-      {"NLEVELS", "cache_dir_levels"},
-#line 27 "src/envtoconfitems.gperf"
+      {"",""},
+#line 28 "src/envtoconfitems.gperf"
       {"LOGFILE", "log_file"},
-#line 34 "src/envtoconfitems.gperf"
+#line 35 "src/envtoconfitems.gperf"
       {"READONLY", "read_only"},
-#line 21 "src/envtoconfitems.gperf"
+#line 22 "src/envtoconfitems.gperf"
       {"EXTENSION", "cpp_extension"},
-#line 40 "src/envtoconfitems.gperf"
+#line 41 "src/envtoconfitems.gperf"
       {"UMASK", "umask"},
       {"",""},
-#line 24 "src/envtoconfitems.gperf"
+#line 25 "src/envtoconfitems.gperf"
       {"HASHDIR", "hash_dir"},
-#line 14 "src/envtoconfitems.gperf"
+#line 15 "src/envtoconfitems.gperf"
       {"COMPRESS", "compression"},
       {"",""},
-#line 35 "src/envtoconfitems.gperf"
+#line 36 "src/envtoconfitems.gperf"
       {"READONLY_DIRECT", "read_only_direct"},
       {"",""},
-#line 39 "src/envtoconfitems.gperf"
+#line 40 "src/envtoconfitems.gperf"
       {"TEMPDIR", "temporary_dir"},
-#line 15 "src/envtoconfitems.gperf"
+#line 16 "src/envtoconfitems.gperf"
       {"COMPRESSLEVEL", "compression_level"},
-#line 26 "src/envtoconfitems.gperf"
+#line 27 "src/envtoconfitems.gperf"
       {"LIMIT_MULTIPLE", "limit_multiple"},
-#line 38 "src/envtoconfitems.gperf"
+#line 39 "src/envtoconfitems.gperf"
       {"STATS", "stats"},
       {"",""},
-#line 29 "src/envtoconfitems.gperf"
+#line 30 "src/envtoconfitems.gperf"
       {"MAXSIZE", "max_size"},
-#line 28 "src/envtoconfitems.gperf"
+#line 29 "src/envtoconfitems.gperf"
       {"MAXFILES", "max_files"},
       {"",""},
-#line 37 "src/envtoconfitems.gperf"
+#line 38 "src/envtoconfitems.gperf"
       {"SLOPPINESS", "sloppiness"},
       {"",""},
 #line 11 "src/envtoconfitems.gperf"
       {"BASEDIR", "base_dir"},
-#line 23 "src/envtoconfitems.gperf"
+#line 24 "src/envtoconfitems.gperf"
       {"HARDLINK", "hard_link"},
       {"",""},
-#line 22 "src/envtoconfitems.gperf"
+#line 23 "src/envtoconfitems.gperf"
       {"EXTRAFILES", "extra_files_to_hash"},
-      {"",""}, {"",""},
-#line 25 "src/envtoconfitems.gperf"
+      {"",""},
+#line 31 "src/envtoconfitems.gperf"
+      {"NLEVELS", "cache_dir_levels"},
+#line 18 "src/envtoconfitems.gperf"
+      {"COMMENTS", "keep_comments_cpp"},
+      {"",""}, {"",""}, {"",""}, {"",""},
+#line 26 "src/envtoconfitems.gperf"
       {"IGNOREHEADERS", "ignore_headers_in_manifest"}
     };
 
@@ -199,4 +203,4 @@ envtoconfitems_get (register const char *str, register unsigned int len)
     }
   return 0;
 }
-static const size_t ENVTOCONFITEMS_TOTAL_KEYWORDS = 31;
+static const size_t ENVTOCONFITEMS_TOTAL_KEYWORDS = 32;