sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

now working on mapnik v3.0.0-pre

Browse source
This commit is contained in:
Dane Springmeyer 2013-06-03 18:56:56 -07:00
parent 049b7b2fe4
commit 64947f8540
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -1592,7 +1592,7 @@ if not preconfigured:
# fetch the mapnik version header in order to set the # fetch the mapnik version header in order to set the
# ABI version used to build libmapnik.so on linux in src/build.py # ABI version used to build libmapnik.so on linux in src/build.py
abi = conf.GetMapnikLibVersion() abi = conf.GetMapnikLibVersion()
abi_fallback = "2.2.0" abi_fallback = "3.0.0-pre"
if not abi: if not abi:
color_print(1,'Problem encountered parsing mapnik version, falling back to %s' % abi_fallback) color_print(1,'Problem encountered parsing mapnik version, falling back to %s' % abi_fallback)
abi = abi_fallback abi = abi_fallback

8
include/mapnik/version.hpp
View file

@ -23,13 +23,13 @@
#ifndef MAPNIK_VERSION_HPP #ifndef MAPNIK_VERSION_HPP
#define 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_MAJOR_VERSION 3
#define MAPNIK_MINOR_VERSION 2 #define MAPNIK_MINOR_VERSION 0
#define MAPNIK_PATCH_VERSION 0 #define MAPNIK_PATCH_VERSION 0
// translates to 200200 // translates to 300000
#define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION) #define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION)
#ifndef MAPNIK_STRINGIFY #ifndef MAPNIK_STRINGIFY