diff --git a/CHANGELOG b/CHANGELOG index 4d8a16ddc..ba2380754 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -274,8 +274,6 @@ Mapnik 0.7.0 Release - Python: Fixed potential crash if pycairo support is enabled but python-cairo module is missing (#392) -- Python: Added 'mapnik.mapnik_svn_revision()' function to svn revision of Mapnik was compiled at. - - Python: Added 'mapnik.has_pycairo()' function to test for pycairo support (r1278) (#284) - Python: Added 'mapnik.register_plugins()' and 'mapnik.register_fonts()' functions (r1256) diff --git a/SConstruct b/SConstruct index 11dcd1869..1230fdd62 100644 --- a/SConstruct +++ b/SConstruct @@ -427,7 +427,6 @@ pickle_store = [# Scons internal variables 'PYTHON_INSTALL_LOCATION', 'PYTHON_SYS_PREFIX', 'COLOR_PRINT', - 'SVN_REVISION', 'HAS_CAIRO', 'HAS_PYCAIRO', 'HAS_LIBXML2', @@ -983,7 +982,6 @@ if not preconfigured: env['CAIROMM_CPPPATHS'] = [] env['HAS_PYCAIRO'] = False env['HAS_LIBXML2'] = False - env['SVN_REVISION'] = None env['LIBMAPNIK_LIBS'] = [] env['LIBMAPNIK_CPPATHS'] = [] env['LIBMAPNIK_CXXFLAGS'] = [] @@ -1432,13 +1430,6 @@ if not preconfigured: else : common_cxx_flags = '-D%s ' % env['PLATFORM'].upper() - svn_version = call('svnversion') - if not svn_version == 'exported': - pattern = r'(\d+)(.*)' - try: - env['SVN_REVISION'] = re.match(pattern,svn_version).groups()[0] - except: pass - # Mac OSX (Darwin) special settings if env['PLATFORM'] == 'Darwin': pthread = '' diff --git a/bindings/python/build.py b/bindings/python/build.py index 5e0b1faad..5a3c4af98 100644 --- a/bindings/python/build.py +++ b/bindings/python/build.py @@ -185,12 +185,6 @@ if env['HAS_PYCAIRO']: py_env.ParseConfig('pkg-config --cflags pycairo') py_env.Append(CXXFLAGS = '-DHAVE_PYCAIRO') -if env['SVN_REVISION']: - sources.remove('mapnik_python.cpp') - env2 = py_env.Clone() - env2.Append(CXXFLAGS='-DSVN_REVISION=%s' % env['SVN_REVISION']) - sources.insert(0,env2.SharedObject('mapnik_python.cpp')) - _mapnik = py_env.LoadableModule('mapnik/_mapnik', sources, LIBS=libraries, LDMODULEPREFIX='', LDMODULESUFFIX='.so',LINKFLAGS=linkflags) Depends(_mapnik, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) diff --git a/bindings/python/mapnik/__init__.py b/bindings/python/mapnik/__init__.py index 9ca7fcf0a..49744a53e 100644 --- a/bindings/python/mapnik/__init__.py +++ b/bindings/python/mapnik/__init__.py @@ -718,7 +718,6 @@ __all__ = [ # version and environment 'mapnik_version_string', 'mapnik_version', - 'mapnik_svn_revision', 'has_cairo', 'has_pycairo', # factory methods diff --git a/bindings/python/mapnik_python.cpp b/bindings/python/mapnik_python.cpp index 70b361e75..768bb6686 100644 --- a/bindings/python/mapnik_python.cpp +++ b/bindings/python/mapnik_python.cpp @@ -331,15 +331,6 @@ unsigned mapnik_version() return MAPNIK_VERSION; } -unsigned mapnik_svn_revision() -{ -#if defined(SVN_REVISION) - return SVN_REVISION; -#else - return 0; -#endif -} - // indicator for jpeg read/write support within libmapnik bool has_jpeg() { @@ -633,7 +624,6 @@ BOOST_PYTHON_MODULE(_mapnik) def("save_map_to_string", &save_map_to_string, save_map_to_string_overloads()); def("mapnik_version", &mapnik_version,"Get the Mapnik version number"); - def("mapnik_svn_revision", &mapnik_svn_revision,"Get the Mapnik svn revision"); def("has_jpeg", &has_jpeg, "Get jpeg read/write support status"); def("has_cairo", &has_cairo, "Get cairo library status"); def("has_pycairo", &has_pycairo, "Get pycairo module status"); diff --git a/utils/mapnik-config/build.py b/utils/mapnik-config/build.py index 341fd9c30..c86d3b5e7 100644 --- a/utils/mapnik-config/build.py +++ b/utils/mapnik-config/build.py @@ -27,7 +27,6 @@ CONFIG_OTHER_INCLUDES='%(other_includes)s' CONFIG_FONTS='%(fonts)s' CONFIG_INPUT_PLUGINS='%(input_plugins)s' CONFIG_GIT_REVISION='%(git_revision)s' -CONFIG_SVN_REVISION='%(svn_revision)s' CONFIG_JSON="{ \\"prefix\\": \\"${CONFIG_PREFIX}\\", @@ -41,7 +40,6 @@ CONFIG_JSON="{ \\"fonts\\": \\"${CONFIG_FONTS}\\", \\"input_plugins\\": \\"${CONFIG_INPUT_PLUGINS}\\", \\"git_revision\\": \\"${CONFIG_GIT_REVISION}\\", - \\"svn_revision\\": ${CONFIG_SVN_REVISION}, }" ''' @@ -86,7 +84,6 @@ configuration = { "other_includes": other_includes, "fonts": config_env['MAPNIK_FONTS'], "input_plugins": config_env['MAPNIK_INPUT_PLUGINS'], - "svn_revision": config_env['SVN_REVISION'], "git_revision": git_revision, "version": config_env['MAPNIK_VERSION_STRING'], } diff --git a/utils/mapnik-config/mapnik-config.template.sh b/utils/mapnik-config/mapnik-config.template.sh index 222402cf9..b2e32c56b 100755 --- a/utils/mapnik-config/mapnik-config.template.sh +++ b/utils/mapnik-config/mapnik-config.template.sh @@ -64,10 +64,6 @@ while test $# -gt 0; do echo ${CONFIG_GIT_REVISION} ;; - --svn-revision) - echo ${CONFIG_SVN_REVISION} - ;; - --help) usage 0 ;;