From 67718ed8e16e016fbd6137734e0dcfb59cf933b9 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 12 Oct 2015 10:38:58 -0700
Subject: [PATCH] rename nik2img to mapnik-render

---
 .gitignore                                             |  2 +-
 CHANGELOG.md                                           |  1 +
 SConstruct                                             |  6 +++---
 utils/{nik2img => mapnik-render}/build.py              | 10 +++++-----
 .../nik2img.cpp => mapnik-render/mapnik-render.cpp}    |  0
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename utils/{nik2img => mapnik-render}/build.py (74%)
 rename utils/{nik2img/nik2img.cpp => mapnik-render/mapnik-render.cpp} (100%)

diff --git a/.gitignore b/.gitignore
index ddd8581a4..2ecdd4b32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,7 @@ utils/mapnik-index/mapnik-index
 utils/ogrindex/ogrindex
 utils/pgsql2sqlite/pgsql2sqlite
 utils/svg2png/svg2png
-utils/nik2img/nik2img
+utils/mapnik-render/mapnik-render
 demo/python/demo*
 demo/python/map.xml
 tests/data/sqlite/*index
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb313507f..5c997a014 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Released: TBD
 
 #### Summary
 
+ - Renamed `nik2img` command to `mapnik-render`
  - PostGIS: Fixed handling of all attributes when `key_field_as_attribute=false` (https://github.com/mapnik/mapnik/issues/3120)
  - PostGIS: Fixed parsing of `key_field_as_attribute` as boolean: now `true/false` can be used in addition to `0/1`
 
diff --git a/SConstruct b/SConstruct
index 047456132..7e657674a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -402,7 +402,7 @@ opts.AddVariables(
     BoolVariable('SHAPEINDEX', 'Compile and install a utility to generate shapefile indexes in the custom format (.index) Mapnik supports', 'True'),
     BoolVariable('MAPNIK_INDEX', 'Compile and install a utility to generate file indexes for CSV and GeoJSON in the custom format (.index) Mapnik supports', 'True'),
     BoolVariable('SVG2PNG', 'Compile and install a utility to generate render an svg file to a png on the command line', 'False'),
-    BoolVariable('NIK2IMG', 'Compile and install a utility to generate render a map to an image', 'True'),
+    BoolVariable('MAPNIK_RENDER', 'Compile and install a utility to render a map to an image', 'True'),
     BoolVariable('COLOR_PRINT', 'Print build status information in color', 'True'),
     BoolVariable('BIGINT', 'Compile support for 64-bit integers in mapnik::value', 'True'),
     )
@@ -1971,8 +1971,8 @@ if not HELP_REQUESTED:
 		SConscript('utils/pgsql2sqlite/build.py')
 	    if env['SVG2PNG']:
 		SConscript('utils/svg2png/build.py')
-	    if env['NIK2IMG']:
-		SConscript('utils/nik2img/build.py')
+	    if env['MAPNIK_RENDER']:
+		SConscript('utils/mapnik-render/build.py')
 	    # devtools not ready for public
 	    #SConscript('utils/ogrindex/build.py')
 	    env['LIBS'].remove('boost_program_options%s' % env['BOOST_APPEND'])
diff --git a/utils/nik2img/build.py b/utils/mapnik-render/build.py
similarity index 74%
rename from utils/nik2img/build.py
rename to utils/mapnik-render/build.py
index 244edbef3..4150dd865 100644
--- a/utils/nik2img/build.py
+++ b/utils/mapnik-render/build.py
@@ -7,7 +7,7 @@ program_env = env.Clone()
 
 source = Split(
     """
-    nik2img.cpp
+    mapnik-render.cpp
     """
     )
 
@@ -24,11 +24,11 @@ libraries.extend(copy(env['LIBMAPNIK_LIBS']))
 if env['RUNTIME_LINK'] == 'static' and env['PLATFORM'] == 'Linux':
     libraries.append('dl')
 
-nik2img = program_env.Program('nik2img', source, LIBS=libraries)
-Depends(nik2img, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
+mapnik_render = program_env.Program('mapnik-render', source, LIBS=libraries)
+Depends(mapnik-render, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
 
 if 'uninstall' not in COMMAND_LINE_TARGETS:
-    env.Install(os.path.join(env['INSTALL_PREFIX'],'bin'), nik2img)
+    env.Install(os.path.join(env['INSTALL_PREFIX'],'bin'), mapnik_render)
     env.Alias('install', os.path.join(env['INSTALL_PREFIX'],'bin'))
 
-env['create_uninstall_target'](env, os.path.join(env['INSTALL_PREFIX'],'bin','nik2img'))
+env['create_uninstall_target'](env, os.path.join(env['INSTALL_PREFIX'],'bin','mapnik-render'))
diff --git a/utils/nik2img/nik2img.cpp b/utils/mapnik-render/mapnik-render.cpp
similarity index 100%
rename from utils/nik2img/nik2img.cpp
rename to utils/mapnik-render/mapnik-render.cpp