[pkg-d-commits] [ldc] 82/211: Rename "ir2obj-cache" to "cache" (source and filenames)

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.1.0
in repository ldc.

commit 61e99e82d74cdda4d820890309e5da04debbd7f6
Author: Johan Engelen <jbc.engelen at gmail.com>
Date:   Mon Sep 26 16:57:16 2016 +0200

    Rename "ir2obj-cache" to "cache" (source and filenames)
---
 CMakeLists.txt                                     | 8 ++++----
 driver/{ir2obj_cache.cpp => cache.cpp}             | 6 +++---
 driver/{ir2obj_cache.h => cache.h}                 | 2 +-
 driver/{ir2obj_cache_pruning.d => cache_pruning.d} | 6 +++---
 driver/{ir2obj_cache_pruning.h => cache_pruning.h} | 2 +-
 driver/main.cpp                                    | 2 +-
 driver/toobj.cpp                                   | 2 +-
 tools/CMakeLists.txt                               | 2 +-
 tools/ldc-prune-cache.d                            | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f60a9e3..95a7e9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -327,11 +327,11 @@ file(GLOB_RECURSE IR_SRC_D ir/*.d)
 file(GLOB IR_SRC ir/*.cpp)
 file(GLOB IR_HDR ir/*.h)
 set(DRV_SRC
+    driver/cache.cpp
     driver/cl_options.cpp
     driver/codegenerator.cpp
     driver/configfile.cpp
     driver/exe_path.cpp
-    driver/ir2obj_cache.cpp
     driver/targetmachine.cpp
     driver/toobj.cpp
     driver/tool.cpp
@@ -340,14 +340,14 @@ set(DRV_SRC
     ${CMAKE_BINARY_DIR}/driver/ldc-version.cpp
 )
 set(DRV_HDR
-    driver/linker.h
+    driver/cache.h
+    driver/cache_pruning.h
     driver/cl_options.h
     driver/codegenerator.h
     driver/configfile.h
     driver/exe_path.h
-    driver/ir2obj_cache.h
-    driver/ir2obj_cache_pruning.h
     driver/ldc-version.h
+    driver/linker.h
     driver/targetmachine.h
     driver/toobj.h
     driver/tool.h
diff --git a/driver/ir2obj_cache.cpp b/driver/cache.cpp
similarity index 98%
rename from driver/ir2obj_cache.cpp
rename to driver/cache.cpp
index 670a325..d65bf73 100644
--- a/driver/ir2obj_cache.cpp
+++ b/driver/cache.cpp
@@ -1,4 +1,4 @@
-//===-- driver/ir2obj_cache.cpp -------------------------------------------===//
+//===-- driver/cache.cpp --------------------------------------------------===//
 //
 //                         LDC – the LLVM D compiler
 //
@@ -27,12 +27,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "driver/ir2obj_cache.h"
+#include "driver/cache.h"
 
 #include "ddmd/errors.h"
+#include "driver/cache_pruning.h"
 #include "driver/cl_options.h"
 #include "driver/ldc-version.h"
-#include "driver/ir2obj_cache_pruning.h"
 #include "gen/logger.h"
 #include "gen/optimizer.h"
 
diff --git a/driver/ir2obj_cache.h b/driver/cache.h
similarity index 93%
rename from driver/ir2obj_cache.h
rename to driver/cache.h
index a109241..b57d000 100644
--- a/driver/ir2obj_cache.h
+++ b/driver/cache.h
@@ -1,4 +1,4 @@
-//===-- driver/ir2obj_cache.h -----------------------------------*- C++ -*-===//
+//===-- driver/cache.h ------------------------------------------*- C++ -*-===//
 //
 //                         LDC – the LLVM D compiler
 //
diff --git a/driver/ir2obj_cache_pruning.d b/driver/cache_pruning.d
similarity index 97%
rename from driver/ir2obj_cache_pruning.d
rename to driver/cache_pruning.d
index 01853cd..38247b6 100644
--- a/driver/ir2obj_cache_pruning.d
+++ b/driver/cache_pruning.d
@@ -1,4 +1,4 @@
-//===-- driver/ir2obj_cache_pruning.d -----------------------------*- D -*-===//
+//===-- driver/cache_pruning.d ------------------------------------*- D -*-===//
 //
 //                         LDC – the LLVM D compiler
 //
@@ -18,7 +18,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-module driver.ir2obj_cache_pruning;
+module driver.cache_pruning;
 
 import std.file;
 import std.datetime: Clock, dur, Duration, SysTime;
@@ -104,7 +104,7 @@ struct CachePruner
         if (!hasPruneIntervalPassed())
             return;
 
-        // Only delete files that match ir2obj cache file naming.
+        // Only delete files that match LDC's cache file naming.
         // E.g.            "ircache_00a13b6f918d18f9f9de499fc661ec0d.o"
         auto filePattern = "ircache_????????????????????????????????.{o,obj}";
         auto cacheFiles = dirEntries(cachePath, filePattern, SpanMode.shallow, /+ followSymlink +/ false);
diff --git a/driver/ir2obj_cache_pruning.h b/driver/cache_pruning.h
similarity index 91%
rename from driver/ir2obj_cache_pruning.h
rename to driver/cache_pruning.h
index 42dfe82..0bdff0f 100644
--- a/driver/ir2obj_cache_pruning.h
+++ b/driver/cache_pruning.h
@@ -1,4 +1,4 @@
-//===-- driver/ir2obj_cache_pruning.h ---------------------------*- C++ -*-===//
+//===-- driver/cache_pruning.h ----------------------------------*- C++ -*-===//
 //
 //                         LDC – the LLVM D compiler
 //
diff --git a/driver/main.cpp b/driver/main.cpp
index 3adfbda..75c8940 100644
--- a/driver/main.cpp
+++ b/driver/main.cpp
@@ -19,11 +19,11 @@
 #include "root.h"
 #include "scope.h"
 #include "ddmd/target.h"
+#include "driver/cache.h"
 #include "driver/cl_options.h"
 #include "driver/codegenerator.h"
 #include "driver/configfile.h"
 #include "driver/exe_path.h"
-#include "driver/ir2obj_cache.h"
 #include "driver/ldc-version.h"
 #include "driver/linker.h"
 #include "driver/targetmachine.h"
diff --git a/driver/toobj.cpp b/driver/toobj.cpp
index a831a29..e5a8557 100644
--- a/driver/toobj.cpp
+++ b/driver/toobj.cpp
@@ -10,7 +10,7 @@
 #include "driver/toobj.h"
 
 #include "driver/cl_options.h"
-#include "driver/ir2obj_cache.h"
+#include "driver/cache.h"
 #include "driver/targetmachine.h"
 #include "driver/tool.h"
 #include "gen/irstate.h"
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index fe75214..ac9d9e8 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -33,7 +33,7 @@ endfunction()
 add_custom_target(${LDCPRUNECACHE_EXE} ALL DEPENDS ${LDCPRUNECACHE_EXE_FULL})
 set(LDCPRUNECACHE_D_SRC
     ${PROJECT_SOURCE_DIR}/tools/ldc-prune-cache.d
-    ${PROJECT_SOURCE_DIR}/driver/ir2obj_cache_pruning.d
+    ${PROJECT_SOURCE_DIR}/driver/cache_pruning.d
 )
 build_d_tool(
     "${LDCPRUNECACHE_EXE_FULL}"
diff --git a/tools/ldc-prune-cache.d b/tools/ldc-prune-cache.d
index 3fe0f17..e7dda1b 100644
--- a/tools/ldc-prune-cache.d
+++ b/tools/ldc-prune-cache.d
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// Prunes the ir2obj cache.
+// Prunes LDC's cache.
 //
 // TODO: Let the commandline parameters accept units, e.g.
 //       `--interval=30m`, or `--max-bytes=5GB`.
@@ -20,7 +20,7 @@ import std.stdio;
 import std.getopt;
 import std.file: isDir;
 
-import driver.ir2obj_cache_pruning;
+import driver.cache_pruning;
 
 // System exit codes:
 enum EX_OK = 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git