From b8acd0d403bfbc87fcf2d453e85ffb8793fc4e74 Mon Sep 17 00:00:00 2001 From: Philippe Liard Date: Tue, 16 Aug 2011 13:13:07 +0000 Subject: [PATCH] GEODATA/TOOLS: Fix fr/290.txt encoding and add file encoding check to the continuous integration script. --- resources/geocoding/fr/290.txt | 10 +++++----- tools/script/continuous-integration.sh | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/resources/geocoding/fr/290.txt b/resources/geocoding/fr/290.txt index 566dc300b..e0439930c 100644 --- a/resources/geocoding/fr/290.txt +++ b/resources/geocoding/fr/290.txt @@ -14,11 +14,11 @@ # Generated from: # http://www.itu.int/oth/T02020000AF/en [2011-03-17] -# http://fr.wikipedia.org/wiki/Sainte-Hélène,_Ascension_et_Tristan_da_Cunha [439804774] +# http://fr.wikipedia.org/wiki/Sainte-Hélène,_Ascension_et_Tristan_da_Cunha [439804774] 2902|Jamestown -2903|Sainte-Hélène -2904|Sainte-Hélène -2906|Sainte-Hélène -2907|Sainte-Hélène +2903|Sainte-Hélène +2904|Sainte-Hélène +2906|Sainte-Hélène +2907|Sainte-Hélène 2908|Tristan da Cunha diff --git a/tools/script/continuous-integration.sh b/tools/script/continuous-integration.sh index 2413c3233..81efebbff 100755 --- a/tools/script/continuous-integration.sh +++ b/tools/script/continuous-integration.sh @@ -19,6 +19,9 @@ # Countinuous integration script that tests the different versions and # configurations of libphonenumber. +# Check geocoding resource files encoding. +(find resources/geocoding -type f | xargs file | egrep -v 'UTF-8|ASCII') && exit 1 + # Test the C++ version with the provided CMake parameter. test_cpp_version() { CMAKE_FLAGS="$1"