fix generation of settings on windows - closes tilemill-project#2273

atrawog · Apr 16, 2014 · 021d71d · 021d71d
1 parent 31027ed
commit 021d71d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/platforms/windows/installer/nsis_script.nsi b/platforms/windows/installer/nsis_script.nsi
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "TileMill"
-!define PRODUCT_VERSION "0.10.1-273-gc2ab8b0"
+!define PRODUCT_VERSION "0.10.1-291-g31027ed"
 !define CODE_ROOT "tilemill"
 !define SEMVER "${PRODUCT_NAME}-v${PRODUCT_VERSION}"
 !define PRODUCT_PUBLISHER "MapBox"

diff --git a/platforms/windows/package.bat b/platforms/windows/package.bat
@@ -19,11 +19,11 @@ cd %DEST%\mapnik
 @rem - note, intentially not quoting the below
 set MAPNIK_INPUT_PLUGINS=path.join(__dirname, 'mapnik/input')
 set MAPNIK_FONTS=path.join(__dirname, 'mapnik/fonts')
-python gen_settings.py
+set MAPNIK_DEST=%DEST%\mapnik\lib\binding\
+python gen_settings.py %MAPNIK_DEST%\mapnik_settings.js
 @rem augment the settings
 echo var path = require('path'); module.exports.env = {'GDAL_DATA': path.join(__dirname, 'mapnik/share/gdal'),'PROJ_LIB': path.join(__dirname, 'mapnik/share/proj') }; >> lib/binding/mapnik_settings.js
 
-set MAPNIK_DEST=%DEST%\mapnik\lib\binding\
 mkdir %MAPNIK_DEST%\share
 mkdir %MAPNIK_DEST%\fonts
 mkdir %MAPNIK_DEST%\input