Revert "Revert to 2.5.1, moved dev to dev-2.5.2"

This reverts commit 894e0ae.

Author: rijnb

CMakeLists.txt

@@ -27,7 +27,7 @@ project(mapcode_cpp)
 # NO_FAST_ENCODE        - Drop fast encoding support - only for internal use.
 
 set(MAPCODE_OPTIONS "")
-set(MAPCODE_WARNING_OPTIONS "-Wall -Werror")
+set(MAPCODE_WARNING_OPTIONS "-Wall -Werror -Wextra -Wpedantic")
 set(MAPCODE_SANITIZER_COMPILER_OPTIONS "-fsanitize=address -fno-common -fno-optimize-sibling-calls -fno-omit-frame-pointer")
 set(MAPCODE_SANITIZER_LINKER_OPTIONS "-fsanitize=address")
 
@@ -48,7 +48,12 @@ set(SOURCE_FILES_MAPCODELIB
         mapcodelib/internal_alphabet_recognizer.h
         mapcodelib/internal_iso3166_data.h
         mapcodelib/internal_territory_alphabets.h
-        mapcodelib/internal_territory_names_english.h
+        mapcodelib/internal_territory_names_da.h
+        mapcodelib/internal_territory_names_de.h
+        mapcodelib/internal_territory_names_en.h
+        mapcodelib/internal_territory_names_fr.h
+        mapcodelib/internal_territory_names_hi.h
+        mapcodelib/internal_territory_names_nl.h
         mapcodelib/internal_territory_names_local.h
         mapcodelib/internal_territory_search.h
         mapcodelib/mapcode_alphabets.h
@@ -58,17 +63,17 @@ set(SOURCE_FILES_MAPCODELIB
         mapcodelib/mapcoder.c
         mapcodelib/mapcoder.h)
 
-set(SOURCE_FILES_UNITTEST
-        unittest/decode_test.h
-        unittest/unittest.c)
+set(SOURCE_FILES_TEST
+        test/decode_test.h
+        test/unittest.c)
 
 set(SOURCE_FILES_UTILITY
         utility/mapcode.cpp)
 
 add_library(mapcodelib ${SOURCE_FILES_MAPCODELIB})
 target_include_directories(mapcodelib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-add_executable(unittest ${SOURCE_FILES_UNITTEST})
+add_executable(unittest ${SOURCE_FILES_TEST})
 target_link_libraries(unittest LINK_PUBLIC mapcodelib)
 
 add_executable(mapcode ${SOURCE_FILES_UTILITY})

LICENSE

@@ -32,8 +32,9 @@ Documentation, including example snippets of C source code, can be found in
       mapcode_library_c.pdf         <-- PDF format.
       mapcode_library_c.doc         <-- Microsoft Word format.
 
-A unit test can be found in the unittest\ subdirectory.
-Compile and run unittest\unittest/c to see if the library performs as expected.
+A unit test can be found in the `test` subdirectory.
+Compile and run `unittest.c` to see if the library performs as expected.
+Check the `README.md` file in `test` to see how you can compile it/
 
 Also see www.mapcode.com for background and reference materials.
 
@@ -61,7 +62,7 @@ decode Mapcodes.
 
 This produces the following help text:
 
-    MAPCODE (version 2.5.1)
+    MAPCODE (version 2.5.2)
     Copyright (C) 2014-2016 Stichting Mapcode Foundation
 
     Usage:
@@ -137,6 +138,10 @@ footprint, for example for embedded applications.
 
 ## Release Notes
 
+### 2.5.2
+
+* Added locale support. 
+
 ### 2.5.1
 
 * Updated unit test to compile with plain C and added some test cases.