From 13bcd3f17faa2fe57880b204b7ae7a874106e91b Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 23 Aug 2012 15:19:56 -0700 Subject: [PATCH] now working on mapnik v2.2.0-pre --- SConstruct | 2 +- include/mapnik/version.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index cc60e71a4..f43fae8a2 100644 --- 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.1.0" + abi_fallback = "2.2.0-pre" 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 index 9600bf0f6..35fd1b2a6 100644 --- a/include/mapnik/version.hpp +++ b/include/mapnik/version.hpp @@ -23,13 +23,13 @@ #ifndef MAPNIK_VERSION_HPP #define MAPNIK_VERSION_HPP -#define MAPNIK_VERSION_IS_RELEASE 1 +#define MAPNIK_VERSION_IS_RELEASE 0 #define MAPNIK_MAJOR_VERSION 2 -#define MAPNIK_MINOR_VERSION 1 +#define MAPNIK_MINOR_VERSION 2 #define MAPNIK_PATCH_VERSION 0 -// translates to 200100 +// translates to 200200 #define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION) #ifndef MAPNIK_STRINGIFY