Merge lp:~aacid/unity-2d/update_translations_on_build into lp:unity-2d

[Albert Astals Cid]

[debian] Update the .pot each time we build

Update the .pot each time we build

[lp:~aacid/unity-2d/update_translations_on_build]

1064. By Albert Astals Cid on 2012-04-19

Merge lp:unity-2d

1065. By Albert Astals Cid on 2012-04-30

Merge lp:unity-2d

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2011-11-09 21:28:49 +0000
+++ po/CMakeLists.txt	2012-04-30 13:17:19 +0000
@@ -50,7 +50,7 @@
 
 create_translation_targets(${GETTEXT_PACKAGE}.pot ${PO_FILES})
 
-add_custom_target(${GETTEXT_PACKAGE}.pot
+add_custom_target(${GETTEXT_PACKAGE}.pot ALL
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/update-unity-2d-pot
     )
 

=== modified file 'po/update-unity-2d-pot'
--- po/update-unity-2d-pot	2011-10-05 12:35:18 +0000
+++ po/update-unity-2d-pot	2012-04-30 13:17:19 +0000
@@ -10,7 +10,7 @@
 trap 'rm -f "$GETTEXT_FILES"' EXIT
 cd ..
 find \( -name '*.cpp' -o -name '*.qml' \) \
-    -a ! \( -path './debian/*' -o -path './build/*' -o -path './obj-*-linux-gnu/*' -o -path './.bzr/*'  -o -path './libunity-2d-private/tests/*' \) \
+    -a ! \( -path './debian/*' -o -path './build/*' -o -path './obj-*-linux-gnu/*' -o -path './.bzr/*'  -o -path './libunity-2d-private/tests/*' \) | sort \
 > $GETTEXT_FILES
 
 # Generate pot from our list