Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove "Compiled by:" from :version/--version #22316

Merged
merged 1 commit into from
Feb 18, 2023
Merged

fix: remove "Compiled by:" from :version/--version #22316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions cmake.config/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,25 +166,6 @@ file(GENERATE
OUTPUT "${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef-$<CONFIG>.h"
INPUT "${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef.h.gen")

find_program(WHOAMI_PRG whoami)
find_program(HOSTNAME_PRG hostname)
mark_as_advanced(HOSTNAME_PRG WHOAMI_PRG)

if (DEFINED ENV{USERNAME})
set(USERNAME $ENV{USERNAME})
elseif (NOT DEFINED USERNAME AND EXISTS ${WHOAMI_PRG})
execute_process(COMMAND ${WHOAMI_PRG}
OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE USERNAME)
endif()
if (DEFINED ENV{HOSTNAME})
set(HOSTNAME $ENV{HOSTNAME})
elseif (NOT DEFINED HOSTNAME AND EXISTS ${HOSTNAME_PRG})
execute_process(COMMAND ${HOSTNAME_PRG}
OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE HOSTNAME)
endif()

configure_file (
"${PROJECT_SOURCE_DIR}/cmake.config/pathdef.c.in"
"${PROJECT_BINARY_DIR}/cmake.config/auto/pathdef.c"
Expand Down
2 changes: 0 additions & 2 deletions cmake.config/pathdef.c.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@
char *default_vim_dir = "${CMAKE_INSTALL_FULL_DATAROOTDIR}/nvim";
char *default_vimruntime_dir = "";
char *default_lib_dir = "${CMAKE_INSTALL_FULL_LIBDIR}/nvim";
char *compiled_user = "${USERNAME}";
char *compiled_sys = "${HOSTNAME}";
2 changes: 0 additions & 2 deletions src/nvim/globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,8 +806,6 @@ enum {
extern char *default_vim_dir;
extern char *default_vimruntime_dir;
extern char *default_lib_dir;
extern char *compiled_user;
extern char *compiled_sys;
#endif

// When a window has a local directory, the absolute path of the global
Expand Down
17 changes: 0 additions & 17 deletions src/nvim/version.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2699,23 +2699,6 @@ void list_version(void)
msg(version_cflags);
#endif

#ifdef HAVE_PATHDEF

if ((*compiled_user != NUL) || (*compiled_sys != NUL)) {
msg_puts(_("\nCompiled "));

if (*compiled_user != NUL) {
msg_puts(_("by "));
msg_puts((const char *)compiled_user);
}

if (*compiled_sys != NUL) {
msg_puts("@");
msg_puts((const char *)compiled_sys);
}
}
#endif // ifdef HAVE_PATHDEF

version_msg("\n\n");

#ifdef SYS_VIMRC_FILE
Expand Down