sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8671 commits 112 branches 95 tags 181 MiB
Commit graph

8671 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dane Springmeyer
cdefc71488 Revert "start fixing visual tests to run on windows" 
This reverts commit 79c6ab46a5.
 2014-09-04 16:40:28 -07:00
Dane Springmeyer
d787e59718 remove gyp specific build files 2014-09-04 16:37:29 -07:00
Dane Springmeyer
7ee9f3268a Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-09-04 13:06:02 -07:00
Dane Springmeyer
f73eef6f7a rollback png8 default in 2.3.x - closes #2110 2014-09-04 12:08:47 -07:00
Dane Springmeyer
038cc41cd4 we are targeting 2014 so rollback 2013 CTP workarounds 2014-09-04 18:26:17 +00:00
Dane Springmeyer
eed46b87cf fix gdal,proj,icu share creation 2014-09-04 17:14:26 +00:00
Dane Springmeyer
2cc7c5a4f7 attempt to get all save_map tests working cross platform 2014-09-04 09:48:04 -07:00
Dane Springmeyer
7d5d02e031 Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-09-04 09:22:53 -07:00
Dane Springmeyer
c30f1715e6 Revert "workaround msvs variant init bug" 
This reverts commit be44b647fa.
 2014-09-04 09:22:43 -07:00
Dane Springmeyer
98c881432a Revert "attempt to workaround other mapnik_value_type->variant bugs" 
This reverts commit 7dc1aed9ee.
 2014-09-04 09:21:14 -07:00
artemp
72e2f4446f re-implement mapnik::value deriving from value_base and update across core 
fix mapnik::value conversions in topojson plugin
 2014-09-04 17:10:13 +01:00
artemp
0985cc907d remove copy converting ctor and fix converting move constuctor to use 'universal reference' and perfect forwarding 
( re : http://isocpp.org/blog/2012/11/universal-references-in-c11-scott-meyers)
 2014-09-04 14:54:42 +01:00
Sean Gillies
c52994ff8b Allow user to specify a python executable.¬ 
¬
Fall back on `python`. Unlike the solution in PR #2395 this¬
puts all the responsibility for selecting the right python in the¬
case that "python" is Python 3 on the user. I've followed the lead¬
of the Python documentation Makefile. See

http://hg.python.org/cpython/file/340d48347295/Doc/README.txt
http://hg.python.org/cpython/file/340d48347295/Doc/Makefile

Intent is that if your `python` is Python 2 everything works as
before and that is your `python` is Python 3 but you have a
`python2` you can specify that instead.¬

Conflicts:
	run_tests
 2014-09-03 15:56:58 -07:00
Dane Springmeyer
b6bd5d744e travis: more debugging of mapnik-test-data 2014-09-03 12:29:10 -07:00
Dane Springmeyer
55a0ce5fdb update visual tests after #2399 2014-09-03 11:57:24 -07:00
Jiri Drbalek
67d8f41a1b fix angle calculation 
Conflicts:
	src/text/vertex_cache.cpp
 2014-09-03 11:53:23 -07:00
Dane Springmeyer
21d213a653 travis: debug mapnik-test-data 2014-09-02 13:17:35 -07:00
Dane Springmeyer
27fbd2dcbe add https://github.com/mapbox/mapnik-test-data to tests - /cc @GretaCB 2014-09-02 11:55:09 -07:00
Dane Springmeyer
58a8f19b16 add csv test with utf8 data inlined 2014-08-31 20:28:51 -07:00
Dane Springmeyer
4227862660 fix broken path remove on windows 2014-08-31 20:24:41 -07:00
Dane Springmeyer
dbdf9c8180 don't test whitespace 2014-08-31 20:14:15 -07:00
Dane Springmeyer
72ca8d6faa spruce up mapnik-config.bat 2014-08-31 20:09:39 -07:00
Dane Springmeyer
cfe79a6fe3 make sure postgis test does not run on windows if no server is availabl 2014-08-31 20:09:16 -07:00
Dane Springmeyer
f4ba1eba15 fixup python bootstrapping 2014-08-31 19:16:39 -07:00
Dane Springmeyer
d8f8831417 Merge branch 'master' of https://github.com/mapnik/mapnik into 3x-msvs 2014-08-31 17:51:38 -07:00
Dane Springmeyer
1ba744162b Add nik2img.cpp 2014-08-31 17:51:02 -07:00
Dane Springmeyer
afee619e63 support windows in nik2img.cpp 2014-08-31 17:32:48 -07:00
Dane Springmeyer
7dc1aed9ee attempt to workaround other mapnik_value_type->variant bugs 2014-08-31 17:18:15 -07:00
Dane Springmeyer
dcdd580f98 stash notes on getting python tests running 2014-08-31 13:58:38 -07:00
Dane Springmeyer
351c0894fa avoid inconsistent dll linkage warnings with python + switch back to python.org install 2014-08-31 13:58:25 -07:00
Dane Springmeyer
be44b647fa workaround msvs variant init bug 2014-08-31 12:44:12 -07:00
Dane Springmeyer
79c6ab46a5 start fixing visual tests to run on windows 2014-08-31 08:08:52 +00:00
Dane Springmeyer
18d759f0db reference fonts locally for now 2014-08-31 08:08:14 +00:00
Dane Springmeyer
6828dd5b1e get python bindings working 2014-08-31 07:45:26 +00:00
Dane Springmeyer
beaf7a56cc fix linking problems from python 2014-08-31 07:44:41 +00:00
Dane Springmeyer
bfc772f697 attempt to build the python bindings (TODO: symbol errors wrt to swap) 2014-08-31 07:01:06 +00:00
Dane Springmeyer
ddb6e7e007 remove tabs from mapnik.gyp 2014-08-31 06:30:04 +00:00
Dane Springmeyer
5bf866bbcb adapt to zlib and harfbuzz build changes 2014-08-31 04:19:15 +00:00
Dane Springmeyer
603ea3811f Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-08-30 20:05:33 -07:00
Dane Springmeyer
f9e11dabeb simplify agg_basics.h 
- remove unused/obsolete asm
 - visual studio since 2010 supports long long and we target 2014 now
 2014-08-30 15:39:52 -07:00
Dane Springmeyer
a8017ddae6 fix std:: prefixing for cmath 2014-08-30 15:13:34 -07:00
Dane Springmeyer
7e74967282 fix std:: prefixing for cmath 2014-08-30 15:13:26 -07:00
Dane Springmeyer
8cd198625e remove unused code 2014-08-30 14:30:51 -07:00
Dane Springmeyer
43eb395839 fixup mapnik-config.bat defines and link flags 2014-08-29 19:45:49 -07:00
Dane Springmeyer
6f476410fa Avoid boost auto-link warnings 2014-08-29 19:05:15 -07:00
Dane Springmeyer
d577ef8719 Merge branch 'master' of https://github.com/mapnik/mapnik into 3x-msvs 2014-08-29 18:56:43 -07:00
Dane Springmeyer
c36767af9e msvc 2014 linking fixes 2014-08-29 18:56:03 -07:00
Dane Springmeyer
aba0d790dc start running tests again 2014-08-29 18:53:10 -07:00
Dane Springmeyer
3004dfc8c1 fix conversions test with msvs 2014 2014-08-29 18:52:52 -07:00
Dane Springmeyer
c7f58ee64c clean up harfbuzz->icu interface 2014-08-29 17:41:29 -07:00