X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2FCMakeLists.txt;h=4d70d24042cd6ca141a91b222f6a509adf4ee6ae;hb=9633b1b9c5f9d272766f382e8e9365b8d6bea546;hp=30c65f80b422af877f8b71d2277d4f63409b7c38;hpb=84ef6f391fd5b69398e5efab44af662de8b28888;p=lyx.git

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 30c65f80b4..4d70d24042 100755
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -51,6 +51,7 @@ macro(add_gettext_python  _par _dir)
       COMMENT "${LYX_PYTHON_EXECUTABLE} ${TOP_SRC_DIR}/po/lyx_pot.py -b ${TOP_SRC_DIR} -o  ${_dst} -t ${_par1} --src_file=${_src_files}"
       )
     ADD_CUSTOM_TARGET(layouttranslations1 DEPENDS "${_dst}")
+	set_target_properties(layouttranslations1 PROPERTIES FOLDER "i18n")
     if (LYX_DATA_SUBDIR STREQUAL "")
       install(FILES "${TOP_SRC_DIR}/lib/layouttranslations" DESTINATION .)
     else()
@@ -88,22 +89,26 @@ 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_SRC_DIR}/development/cmake/po/cat.py" ${_py_sources} > "${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 ${LYX_PYTHON_EXECUTABLE}
-      ARGS   "${TOP_SRC_DIR}/development/cmake/po/dos2unix.py" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
+      ARGS   "${TOP_CMAKE_PATH}/po/dos2unix.py" "${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)
@@ -113,14 +118,24 @@ 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}
-    ARGS --default-domain=${_lyxname} --directory=${TOP_SRC_DIR} --add-comments=TRANSLATORS: --language=C++ --join-existing --keyword=_ --keyword=N_ --keyword=B_ --keyword=qt_ --files-from="${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in" --copyright-holder="LyX Developers" --msgid-bugs-address=lyx-devel@lists.lyx.org -o "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot"
+      --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_
+      --files-from=${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in
+      --copyright-holder="LyX Developers" --msgid-bugs-address=lyx-devel@lists.lyx.org
+      -o "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot"
     DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt.pot" ${_potfiles_dep}
     )
 
@@ -149,7 +164,7 @@ foreach(_pofile ${LYX_BASE_PO_FILES})
   string(REGEX REPLACE "^(.*)\\.po$" "\\1" _inst_lng ${_pofile})
   list(FIND CONFIGURED_LANGUAGES ${_inst_lng} _lng_idx)
   if(_lng_idx GREATER -1)
-    list(APPEND INSTALLED_LANGUAGES "${_inst_lng} ")
+    list(APPEND INSTALLED_LANGUAGES ${_inst_lng})
   endif()
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}
@@ -159,13 +174,40 @@ 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)
+  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}"
+    )
+  endif()
+endforeach()
+
 set(LYX_UPDATED_PO_FILES)
 foreach(_pofile ${LYX_BASE_PO_FILES})
   if(WIN32)
     add_custom_command(
       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}.copied
       COMMAND ${LYX_PYTHON_EXECUTABLE}
-        ARGS   "${TOP_SRC_DIR}/development/cmake/po/unix2dos.py" "${CMAKE_CURRENT_BINARY_DIR}/${_pofile}"
+        ARGS   "${TOP_CMAKE_PATH}/po/unix2dos.py" "${CMAKE_CURRENT_BINARY_DIR}/${_pofile}"
       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${_pofile} ${LYX_DEST_PO}/${_pofile}
       COMMAND ${CMAKE_COMMAND} -E touch ${_pofile}.copied
       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}
@@ -188,6 +230,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-po DEPENDS ${LYX_UPDATED_PO_FILES})
+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 update-gmo PROPERTIES FOLDER "i18n")
 add_dependencies(update-po translations)