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

use mapnik-settings.env

Browse source
This commit is contained in:
Dane Springmeyer 2015-04-26 20:32:20 +02:00
parent 4841e04b80
commit ea6f217ad9
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -59,7 +59,7 @@ uninstall:
@$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 uninstall @$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 uninstall
test: test:
@source localize.sh && ./test/unit/run && \ @source localize.sh && source mapnik-settings.env && ./test/unit/run && \
for FILE in test/standalone/*-bin; do \ for FILE in test/standalone/*-bin; do \
$${FILE}; \ $${FILE}; \
done; done;
@ -80,9 +80,11 @@ pep8:
@pep8 -r --select=W391 -q --filename=*.py `pwd`/tests/ | xargs ged -i '/./,/^$$/!d' @pep8 -r --select=W391 -q --filename=*.py `pwd`/tests/ | xargs ged -i '/./,/^$$/!d'
grind: grind:
@for FILE in test/standalone/*-bin; do \ @source localize.sh && source mapnik-settings.env && \
for FILE in test/standalone/*-bin; do \
valgrind --leak-check=full --log-fd=1 $${FILE} | grep definitely; \ valgrind --leak-check=full --log-fd=1 $${FILE} | grep definitely; \
done done
@source localize.sh && source mapnik-settings.env && \
valgrind --leak-check=full --log-fd=1 ./test/unit/run | grep definitely valgrind --leak-check=full --log-fd=1 ./test/unit/run | grep definitely
render: render:

7
bootstrap.sh
View file

@ -115,9 +115,10 @@ SAMPLE_INPUT_PLUGINS = True
} }
function setup_runtime_settings() { function setup_runtime_settings() {
export PROJ_LIB=${MASON_LINKED_ABS}/share/proj echo "export PROJ_LIB=${MASON_LINKED_ABS}/share/proj" > mapnik-settings.env
export ICU_DATA=${MASON_LINKED_ABS}/share/icu/54.1 echo "export ICU_DATA=${MASON_LINKED_ABS}/share/icu/54.1" >> mapnik-settings.env
export GDAL_DATA=${MASON_LINKED_ABS}/share/gdal echo "export GDAL_DATA=${MASON_LINKED_ABS}/share/gdal" >> mapnik-settings.env
source mapnik-settings.env
} }
function main() { function main() {

8
localize.sh
View file

@ -1,12 +1,8 @@
#!/bin/bash #!/bin/bash
UNAME=$(uname -s) # TODO - use rpath to avoid needing this to run tests locally
export CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
if [ ${UNAME} = 'Darwin' ]; then if [ $(uname -s) = 'Darwin' ]; then
export DYLD_LIBRARY_PATH="${CURRENT_DIR}/src/":${DYLD_LIBRARY_PATH} export DYLD_LIBRARY_PATH="${CURRENT_DIR}/src/":${DYLD_LIBRARY_PATH}
else else
export LD_LIBRARY_PATH="${CURRENT_DIR}/src/":${LD_LIBRARY_PATH} export LD_LIBRARY_PATH="${CURRENT_DIR}/src/":${LD_LIBRARY_PATH}
fi fi
export MAPNIK_FONT_DIRECTORY="${CURRENT_DIR}/fonts/dejavu-fonts-ttf-2.34/ttf/"
export MAPNIK_INPUT_PLUGINS_DIRECTORY="${CURRENT_DIR}/plugins/input/"
export PATH="${CURRENT_DIR}/utils/mapnik-config":${PATH}
export PATH="${CURRENT_DIR}/utils/nik2img":${PATH}