Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=1ef80a635e217fa091c7bc3f96f7adc52bf0eb17
commit 1ef80a635e217fa091c7bc3f96f7adc52bf0eb17 Author: Marius Cirsta <[email protected]> Date: Tue Jan 14 22:40:52 2014 +0200 * more cmake fixes for building translations diff --git a/CMakeLists.txt b/CMakeLists.txt index c4db67c..3e7ae6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ include (UseAsciidoc) enable_testing() STRING(TOLOWER ${CMAKE_PROJECT_NAME} CMAKE_PROJECT_NAME_LOWER) -SET(PACMAN_G2_VERSION 3.8.9) +SET(PACMAN_G2_VERSION 3.10.0) SET(PACMAN_G2_LIB_VERSION ${PACMAN_G2_VERSION}) SET(PM_VERSION_TEMP "0." ${PACMAN_G2_LIB_VERSION}) STRING(REPLACE ";" "" PM_VERSION ${PM_VERSION_TEMP}) diff --git a/autogen.sh b/autogen.sh index 2da22b9..e521c47 100755 --- a/autogen.sh +++ b/autogen.sh @@ -12,28 +12,28 @@ import_pootle() do if [ -e $po_dir/pacman/$i/libpacman.po ]; then if msgfmt -c --statistics -o /dev/null $po_dir/pacman/$i/libpacman.po; then - mkdir -p lib/libpacman/po/$i/ - cp $po_dir/pacman/$i/libpacman.po lib/libpacman/po/$i/libpacman.po - echo $i >> lib/libpacman/po/LINGUAS - else - echo "WARNING: lib/libpacman/po/$i.po would break your build!" + mkdir -p lib/libpacman/po/$i/ + cp $po_dir/pacman/$i/libpacman.po lib/libpacman/po/$i/libpacman.po + echo $i >> lib/libpacman/po/LINGUAS + else + echo "WARNING: lib/libpacman/po/$i.po would break your build!" fi fi if [ -e $po_dir/pacman/$i/pacman-g2.po ]; then if msgfmt -c --statistics -o /dev/null $po_dir/pacman/$i/pacman-g2.po; then - mkdir -p src/pacman-g2/po/$i/ - cp $po_dir/pacman/$i/pacman-g2.po src/pacman-g2/po/$i/pacman-g2.po - echo $i >> src/pacman-g2/po/LINGUAS + mkdir -p src/pacman-g2/po/$i/ + cp $po_dir/pacman/$i/pacman-g2.po src/pacman-g2/po/$i/pacman-g2.po + echo $i >> src/pacman-g2/po/LINGUAS else - echo "WARNING: src/pacman-g2/po/$i.po would break your build!" + echo "WARNING: src/pacman-g2/po/$i.po would break your build!" fi fi if [ -e $po_dir/pacman/$i/mans.po ]; then if grep -q "po4a_langs.*$i" doc/po4a.cfg; then - cp $po_dir/pacman/$i/mans.po doc/po/$i.po - echo $i >> doc/po/LINGUAS + cp $po_dir/pacman/$i/mans.po doc/po/$i.po + echo $i >> doc/po/LINGUAS else - echo "WARNING: doc/po/$i.po not found in po4a.cfg" + echo "WARNING: doc/po/$i.po not found in po4a.cfg" fi fi done @@ -46,8 +46,10 @@ cd `dirname $0` ver=`grep -m1 PACMAN_G2_VERSION CMakeLists.txt|sed 's/.*PACMAN_G2_VERSION\ \([0-9\.]*\).*/\1/'` if [ "$1" == "--dist" ]; then + rm -rf pacman-g2-$ver git archive --format=tar --prefix=pacman-g2-$ver/ HEAD | tar xf - git log --no-merges |git name-rev --tags --stdin > pacman-g2-$ver/ChangeLog + mkdir pacman-g2-$ver cd pacman-g2-$ver # copy in the po files import_pootle diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 070473a..c19c67f 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -14,5 +14,5 @@ if(HAS_PO4A) ASCIILOCALDOC2MAN(makepkg.txt makepkg.8 share/man/${lang}/man8 ${lang}) ASCIILOCALDOC2MAN(pacman-g2.txt pacman-g2.8 share/man/${lang}/man8 ${lang}) ASCIILOCALDOC2MAN(FrugalBuild.txt FrugalBuild.5 share/man/${lang}/man5 ${lang}) - endforeach(lang) + endforeach(lang) endif(HAS_PO4A) diff --git a/lib/libpacman/po/CMakeLists.txt b/lib/libpacman/po/CMakeLists.txt index 2994247..387520c 100644 --- a/lib/libpacman/po/CMakeLists.txt +++ b/lib/libpacman/po/CMakeLists.txt @@ -1,6 +1,9 @@ #translations -file (STRINGS "LINGUAS" languages) -foreach(lang IN LISTS languages) - GETTEXT_PROCESS_PO_FILES(${lang} ALL INSTALL_DESTINATION share/locale PO_FILES ${lang}/libpacman.po) -endforeach(lang) - +if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LINGUAS") + file (STRINGS "LINGUAS" languages) + foreach(lang IN LISTS languages) + GETTEXT_PROCESS_PO_FILES(${lang} ALL INSTALL_DESTINATION share/locale PO_FILES ${lang}/libpacman.po) + endforeach(lang) +else(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LINGUAS") + message(WARNING "file LINGUAS not present") +endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LINGUAS") \ No newline at end of file diff --git a/src/pacman-g2/po/CMakeLists.txt b/src/pacman-g2/po/CMakeLists.txt index 93ddf75..f3de2d9 100644 --- a/src/pacman-g2/po/CMakeLists.txt +++ b/src/pacman-g2/po/CMakeLists.txt @@ -1,11 +1,11 @@ #translations -if(EXISTS "${ROOT}/configuration/${customer}/configuration.${project_name}.xml") +if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LINGUAS") file (STRINGS "LINGUAS" languages) foreach(lang IN LISTS languages) GETTEXT_PROCESS_PO_FILES(${lang} ALL INSTALL_DESTINATION share/locale PO_FILES ${lang}/pacman-g2.po) endforeach(lang) -else() +else(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LINGUAS") message(WARNING "file LINGUAS not present") -endif() +endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LINGUAS") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
