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

scons - use 'auto' (exprerimental)

Browse source
This commit is contained in:
Artem Pavlenko 2020-11-20 14:18:29 +00:00
parent d3f81be01b
commit 03527f2d8c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -11,7 +11,7 @@ endif
all: mapnik all: mapnik
install: install:
$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 install $(PYTHON) scons/scons.py -j$(JOBS) --config=auto --implicit-cache --max-drift=1 install
release: release:
./scripts/publish_release.sh ./scripts/publish_release.sh
@ -22,7 +22,7 @@ test-release:
src/json/libmapnik-json.a: src/json/libmapnik-json.a:
# we first build memory intensive files with -j$(HEAVY_JOBS) # we first build memory intensive files with -j$(HEAVY_JOBS)
$(PYTHON) scons/scons.py -j$(HEAVY_JOBS) \ $(PYTHON) scons/scons.py -j$(HEAVY_JOBS) \
--config=cache --implicit-cache --max-drift=1 \ --config=auto --implicit-cache --max-drift=1 \
src/renderer_common/render_group_symbolizer.os \ src/renderer_common/render_group_symbolizer.os \
src/renderer_common/render_markers_symbolizer.os \ src/renderer_common/render_markers_symbolizer.os \
src/renderer_common/render_thunk_extractor.os \ src/renderer_common/render_thunk_extractor.os \
@ -45,10 +45,10 @@ src/json/libmapnik-json.a:
mapnik: src/json/libmapnik-json.a mapnik: src/json/libmapnik-json.a
# then install the rest with -j$(JOBS) # then install the rest with -j$(JOBS)
$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 $(PYTHON) scons/scons.py -j$(JOBS) --config=auto --implicit-cache --max-drift=1
clean: clean:
@$(PYTHON) scons/scons.py -j$(JOBS) -c --config=cache --implicit-cache --max-drift=1 @$(PYTHON) scons/scons.py -j$(JOBS) -c --config=auto --implicit-cache --max-drift=1
@if test -e ".sconsign.dblite"; then rm ".sconsign.dblite"; fi @if test -e ".sconsign.dblite"; then rm ".sconsign.dblite"; fi
@if test -e "config.log"; then rm "config.log"; fi @if test -e "config.log"; then rm "config.log"; fi
@if test -e "config.cache"; then rm "config.cache"; fi @if test -e "config.cache"; then rm "config.cache"; fi
@ -71,7 +71,7 @@ rebuild:
make uninstall && make clean && time make && make install make uninstall && make clean && time make && make install
uninstall: uninstall:
@$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 uninstall @$(PYTHON) scons/scons.py -j$(JOBS) --config=auto --implicit-cache --max-drift=1 uninstall
test/data-visual: test/data-visual:
./scripts/ensure_test_data.sh ./scripts/ensure_test_data.sh