bump version to 0.7.2
This commit is contained in:
parent
427f0d0776
commit
8359ff19ba
4 changed files with 9 additions and 5 deletions
|
@ -968,7 +968,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/SConscript
|
||||
abi = conf.GetMapnikLibVersion()
|
||||
abi_fallback = [0,7,1]
|
||||
abi_fallback = [0,7,2]
|
||||
if not abi:
|
||||
color_print(1,'Problem encountered parsing mapnik version, falling back to %s' % abi_fallback)
|
||||
env['ABI_VERSION'] = abi_fallback
|
||||
|
|
|
@ -499,14 +499,18 @@ def Kismet(**keywords):
|
|||
keywords['type'] = 'kismet'
|
||||
return CreateDatasource(keywords)
|
||||
|
||||
def mapnik_version_string():
|
||||
def mapnik_version_string(version=mapnik_version()):
|
||||
"""Return the Mapnik version as a string."""
|
||||
version = mapnik_version()
|
||||
patch_level = version % 100
|
||||
minor_version = version / 100 % 1000
|
||||
major_version = version / 100000
|
||||
return '%s.%s.%s' % ( major_version, minor_version,patch_level)
|
||||
|
||||
def mapnik_version_from_string(version_string):
|
||||
"""Return the Mapnik version from a string."""
|
||||
n = version_string.split('.')
|
||||
return (int(n[0]) * 100000) + (int(n[1]) * 100) + (int(n[2]));
|
||||
|
||||
def register_plugins(path=inputpluginspath):
|
||||
"""Register plugins located by specified path"""
|
||||
DatasourceCache.instance().register_datasources(path)
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#ifndef MAPNIK_VERSION_HPP
|
||||
#define MAPNIK_VERSION_HPP
|
||||
|
||||
#define MAPNIK_VERSION 701
|
||||
#define MAPNIK_VERSION 702
|
||||
|
||||
#endif //MAPNIK_VERSION_HPP
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ if env['PLATFORM'] == 'Darwin':
|
|||
else:
|
||||
lib_path = 'libmapnik.dylib'
|
||||
linkflags = '-Wl,-install_name,%s' % lib_path
|
||||
linkflags += ' -current_version 0.7.1 -compatibility_version 0.7.1'
|
||||
linkflags += ' -current_version 0.7.2 -compatibility_version 0.7.2'
|
||||
elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'):
|
||||
linkflags = '-R. -h libmapnik.so'
|
||||
else: # Linux and others
|
||||
|
|
Loading…
Reference in a new issue