X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2FCMakeLists.txt;h=3f2f9ad7e781f7713750b3cb4f640fb8934df89e;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=cdce457e350a0e5b094f11d100d4e8b92d4b2c27;hpb=22d52f5f08cba82c85019634420f4204da56ec6b;p=lyx.git

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index cdce457e35..3f2f9ad7e7 100755
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -89,22 +89,24 @@ add_gettext_python(layouttranslations lib/layouts *.layout *.inc *.module)
 ADD_CUSTOM_COMMAND(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
     COMMAND ${LYX_PYTHON_EXECUTABLE}
-    ARGS   "${TOP_CMAKE_PATH}/po/cat.py" ${_py_sources} > "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
-    COMMAND ${LYX_PYTHON_EXECUTABLE}
-      ARGS   "${TOP_CMAKE_PATH}/po/dos2unix.py" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
+    ARGS   "${TOP_CMAKE_PATH}/po/cat.py" ${_py_sources} > "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat_tmp.pot"
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+      "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat_tmp.pot" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
     DEPENDS ${_py_sources}
     )
 
 ADD_CUSTOM_COMMAND(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt.pot"
     COMMAND ${GETTEXT_MSGUNIQ_EXECUTABLE}
-    ARGS -o "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt.pot" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
+    ARGS -o "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt_tmp.pot" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+      "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt_tmp.pot" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt.pot"
     DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
     )
 
 SET(_potfiles_dep)
 
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in "")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in.tmp "")
 file(GLOB_RECURSE _tmp_potfiles RELATIVE ${TOP_SRC_DIR}/ ${TOP_SRC_DIR}/src/*.h  ${TOP_SRC_DIR}/src/*.cpp  ${TOP_SRC_DIR}/src/*.cpp.in)
 list(SORT _tmp_potfiles)
 # list(REMOVE_ITEM _tmp_potfiles src/support/Package.cpp)
@@ -114,13 +116,18 @@ foreach(_f ${_tmp_potfiles})
   # will stay the same.
   # Relevant files are files containing the string '_(".*")'
   LIST(APPEND _potfiles_dep "${TOP_SRC_DIR}/${_f}")
-  file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in "${_f}\n")
+  file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in.tmp "${_f}\n")
 endforeach(_f)
 
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in.tmp" "${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in"
+  )
+
 ADD_CUSTOM_COMMAND(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot"
     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt.pot" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot"
     COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE}
+      --from-code=UTF-8
       --default-domain=${_lyxname} --directory=${TOP_SRC_DIR}
       --add-comments=TRANSLATORS:
       --language=C++ --join-existing --keyword=_ --keyword=N_ --keyword=B_ --keyword=qt_
@@ -165,15 +172,31 @@ foreach(_pofile ${LYX_BASE_PO_FILES})
   list(APPEND LYX_PO_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pofile})
 endforeach(_pofile)
 
+FIND_PROGRAM(LYX_GITVERSION git)
 set(LYX_UPDATED_GMO_FILES)
 foreach(_gmo_base ${INSTALLED_LANGUAGES})
   set(_gmo ${_gmo_base}.gmo)
-  add_custom_command(
-    OUTPUT "${LYX_DEST_PO}/${_gmo}"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_BINARY_DIR}/${_gmo}" "${LYX_DEST_PO}/${_gmo}"
-    DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${_gmo}"
+  set(_tobeupdated "${CMAKE_CURRENT_BINARY_DIR}/${_gmo}.tobeupdated")
+  list(APPEND LYX_UPDATED_GMO_FILES "${_tobeupdated}")
+  if(LYX_GITVERSION)
+    add_custom_command(
+      OUTPUT "${_tobeupdated}"
+	  COMMAND "${LYX_GITVERSION}" "status" "--porcelain" "${_gmo_base}.po" ">" "${_tobeupdated}"
+	  COMMAND ${LYX_PYTHON_EXECUTABLE} "${TOP_CMAKE_PATH}/po/update-gmo.py" 
+		"${_tobeupdated}"
+		"${CMAKE_CURRENT_BINARY_DIR}/${_gmo}"
+		"${LYX_DEST_PO}/${_gmo}"
+	  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+      DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${_gmo}"
+      )
+  else()
+    add_custom_command(
+      OUTPUT "${_tobeupdated}"
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_BINARY_DIR}/${_gmo}" "${LYX_DEST_PO}/${_gmo}"
+      COMMAND ${CMAKE_COMMAND} -E touch "${_tobeupdated}"
+      DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${_gmo}"
     )
-  list(APPEND LYX_UPDATED_GMO_FILES "${LYX_DEST_PO}/${_gmo}")
+  endif()
 endforeach()
 
 set(LYX_UPDATED_PO_FILES)
@@ -205,7 +228,8 @@ GETTEXT_CREATE_TRANSLATIONS(${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot ${_addAL
 
 # Create a new target to remerge po files
 # ALL omitted here, to prevent from automatic creation
+ADD_CUSTOM_TARGET(update-gmo DEPENDS ${LYX_UPDATED_GMO_FILES})
 ADD_CUSTOM_TARGET(update-po DEPENDS ${LYX_UPDATED_PO_FILES} ${LYX_UPDATED_GMO_FILES})
-set_target_properties(update-po PROPERTIES FOLDER "i18n")
+set_target_properties(update-po update-gmo PROPERTIES FOLDER "i18n")
 add_dependencies(update-po translations)