setting up for mapnik v2.1.0 release

mapnik · Aug 23, 2012 · a25aac8 · a25aac8
1 parent 4f49026
commit a25aac8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/SConstruct b/SConstruct
@@ -1444,7 +1444,7 @@ if not preconfigured:
         # fetch the mapnik version header in order to set the
         # ABI version used to build libmapnik.so on linux in src/build.py
         abi = conf.GetMapnikLibVersion()
-        abi_fallback = "2.0.1-pre"
+        abi_fallback = "2.1.0"
         if not abi:
             color_print(1,'Problem encountered parsing mapnik version, falling back to %s' % abi_fallback)
             abi = abi_fallback

diff --git a/include/mapnik/version.hpp b/include/mapnik/version.hpp
@@ -23,12 +23,13 @@
 #ifndef MAPNIK_VERSION_HPP
 #define MAPNIK_VERSION_HPP
 
-#define MAPNIK_VERSION_IS_RELEASE 0
+#define MAPNIK_VERSION_IS_RELEASE 1
 
 #define MAPNIK_MAJOR_VERSION 2
 #define MAPNIK_MINOR_VERSION 1
 #define MAPNIK_PATCH_VERSION 0
 
+// translates to 200100
 #define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION)
 
 #ifndef MAPNIK_STRINGIFY
@@ -37,12 +38,12 @@
 #endif
 
 #if MAPNIK_VERSION_IS_RELEASE
-# define MAPNIK_VERSION_STRING  MAPNIK_STRINGIFY(MAPNIK_MAJOR_VERSION) "." \
+#define MAPNIK_VERSION_STRING   MAPNIK_STRINGIFY(MAPNIK_MAJOR_VERSION) "." \
                                 MAPNIK_STRINGIFY(MAPNIK_MINOR_VERSION) "." \
                                 MAPNIK_STRINGIFY(MAPNIK_PATCH_VERSION)
 
 #else
-# define MAPNIK_VERSION_STRING  MAPNIK_STRINGIFY(MAPNIK_MAJOR_VERSION) "." \
+#define MAPNIK_VERSION_STRING   MAPNIK_STRINGIFY(MAPNIK_MAJOR_VERSION) "." \
                                 MAPNIK_STRINGIFY(MAPNIK_MINOR_VERSION) "." \
                                 MAPNIK_STRINGIFY(MAPNIK_PATCH_VERSION) "-pre"
 #endif