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

bump version to 0.7.2

Browse source
This commit is contained in:
Dane Springmeyer 2010-08-12 07:44:31 +00:00
parent 427f0d0776
commit 8359ff19ba
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -968,7 +968,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/SConscript # ABI version used to build libmapnik.so on linux in src/SConscript
abi = conf.GetMapnikLibVersion() abi = conf.GetMapnikLibVersion()
abi_fallback = [0,7,1] abi_fallback = [0,7,2]
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)
env['ABI_VERSION'] = abi_fallback env['ABI_VERSION'] = abi_fallback

8
bindings/python/mapnik/__init__.py
View file

@ -499,14 +499,18 @@ def Kismet(**keywords):
keywords['type'] = 'kismet' keywords['type'] = 'kismet'
return CreateDatasource(keywords) return CreateDatasource(keywords)
def mapnik_version_string(): def mapnik_version_string(version=mapnik_version()):
"""Return the Mapnik version as a string.""" """Return the Mapnik version as a string."""
version = mapnik_version()
patch_level = version % 100 patch_level = version % 100
minor_version = version / 100 % 1000 minor_version = version / 100 % 1000
major_version = version / 100000 major_version = version / 100000
return '%s.%s.%s' % ( major_version, minor_version,patch_level) 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): def register_plugins(path=inputpluginspath):
"""Register plugins located by specified path""" """Register plugins located by specified path"""
DatasourceCache.instance().register_datasources(path) DatasourceCache.instance().register_datasources(path)

2
include/mapnik/version.hpp
View file

@ -24,7 +24,7 @@
#ifndef MAPNIK_VERSION_HPP #ifndef MAPNIK_VERSION_HPP
#define MAPNIK_VERSION_HPP #define MAPNIK_VERSION_HPP
#define MAPNIK_VERSION 701 #define MAPNIK_VERSION 702
#endif //MAPNIK_VERSION_HPP #endif //MAPNIK_VERSION_HPP

2
src/SConscript
View file

@ -65,7 +65,7 @@ if env['PLATFORM'] == 'Darwin':
else: else:
lib_path = 'libmapnik.dylib' lib_path = 'libmapnik.dylib'
linkflags = '-Wl,-install_name,%s' % lib_path 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'): elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'):
linkflags = '-R. -h libmapnik.so' linkflags = '-R. -h libmapnik.so'
else: # Linux and others else: # Linux and others