Rename g_ana to gmx.

Since all the modules contained in this wrapper binary are no longer
analysis tools, a more general name is needed.

Part of #685.

Change-Id: Iec0a0ee10daa283510127ce4c1db7b5290d50f58

diff --git a/src/gromacs/commandline/cmdlinemodulemanager.h b/src/gromacs/commandline/cmdlinemodulemanager.h
index f27b26b35de91ddd2a0060a9939bcfdfdfd1f6dc..91e43dcb542eeeb2d0f83a2f0e40f249f08d5012 100644 (file)
--- a/src/gromacs/commandline/cmdlinemodulemanager.h
+++ b/src/gromacs/commandline/cmdlinemodulemanager.h
@@ -62,7 +62,7 @@ int
 main(int argc, char *argv[])
 {
     const gmx::ProgramInfo &programInfo =
-        gmx::ProgramInfo::init("g_ana", argc, argv);
+        gmx::ProgramInfo::init("gmx", argc, argv);
     CopyRight(stderr, argv[0]);
     try
     {

diff --git a/src/programs/CMakeLists.txt b/src/programs/CMakeLists.txt
index 6ec3383ff8d90eca688f25b0a2854c05a83fed84..5a0acea99aa4486bb061b7c27aaf2bdf5b0d7a19 100644 (file)
--- a/src/programs/CMakeLists.txt
+++ b/src/programs/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(mdrun)
 if (NOT GMX_FAHCORE)
-    add_subdirectory(g_ana)
+    add_subdirectory(gmx)
     add_subdirectory(g_protonate)
     add_subdirectory(g_x2top)
     add_subdirectory(gmxcheck)

diff --git a/src/programs/g_ana/.gitignore b/src/programs/gmx/.gitignore
similarity index 100%
rename from src/programs/g_ana/.gitignore
rename to src/programs/gmx/.gitignore

diff --git a/src/programs/g_ana/CMakeLists.txt b/src/programs/gmx/CMakeLists.txt
similarity index 82%
rename from src/programs/g_ana/CMakeLists.txt
rename to src/programs/gmx/CMakeLists.txt
index 6cea96a713f79e2aab171f24be8a0bad0579247e..4a1c79f2090bafb94f335f6160b2f8f8ea490271 100644 (file)
--- a/src/programs/g_ana/CMakeLists.txt
+++ b/src/programs/gmx/CMakeLists.txt
@@ -1,6 +1,6 @@
-add_executable(g_ana g_ana.cpp legacymodules.cpp)
-target_link_libraries(g_ana libgromacs gmxana ${GMX_EXE_LINKER_FLAGS})
-set_target_properties(g_ana PROPERTIES OUTPUT_NAME "g_ana${GMX_BINARY_SUFFIX}")
+add_executable(gmx gmx.cpp legacymodules.cpp)
+target_link_libraries(gmx libgromacs gmxana ${GMX_EXE_LINKER_FLAGS})
+set_target_properties(gmx PROPERTIES OUTPUT_NAME "gmx${GMX_BINARY_SUFFIX}")
 
 configure_file(CreateLinks.cmake.cmakein CreateLinks.cmake @ONLY)
 set(CREATE_LINKS_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/CreateLinks.cmake)
@@ -13,7 +13,7 @@ add_custom_target(links ALL
         -DBINARY_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
         -DQUIETLY=TRUE
         -P ${CREATE_LINKS_SCRIPT}
-    DEPENDS g_ana
+    DEPENDS gmx
     COMMENT "Creating symlinks for alternative binary names"
     VERBATIM)
 
@@ -24,7 +24,7 @@ add_custom_target(links ALL
 # be possible to handle everything uniformly instead of having several
 # different CMake-side mechanisms.
 
-install(TARGETS g_ana
+install(TARGETS gmx
         RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 if (GMX_SYMLINK_OLD_BINARY_NAMES)
     install(SCRIPT ${CREATE_LINKS_SCRIPT} COMPONENT links)

diff --git a/src/programs/g_ana/CreateLinks.cmake.cmakein b/src/programs/gmx/CreateLinks.cmake.cmakein
similarity index 95%
rename from src/programs/g_ana/CreateLinks.cmake.cmakein
rename to src/programs/gmx/CreateLinks.cmake.cmakein
index e2f917497fb549ca03c0764584356191ea48ad5d..ebf96cd12a6178fb899144b7691c25be0cf6e433 100644 (file)
--- a/src/programs/g_ana/CreateLinks.cmake.cmakein
+++ b/src/programs/gmx/CreateLinks.cmake.cmakein
@@ -106,7 +106,7 @@ foreach (linkname ${SYMLINK_NAMES})
         endif ()
         execute_process(
             COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                ${BINARY_DIRECTORY}/g_ana${BINARY_SUFFIX} ${linkpath})
+                ${BINARY_DIRECTORY}/gmx${BINARY_SUFFIX} ${linkpath})
     else()
         if (NOT QUIETLY)
             message(STATUS "Installing: Creating symbolic link ${linkpath}")
@@ -116,6 +116,6 @@ foreach (linkname ${SYMLINK_NAMES})
         endif ()
         execute_process(
             COMMAND ${CMAKE_COMMAND} -E create_symlink
-                g_ana${BINARY_SUFFIX} ${linkpath})
+                gmx${BINARY_SUFFIX} ${linkpath})
     endif()
 endforeach ()

diff --git a/src/programs/g_ana/g_ana.cpp b/src/programs/gmx/gmx.cpp
similarity index 96%
rename from src/programs/g_ana/g_ana.cpp
rename to src/programs/gmx/gmx.cpp
index 88df4fbc253a0e48ef24133be4682f76dda0be83..24173eb246790a90c5a7e474d7f99eff9a436d6d 100644 (file)
--- a/src/programs/g_ana/g_ana.cpp
+++ b/src/programs/gmx/gmx.cpp
@@ -29,7 +29,7 @@
  * For more info, check our website at http://www.gromacs.org
  */
 /*! \internal \brief
- * Implements the g_ana tool.
+ * Implements the gmx wrapper binary.
  *
  * \author Teemu Murtola <teemu.murtola@cbr.su.se>
  */
@@ -47,7 +47,7 @@ int
 main(int argc, char *argv[])
 {
     const gmx::ProgramInfo &info =
-        gmx::ProgramInfo::init("g_ana", argc, argv);
+        gmx::ProgramInfo::init("gmx", argc, argv);
     // TODO: With the addition of ProgramInfo above, this no longer needs to
     // be here, so think where it would best go.
     CopyRight(stderr, argv[0]);

diff --git a/src/programs/g_ana/legacymodules.cpp b/src/programs/gmx/legacymodules.cpp
similarity index 100%
rename from src/programs/g_ana/legacymodules.cpp
rename to src/programs/gmx/legacymodules.cpp

diff --git a/src/programs/g_ana/legacymodules.h b/src/programs/gmx/legacymodules.h
similarity index 100%
rename from src/programs/g_ana/legacymodules.h
rename to src/programs/gmx/legacymodules.h