mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-29 18:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: remove unnecessary translation-related code

Browse Source 
The commands run in cmake script mode (-P) can simply be run in the main
cmake run instead.
This commit is contained in:
dundargoc
2022-09-26 11:39:31 +02:00
parent 543f939773
commit 913651d1f1
4 changed files with 8 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/RunMsgfmt.cmake
View File

@@ -1,9 +0,0 @@
set(ENV{OLD_PO_FILE_INPUT} yes)
execute_process(
COMMAND ${MSGFMT_PRG} -o ${MO_FILE} ${PO_FILE}
ERROR_VARIABLE err
RESULT_VARIABLE res)
if(NOT res EQUAL 0)
message(FATAL_ERROR "msgfmt failed to run correctly: ${err}")
endif()

11
cmake/RunMsgmerge.cmake
View File

@@ -1,11 +0,0 @@
set(ENV{OLD_PO_FILE_INPUT} yes)
set(ENV{OLD_PO_FILE_OUTPUT} yes)
execute_process(
COMMAND ${MSGMERGE_PRG} -q --update --backup=none --sort-by-file
${PO_FILE} ${POT_FILE}
ERROR_VARIABLE err
RESULT_VARIABLE res)
if(NOT res EQUAL 0)
message(FATAL_ERROR "msgmerge failed to run correctly: ${err}")
endif()

14
cmake/RunXgettext.cmake
View File

@@ -1,14 +0,0 @@
set(ENV{OLD_PO_FILE_INPUT} yes)
set(ENV{OLD_PO_FILE_OUTPUT} yes)
list(SORT SOURCES)
execute_process(
COMMAND ${XGETTEXT_PRG} -o ${POT_FILE} --default-domain=nvim
--add-comments --keyword=_ --keyword=N_ -D ${SEARCH_DIR}
${SOURCES}
ERROR_VARIABLE err
RESULT_VARIABLE res)
if(NOT res EQUAL 0)
message(FATAL_ERROR "xgettext failed to run correctly: ${err}")
endif()

31
src/nvim/po/CMakeLists.txt
View File

@@ -37,7 +37,6 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
set(ENV{OLD_PO_FILE_INPUT} yes)
set(ENV{OLD_PO_FILE_OUTPUT} yes)
set(NVIM_RELATIVE_SOURCES)
foreach(SRC ${NVIM_SOURCES} ${NVIM_HEADERS})
file(RELATIVE_PATH RELATIVE_SRC ${CMAKE_CURRENT_SOURCE_DIR} ${SRC})
@@ -46,19 +45,14 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
set(NVIM_POT ${CMAKE_CURRENT_BINARY_DIR}/nvim.pot)
list(SORT NVIM_RELATIVE_SOURCES)
add_custom_command(
OUTPUT nvim.pot
COMMAND ${CMAKE_COMMAND}
-DXGETTEXT_PRG=${XGETTEXT_PRG}
-DPOT_FILE=${NVIM_POT}
-DSEARCH_DIR=${CMAKE_CURRENT_SOURCE_DIR}
"\"-DSOURCES=${NVIM_RELATIVE_SOURCES}\""
-P ${PROJECT_SOURCE_DIR}/cmake/RunXgettext.cmake
OUTPUT ${NVIM_POT}
COMMAND ${XGETTEXT_PRG} -o ${NVIM_POT} --default-domain=nvim
--add-comments --keyword=_ --keyword=N_ -D ${CMAKE_CURRENT_SOURCE_DIR}
${NVIM_RELATIVE_SOURCES}
DEPENDS ${NVIM_SOURCES})
add_custom_target(potfile DEPENDS ${NVIM_POT})
set_target_properties(potfile PROPERTIES FOLDER po)
set(LANGUAGE_MO_FILES)
set(UPDATE_PO_TARGETS)
@@ -68,11 +62,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
add_custom_command(
OUTPUT ${moFile}
COMMAND ${CMAKE_COMMAND}
-DMSGFMT_PRG=${GETTEXT_MSGFMT_EXECUTABLE}
-DMO_FILE=${moFile}
-DPO_FILE=${poFile}
-P ${PROJECT_SOURCE_DIR}/cmake/RunMsgfmt.cmake
COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${moFile} ${poFile}
DEPENDS ${poFile} ${NVIM_POT})
install_helper(
@@ -101,8 +91,6 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
lang inputName outputName inputEnc outputEnc outputCharSet)
set(inputFile ${CMAKE_CURRENT_SOURCE_DIR}/${inputName}.po)
set(outputFile ${CMAKE_CURRENT_SOURCE_DIR}/${outputName}.po)
string(TOUPPER ${inputEnc} upperInputEnc)
string(TOLOWER ${inputEnc} lowerInputEnc)
add_custom_target(update-po-${lang}
COMMAND ${CMAKE_COMMAND}
@@ -172,11 +160,8 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
set(poFile "${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE}.po")
add_custom_target(update-po-${LANGUAGE}
COMMAND ${CMAKE_COMMAND}
-DMSGMERGE_PRG=${GETTEXT_MSGMERGE_EXECUTABLE}
-DPO_FILE=${poFile}
-DPOT_FILE=${NVIM_POT}
-P ${PROJECT_SOURCE_DIR}/cmake/RunMsgmerge.cmake
COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} -q --update --backup=none --sort-by-file
${poFile} ${NVIM_POT}
COMMENT "Updating ${LANGUAGE}.po"
DEPENDS ${NVIM_POT})