From 1329be958aad7b112c8d5d94de17c0429767aff7 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Tue, 11 Oct 2016 11:13:41 +0530
Subject: [PATCH] .buildInfo -> .hipInfo & .version -> .hipVersion

Change-Id: I8023f4349621fd81c58615737b7e897649e0f7ca
---
 CMakeLists.txt         | 20 ++++++++++----------
 bin/hipcc              |  4 ++--
 bin/hipconfig          |  4 ++--
 packaging/hip_base.txt |  2 +-
 packaging/hip_hcc.txt  |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbfc44b17d..b8cf550547 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,7 +143,7 @@ add_to_config(_buildInfo COMPILE_HIP_ATP_MARKER)
 #############################
 # Build steps
 #############################
-# Rebuild cmake cache updates .buildInfo and .version
+# Rebuild cmake cache updates .hipInfo and .hipVersion
 add_custom_target(update_build_and_version_info ALL COMMAND make rebuild_cache)
 
 # Build clang hipify if enabled
@@ -198,12 +198,12 @@ if(HIP_PLATFORM STREQUAL "hcc")
     set_source_files_properties(${SOURCE_FILES} PROPERTIES OBJECT_DEPENDS ${PROJECT_BINARY_DIR}/hcc_version.txt)
     add_dependencies(hip_hcc check_hcc_version update_build_and_version_info)
 
-    # Generate .buildInfo
-    file(WRITE "${PROJECT_BINARY_DIR}/.buildInfo" ${_buildInfo})
+    # Generate .hipInfo
+    file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo})
 endif()
 
-# Generate .version
-file(WRITE "${PROJECT_BINARY_DIR}/.version" ${_versionInfo})
+# Generate .hipVersion
+file(WRITE "${PROJECT_BINARY_DIR}/.hipVersion" ${_versionInfo})
 
 # Build doxygen documentation
 add_custom_target(doc COMMAND HIP_PATH=${CMAKE_CURRENT_SOURCE_DIR} doxygen ${CMAKE_CURRENT_SOURCE_DIR}/docs/doxygen-input/doxy.cfg
@@ -219,14 +219,14 @@ if(HIP_PLATFORM STREQUAL "hcc")
     else()
         install(TARGETS hip_hcc DESTINATION lib)
     endif()
-
-    # Install .buildInfo
-    install(FILES ${PROJECT_BINARY_DIR}/.buildInfo DESTINATION lib)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/hip_ir.ll DESTINATION lib)
+
+    # Install .hipInfo
+    install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib)
 endif()
 
-# Install .version
-install(FILES ${PROJECT_BINARY_DIR}/.version DESTINATION bin)
+# Install .hipVersion
+install(FILES ${PROJECT_BINARY_DIR}/.hipVersion DESTINATION bin)
 
 # Install src, bin, include & cmake if necessary
 execute_process(COMMAND test ${CMAKE_INSTALL_PREFIX} -ef ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/bin/hipcc b/bin/hipcc
index c4f592d814..9de4cdf732 100755
--- a/bin/hipcc
+++ b/bin/hipcc
@@ -52,9 +52,9 @@ $verbose = $ENV{'HIPCC_VERBOSE'} // 0;
 $HIP_PATH=$ENV{'HIP_PATH'} // dirname (dirname $0); # use parent directory of hipcc
 
 #---
-# Read .buildInfo
+# Read .hipInfo
 my %hipConfig = ();
-parse_config_file("$HIP_PATH/lib/.buildInfo", \%hipConfig);
+parse_config_file("$HIP_PATH/lib/.hipInfo", \%hipConfig);
 
 #---
 #HIP_PLATFORM controls whether to use NVCC or HCC for compilation:
diff --git a/bin/hipconfig b/bin/hipconfig
index 4fc37944e8..4d1695b316 100755
--- a/bin/hipconfig
+++ b/bin/hipconfig
@@ -86,9 +86,9 @@ if ($HIP_PLATFORM eq "nvcc") {
 };
 
 #---
-# Read .version
+# Read .hipVersion
 my %hipVersion = ();
-parse_config_file("$HIP_PATH/bin/.version", \%hipVersion);
+parse_config_file("$HIP_PATH/bin/.hipVersion", \%hipVersion);
 $HIP_VERSION_MAJOR = $hipVersion{'HIP_VERSION_MAJOR'} // $HIP_BASE_VERSION_MAJOR;
 $HIP_VERSION_MINOR = $hipVersion{'HIP_VERSION_MINOR'} // $HIP_BASE_VERSION_MINOR;
 $HIP_VERSION_PATCH = $hipVersion{'HIP_VERSION_PATCH'} // "0";
diff --git a/packaging/hip_base.txt b/packaging/hip_base.txt
index 8e02baca9b..a208bc3463 100644
--- a/packaging/hip_base.txt
+++ b/packaging/hip_base.txt
@@ -6,7 +6,7 @@ if(@BUILD_HIPIFY_CLANG@)
     install(PROGRAMS @PROJECT_BINARY_DIR@/hipify-clang/hipify-clang DESTINATION bin)
 endif()
 install(DIRECTORY @hip_SOURCE_DIR@/include DESTINATION .)
-install(FILES @PROJECT_BINARY_DIR@/.version DESTINATION bin)
+install(FILES @PROJECT_BINARY_DIR@/.hipVersion DESTINATION bin)
 install(DIRECTORY @hip_SOURCE_DIR@/cmake DESTINATION .)
 
 #############################
diff --git a/packaging/hip_hcc.txt b/packaging/hip_hcc.txt
index 607e68d099..459ecd449a 100644
--- a/packaging/hip_hcc.txt
+++ b/packaging/hip_hcc.txt
@@ -8,7 +8,7 @@ elseif(@HIP_LIB_TYPE@ EQUAL 1)
 else()
     install(FILES @PROJECT_BINARY_DIR@/libhip_hcc.so DESTINATION lib)
 endif()
-install(FILES @PROJECT_BINARY_DIR@/.buildInfo DESTINATION lib)
+install(FILES @PROJECT_BINARY_DIR@/.hipInfo DESTINATION lib)
 
 #############################
 # Packaging steps