[mapserver-commits] [mapserver/mapserver] 38d08d: Fix vagrant/Travis builds.
Jeff McKenna
noreply at github.com
Tue Jul 21 06:03:01 PDT 2020
Branch: refs/heads/master
Home: https://github.com/mapserver/mapserver
Commit: 38d08d14ae9289f64882c519d45f135b9b35fd7f
https://github.com/mapserver/mapserver/commit/38d08d14ae9289f64882c519d45f135b9b35fd7f
Author: Steve Lime <steve.lime at state.mn.us>
Date: 2019-05-16 (Thu, 16 May 2019)
Changed paths:
M scripts/vagrant/packages.sh
Log Message:
-----------
Fix vagrant/Travis builds.
Commit: fb65ba73ce47cdd71d2b08c1d4acc3d7e1b87b77
https://github.com/mapserver/mapserver/commit/fb65ba73ce47cdd71d2b08c1d4acc3d7e1b87b77
Author: Steve Lime <steve.lime at state.mn.us>
Date: 2019-05-16 (Thu, 16 May 2019)
Changed paths:
M .travis.yml
Log Message:
-----------
Needed to patch .travis.yml.
Commit: bb4b2690a28cdf3ab6600dddab313bbaccb212d4
https://github.com/mapserver/mapserver/commit/bb4b2690a28cdf3ab6600dddab313bbaccb212d4
Author: Steve Lime <steve.lime at state.mn.us>
Date: 2019-06-17 (Mon, 17 Jun 2019)
Changed paths:
M .travis.yml
M HISTORY.TXT
M Makefile
M cmake/FindOracle.cmake
M mapgml.c
M mapogcfilter.c
M mapogcfiltercommon.c
M mapproject.c
M mapscript/perl/CMakeLists.txt
M mapscript/perl/examples/RFC24.pl
M mapscript/perl/examples/shp_in_shp.pl
M mapscript/perl/examples/thin.pl
A mapscript/perl/tests/0-load.t
A mapscript/perl/tests/maps.t
R mapscript/php/php_proj.c
M mapscript/phpng/CMakeLists.txt
M mapscript/python/README.rst
M mapscript/python/tests/cases/map_test.py
M mapscript/swiginc/image.i
M mapscript/swiginc/msio.i
M msautotest/misc/ogr_empty_geojson.map
M msautotest/wxs/expected/wms_get_map_ext_sld_404.xml
M msautotest/wxs/expected/wms_get_map_ext_sld_fileproto.xml
M msautotest/wxs/expected/wms_get_map_ext_sld_proto.xml
M msautotest/wxs/expected/wms_get_map_ext_sld_too_large.xml
A msautotest/wxs/expected/wms_getfeatureinfo_encoding.xml
M msautotest/wxs/wfs_200.map
M msautotest/wxs/wfs_200_allgeoms.map
M msautotest/wxs/wfs_200_cite.map
M msautotest/wxs/wfs_200_cite_postgis.map
M msautotest/wxs/wfs_200_low_wfsmaxfeatures_no_compute_number_matched.map
M msautotest/wxs/wfs_filter.map
M msautotest/wxs/wfs_filter_ogr.map
M msautotest/wxs/wfs_filter_postgis.map
M msautotest/wxs/wfs_filter_projmeter.map
M msautotest/wxs/wfs_ogr_native_sql.map
M msautotest/wxs/wfs_ogr_no_native_sql.map
M msautotest/wxs/wfs_time.map
M msautotest/wxs/wfs_time_ogr.map
M msautotest/wxs/wfs_time_postgis.map
A msautotest/wxs/wms_getfeatureinfo_encoding.map
M msautotest/wxs/wms_inspire.map
M msautotest/wxs/wms_raster.map
M renderers/mvt/vector_tile.proto
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 34d2eab38f41ce469052caad9579f5a72f362f83
https://github.com/mapserver/mapserver/commit/34d2eab38f41ce469052caad9579f5a72f362f83
Author: Steve Lime <steve.lime at state.mn.us>
Date: 2019-07-31 (Wed, 31 Jul 2019)
Changed paths:
M .travis.yml
M appveyor.yml
M maplayer.c
M mapmssql2008.c
M mapogcfiltercommon.c
M mapogr.cpp
M mapogroutput.c
M mapquery.c
M mapwfs.c
A msautotest/wxs/expected/wfs_filter_islike_no_ending_wildcard_empty_resultset.xml
A msautotest/wxs/expected/wfs_filter_islike_no_ending_wildcard_non_empty_resultset.xml
A msautotest/wxs/expected/wfs_filter_postgis_islike_no_ending_wildcard_empty_resultset.xml
A msautotest/wxs/expected/wfs_filter_postgis_islike_no_ending_wildcard_non_empty_resultset.xml
A msautotest/wxs/expected/wfsogr20_geojson.json
A msautotest/wxs/expected/wfsogr20_geojson_with_predefine_native_data.json
M msautotest/wxs/wfs_filter.map
M msautotest/wxs/wfs_filter_postgis.map
M msautotest/wxs/wfs_ogr_geojson.map
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 6b9422957d13457f8f4e774c454c753bcc1001a4
https://github.com/mapserver/mapserver/commit/6b9422957d13457f8f4e774c454c753bcc1001a4
Author: Steve Lime <steve.lime at state.mn.us>
Date: 2019-10-15 (Tue, 15 Oct 2019)
Changed paths:
M .travis.yml
M CMakeLists.txt
M Makefile
M Vagrantfile
M appveyor.yml
A ci/travis/after_success.sh
A ci/travis/before_install.sh
A ci/travis/script.sh
M cmake/FindProj.cmake
M create_mapaxisorder_csv.py
M fontcache.c
M kerneldensity.c
M mapaxisorder.csv
M mapaxisorder.h
M mapcairo.c
M mapchart.c
M mapcluster.c
M mapcontext.c
M mapcopy.c
M mapdraw.c
M mapfile.c
M mapfile.h
M mapgdal.c
M mapgeos.c
M mapgml.c
M mapgraticule.c
M mapimageio.c
M mapkmlrenderer.cpp
M maplabel.c
M maplayer.c
M maplexer.c
M maplexer.l
M mapmetadata.c
M mapmssql2008.c
M mapmvt.c
M mapobject.c
M mapogcfilter.c
M mapogcfilter.h
M mapogcfiltercommon.c
M mapogcsld.c
M mapogcsld.h
M mapogcsos.c
M mapogr.cpp
M mapogroutput.c
M mapoutput.c
M mapows.c
M mapows.h
M mapparser.c
M mapparser.h
M mapparser.y
M mappostgis.c
M mapproject.c
M mapproject.h
R mapprojhack.c
M mapquery.c
M mapraster.c
M maprasterquery.c
M mapresample.c
M mapscale.c
M mapscript/mapscript.i
M mapscript/php/mapscript_i.c
M mapscript/php/php_mapscript.c
M mapscript/php/php_mapscript.h
M mapscript/php/php_mapscript_util.h
M mapscript/phpng/CMakeLists.txt
M mapscript/python/pyextend.i
M mapscript/python/pymodule.i
M mapscript/python/tests/cases/map_test.py
M mapscript/swiginc/layer.i
M mapscript/swiginc/map.i
M mapserver.h
M mapservutil.c
M mapshape.c
M mapshape.h
M mapstring.c
M mapsymbol.c
M maptemplate.c
M mapthread.c
M mapunion.c
M maputil.c
M mapuvraster.c
M mapwcs.c
M mapwcs11.c
M mapwcs20.c
M mapwfs.c
M mapwms.c
M mapwmslayer.c
M msautotest/.gitignore
A msautotest/gdal/connectionoptions.map
A msautotest/gdal/data/red_square.tif.ovr
A msautotest/gdal/expected/connectionoptions.png
M msautotest/gdal/expected/nonsquare_multiraw.png
M msautotest/gdal/expected/tileindexmixedsrs.png
M msautotest/gdal/expected/tileindexmixedsrs2.png
M msautotest/gdal/expected/tileindexmixedsrs3.png
M msautotest/gdal/expected/tileindexmixedsrs4.png
M msautotest/gdal/tileindexmixedsrs.map
M msautotest/gdal/tileindexmixedsrs2.map
M msautotest/gdal/tileindexmixedsrs3.map
M msautotest/gdal/tileindexmixedsrs4.map
M msautotest/misc/expected/grid_without_label.png
A msautotest/misc/expected/issue5581-1.png
A msautotest/misc/expected/issue5581-2.png
A msautotest/misc/issue5558.map
M msautotest/misc/ogr_empty_geojson.map
M msautotest/pymod/mstestlib.py
M msautotest/pymod/testlib.py
A msautotest/query/expected/query_test013.txt
M msautotest/query/query.map
A msautotest/query/template/query_formatted.tmpl
M msautotest/renderers/expected/labelrot.png
A msautotest/sld/arithmetic_line.map
A msautotest/sld/arithmetic_point.map
A msautotest/sld/arithmetic_polygon.map
A msautotest/sld/arithmetic_text.map
A msautotest/sld/base.map
A msautotest/sld/data/fonts.lst
A msautotest/sld/data/hexagon.dbf
A msautotest/sld/data/hexagon.json
A msautotest/sld/data/hexagon.prj
A msautotest/sld/data/hexagon.shp
A msautotest/sld/data/hexagon.shx
A msautotest/sld/data/inner.dbf
A msautotest/sld/data/inner.json
A msautotest/sld/data/inner.prj
A msautotest/sld/data/inner.shp
A msautotest/sld/data/inner.shx
A msautotest/sld/data/plot.dbf
A msautotest/sld/data/plot.json
A msautotest/sld/data/plot.prj
A msautotest/sld/data/plot.shp
A msautotest/sld/data/plot.shx
A msautotest/sld/data/set.json
A msautotest/sld/expected/base_mapfile.png
A msautotest/sld/expected/base_sldbody.png
A msautotest/sld/expected/map_reference.png
A msautotest/sld/expected/size_mapfile.png
A msautotest/sld/expected/size_sldbody.png
A msautotest/sld/expected/sld_line_expression_strokeopacity.png
A msautotest/sld/expected/sld_line_expression_strokewidth.png
A msautotest/sld/expected/sld_line_literal_stroke.png
A msautotest/sld/expected/sld_line_literal_strokeopacity.png
A msautotest/sld/expected/sld_line_literal_strokewidth.png
A msautotest/sld/expected/sld_line_propertyname_stroke.png
A msautotest/sld/expected/sld_line_propertyname_strokeopacity.png
A msautotest/sld/expected/sld_line_propertyname_strokewidth.png
A msautotest/sld/expected/sld_point_expression_displacementx.png
A msautotest/sld/expected/sld_point_expression_displacementy.png
A msautotest/sld/expected/sld_point_expression_opacity.png
A msautotest/sld/expected/sld_point_expression_rotation.png
A msautotest/sld/expected/sld_point_expression_size.png
A msautotest/sld/expected/sld_point_expression_strokewidth.png
A msautotest/sld/expected/sld_point_literal_displacementx.png
A msautotest/sld/expected/sld_point_literal_displacementy.png
A msautotest/sld/expected/sld_point_literal_fill.png
A msautotest/sld/expected/sld_point_literal_opacity.png
A msautotest/sld/expected/sld_point_literal_rotation.png
A msautotest/sld/expected/sld_point_literal_size.png
A msautotest/sld/expected/sld_point_literal_stroke.png
A msautotest/sld/expected/sld_point_literal_strokewidth.png
A msautotest/sld/expected/sld_point_propertyname_displacementx.png
A msautotest/sld/expected/sld_point_propertyname_displacementy.png
A msautotest/sld/expected/sld_point_propertyname_fill.png
A msautotest/sld/expected/sld_point_propertyname_opacity.png
A msautotest/sld/expected/sld_point_propertyname_rotation.png
A msautotest/sld/expected/sld_point_propertyname_size.png
A msautotest/sld/expected/sld_point_propertyname_stroke.png
A msautotest/sld/expected/sld_point_propertyname_strokewidth.png
A msautotest/sld/expected/sld_polygon_expression_fillopacity.png
A msautotest/sld/expected/sld_polygon_expression_strokeopacity.png
A msautotest/sld/expected/sld_polygon_expression_strokewidth.png
A msautotest/sld/expected/sld_polygon_literal_fill.png
A msautotest/sld/expected/sld_polygon_literal_fillopacity.png
A msautotest/sld/expected/sld_polygon_literal_stroke.png
A msautotest/sld/expected/sld_polygon_literal_strokeopacity.png
A msautotest/sld/expected/sld_polygon_literal_strokewidth.png
A msautotest/sld/expected/sld_polygon_propertyname_fill.png
A msautotest/sld/expected/sld_polygon_propertyname_fillopacity.png
A msautotest/sld/expected/sld_polygon_propertyname_stroke.png
A msautotest/sld/expected/sld_polygon_propertyname_strokeopacity.png
A msautotest/sld/expected/sld_polygon_propertyname_strokewidth.png
A msautotest/sld/expected/sld_reference.png
A msautotest/sld/expected/sld_text_expression_fontsize.png
A msautotest/sld/expected/sld_text_expression_rotation.png
A msautotest/sld/expected/sld_text_literal_fill.png
A msautotest/sld/expected/sld_text_literal_fontsize.png
A msautotest/sld/expected/sld_text_literal_halofill.png
A msautotest/sld/expected/sld_text_literal_rotation.png
A msautotest/sld/expected/sld_text_propertyname_fill.png
A msautotest/sld/expected/sld_text_propertyname_fontsize.png
A msautotest/sld/expected/sld_text_propertyname_halofill.png
A msautotest/sld/expected/sld_text_propertyname_rotation.png
A msautotest/sld/reference.map
A msautotest/sld/run_test.py
A msautotest/sld/size.map
M msautotest/valgrind-suppressions.txt
A msautotest/wxs/data/nested_attrs.geojson
M msautotest/wxs/data/polar_stereo.tif
A msautotest/wxs/data/test.gpkg
A msautotest/wxs/expected/ogr_connectionoptions.xml
M msautotest/wxs/expected/ows_metadata_wcs_capabilities100.xml
M msautotest/wxs/expected/ows_metadata_wcs_capabilities110.xml
M msautotest/wxs/expected/ows_wcs_capabilities.xml
M msautotest/wxs/expected/ows_wcs_describecoverage.xml
M msautotest/wxs/expected/wcs11_cap.txt
M msautotest/wxs/expected/wcs11_cap.xml
M msautotest/wxs/expected/wcs11_caps_section1.xml
M msautotest/wxs/expected/wcs11_caps_section3.xml
M msautotest/wxs/expected/wcs11_caps_updatesequence.xml
M msautotest/wxs/expected/wcs11_describe.xml
M msautotest/wxs/expected/wcs11_post_cap.xml
M msautotest/wxs/expected/wcs11_post_caps_section1.xml
M msautotest/wxs/expected/wcs11_post_caps_section3.xml
M msautotest/wxs/expected/wcs11_post_caps_updatesequence.xml
M msautotest/wxs/expected/wcs11_post_describe.xml
A msautotest/wxs/expected/wcs_20_getcov_bands_name_new_reproject.dat.alternative
M msautotest/wxs/expected/wcs_20_getcov_gtiff_compress_deflate_predictor.tif
M msautotest/wxs/expected/wcs_20_getcov_outputcrs.tif
M msautotest/wxs/expected/wcs_20_getcov_reproj.dat
M msautotest/wxs/expected/wcs_20_post_getcov_subsettingcrs_outputcrs.tif
M msautotest/wxs/expected/wcs_cap.txt
M msautotest/wxs/expected/wcs_cap.xml
M msautotest/wxs/expected/wcs_caps_updatesequence.xml
M msautotest/wxs/expected/wcs_describe.xml
M msautotest/wxs/expected/wcs_describe_coverage_tileindexmixedsrs_26711.xml
M msautotest/wxs/expected/wcs_get_capabilities_tileindexmixedsrs_26711.xml
M msautotest/wxs/expected/wcs_get_caps.xml
M msautotest/wxs/expected/wcs_getcov_exception_bbox.xml
M msautotest/wxs/expected/wcs_mask_20_getcov_reproj.dat
M msautotest/wxs/expected/wfs_filter_projmeter_disjoint.xml
A msautotest/wxs/expected/wfs_ogr_gpkg_issue_5858.xml
M msautotest/wxs/expected/wfsogr10_gpx.xml
M msautotest/wxs/expected/wfsogr11_caps.xml
M msautotest/wxs/expected/wms_get_map_multi_layers_one_sld_on_all_layers.png
M msautotest/wxs/expected/wms_get_map_multi_layers_one_sld_on_all_layers_postgis.png
M msautotest/wxs/expected/wms_get_map_multi_layers_one_sld_on_one_layer.png
M msautotest/wxs/expected/wms_get_map_multi_layers_one_sld_on_one_layer_postgis.png
M msautotest/wxs/expected/wms_inspire_cap.xml
M msautotest/wxs/expected/wms_inspire_cap_111.xml
M msautotest/wxs/expected/wms_inspire_cap_111_eng.xml
M msautotest/wxs/expected/wms_inspire_cap_111_ger.xml
M msautotest/wxs/expected/wms_inspire_cap_eng.xml
M msautotest/wxs/expected/wms_inspire_cap_ger.xml
A msautotest/wxs/ogr_connectionoptions.map
M msautotest/wxs/wcs_simple.map
M msautotest/wxs/wfs_200.map
M msautotest/wxs/wfs_200_allgeoms.map
M msautotest/wxs/wfs_200_cite.map
M msautotest/wxs/wfs_200_cite_postgis.map
M msautotest/wxs/wfs_200_low_wfsmaxfeatures_no_compute_number_matched.map
M msautotest/wxs/wfs_filter.map
M msautotest/wxs/wfs_filter_ogr.map
M msautotest/wxs/wfs_filter_postgis.map
M msautotest/wxs/wfs_filter_projmeter.map
M msautotest/wxs/wfs_ogr.map
A msautotest/wxs/wfs_ogr_gpkg.map
M msautotest/wxs/wfs_ogr_native_sql.map
M msautotest/wxs/wfs_ogr_no_native_sql.map
M msautotest/wxs/wfs_time.map
M msautotest/wxs/wfs_time_ogr.map
M msautotest/wxs/wfs_time_postgis.map
M msautotest/wxs/wms_inspire.map
M msautotest/wxs/wms_north_polar_stereo_extent.map
M msautotest/wxs/wms_raster.map
M msautotest/wxs/wms_uvraster_map_reprojection.map
M print-test-results.sh
M renderers/agg/include/agg_conv_curve.h
M renderers/agg/include/agg_path_storage.h
M scripts/vagrant/mapserver.sh
M scripts/vagrant/packages.sh
A scripts/vagrant/proj6.sh
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 01af882779ff4d1af354854f2dbcc4208d8367c4
https://github.com/mapserver/mapserver/commit/01af882779ff4d1af354854f2dbcc4208d8367c4
Author: Steve Lime <steve.lime at state.mn.us>
Date: 2019-11-06 (Wed, 06 Nov 2019)
Changed paths:
M mapgml.c
M mapmssql2008.c
M mapogcsld.c
M mapogcsld.h
M mapogr.cpp
M mapogroutput.c
M maporaclespatial.c
M mappostgis.c
M mapscript/python/tests/cases/map_test.py
M mapscript/swiginc/map.i
M mapserver.h
M mapstring.c
M maptemplate.c
M maptime.c
M mapwcs.c
M mapwfs.c
A msautotest/query/expected/expressions_test001.txt
A msautotest/query/expected/expressions_test002.txt
A msautotest/query/expected/expressions_test003.txt
A msautotest/query/expected/expressions_test004.txt
A msautotest/query/expected/expressions_test005.txt
A msautotest/query/expected/expressions_test006.txt
A msautotest/query/expected/expressions_test007.txt
A msautotest/query/expected/expressions_test008.txt
A msautotest/query/expected/expressions_test009.txt
A msautotest/query/expressions.map
A msautotest/sld/expected/sld_named_userstyle_1.png
A msautotest/sld/expected/sld_named_userstyle_2.png
A msautotest/sld/expected/sld_named_userstyle_3.png
A msautotest/sld/expected/sld_named_userstyle_get_styles.xml
A msautotest/sld/sld_named_userstyle.map
A msautotest/sld/sld_named_userstyle_get_styles.map
M msautotest/wxs/data/alltypes.csv
M msautotest/wxs/data/alltypes.csvt
A msautotest/wxs/data/popplace.gpkg
M msautotest/wxs/expected/wfs_alltypes_describefeaturetype.xml
A msautotest/wxs/expected/wfs_ogr_gpkg_filter_startindex.xml
A msautotest/wxs/expected/wfs_ogr_gpkg_filter_startindex2.xml
R msautotest/wxs/expected/wfs_post_time_postgis_during_filter_match_features.xml
R msautotest/wxs/expected/wfs_time_postgis_between.xml
A msautotest/wxs/expected/wfs_time_postgis_date_getfeature.xml
A msautotest/wxs/expected/wfs_time_postgis_datetime_between.xml
A msautotest/wxs/expected/wfs_time_postgis_datetime_describe.xml
A msautotest/wxs/expected/wfs_time_postgis_datetime_during_filter_and_other_clause.xml
A msautotest/wxs/expected/wfs_time_postgis_datetime_during_filter_match_features.xml
A msautotest/wxs/expected/wfs_time_postgis_datetime_during_filter_match_no_feature.xml
A msautotest/wxs/expected/wfs_time_postgis_datetime_getfeature.xml
A msautotest/wxs/expected/wfs_time_postgis_datetime_lessthan.xml
A msautotest/wxs/expected/wfs_time_postgis_datetime_or_two_during_filter.xml
A msautotest/wxs/expected/wfs_time_postgis_datetime_post_during_filter_match_features.xml
A msautotest/wxs/expected/wfs_time_postgis_datetime_sortby.xml
R msautotest/wxs/expected/wfs_time_postgis_describe.xml
R msautotest/wxs/expected/wfs_time_postgis_during_filter_and_other_clause.xml
R msautotest/wxs/expected/wfs_time_postgis_during_filter_match_features.xml
R msautotest/wxs/expected/wfs_time_postgis_during_filter_match_no_feature.xml
M msautotest/wxs/expected/wfs_time_postgis_getcaps.xml
R msautotest/wxs/expected/wfs_time_postgis_getfeature.xml
R msautotest/wxs/expected/wfs_time_postgis_lessthan.xml
R msautotest/wxs/expected/wfs_time_postgis_or_two_during_filter.xml
R msautotest/wxs/expected/wfs_time_postgis_sortby.xml
A msautotest/wxs/expected/wfs_time_postgis_time_getfeature.xml
M msautotest/wxs/expected/wms_inspire_scenario1_styles130_airlink.xml
M msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadarea.xml
M msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadlink.xml
M msautotest/wxs/expected/wms_inspire_scenario1_styles130_transportlink.xml
M msautotest/wxs/expected/wms_inspire_scenario2_styles130_airlink.xml
M msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadarea.xml
M msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadlink.xml
M msautotest/wxs/expected/wms_inspire_scenario2_styles130_transportlink.xml
M msautotest/wxs/expected/wms_inspire_styles_all.xml
M msautotest/wxs/expected/wms_inspire_styles_commontransportelements.xml
M msautotest/wxs/expected/wms_inspire_styles_railtransportnetwork.xml
M msautotest/wxs/expected/wms_inspire_styles_roadtransportnetwork.xml
M msautotest/wxs/expected/wms_inspire_styles_transportnode.xml
M msautotest/wxs/wfs_ogr_gpkg.map
M msautotest/wxs/wfs_time_postgis.map
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 60cd2915af1043a39a39317c5036576310eeacfa
https://github.com/mapserver/mapserver/commit/60cd2915af1043a39a39317c5036576310eeacfa
Author: Steve Lime <steve.lime at state.mn.us>
Date: 2019-11-15 (Fri, 15 Nov 2019)
Changed paths:
M Vagrantfile
M mapagg.cpp
M mapcairo.c
M maprendering.c
M mapserver.h
M maputfgrid.cpp
A msautotest/renderers/expected/line_label_auto.json
A msautotest/renderers/expected/utfgrid_truetype_symbol_labelcache.json
A msautotest/renderers/expected/utfgrid_truetype_symbol_nolabelcache.json
A msautotest/renderers/expected/utfgrid_truetype_symbol_rotation.json
M msautotest/renderers/line_label_auto.map
A msautotest/renderers/utfgrid_truetype_symbol.map
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: dfb9b696e605452f75225c99101d5c5009c61b9b
https://github.com/mapserver/mapserver/commit/dfb9b696e605452f75225c99101d5c5009c61b9b
Author: Steve Lime <steve.lime at state.mn.us>
Date: 2019-12-28 (Sat, 28 Dec 2019)
Changed paths:
M CMakeLists.txt
M classobject.c
M hittest.c
M kerneldensity.c
M layerobject.c
M mapcairo.c
M mapchart.c
M mapcluster.c
M mapcontext.c
M mapcontour.c
M mapcopy.c
M mapdraw.c
M mapdrawgdal.c
M maperror.c
M mapfile.c
M mapgdal.c
M mapgml.c
M mapgraticule.c
M mapkmlrenderer.cpp
M maplayer.c
M mapobject.c
M mapogcfilter.c
M mapogcfilter.h
R mapogcfiltercommon.c
A mapogcfiltercommon.cpp
M mapogcsld.c
M mapogcsld.h
M mapogcsos.c
M mapogr.cpp
M mapogroutput.c
M mapoutput.c
M mapows.c
M mapows.h
M mappostgis.c
M mapprimitive.c
M mapproject.c
M mapproject.h
M mapquery.c
M mapraster.c
M mapraster.h
M maprasterquery.c
M mapresample.c
M mapresample.h
M mapscript/mapscript.i
M mapscript/php/map.c
M mapscript/phpng/php7module.i
M mapscript/python/tests/cases/class_test.py
A mapscript/python/tests/cases/cluster_test.py
M mapscript/python/tests/cases/style_test.py
M mapscript/swiginc/class.i
M mapscript/swiginc/cluster.i
M mapscript/swiginc/color.i
M mapscript/swiginc/connpool.i
M mapscript/swiginc/dbfinfo.i
M mapscript/swiginc/error.i
M mapscript/swiginc/hashtable.i
M mapscript/swiginc/image.i
M mapserver.h
M mapservutil.c
M mapshape.c
M mapstring.c
M maptemplate.c
M mapthread.c
M mapunion.c
M maputil.c
M mapuvraster.c
M mapwcs20.c
M mapwfs.c
M mapwfslayer.c
M mapwms.c
M mapwmslayer.c
A msautotest/misc/contour_with_expr.map
A msautotest/misc/expected/contour_with_expr.png
M msautotest/misc/expected/runtime_sub_test_caps.xml
M msautotest/misc/runtime_sub.map
M msautotest/sld/expected/sld_named_userstyle_get_styles.xml
M msautotest/wxs/expected/wms_filter_getmap130.png
A msautotest/wxs/expected/wms_filter_getmap130_group_and_layer.png
A msautotest/wxs/expected/wms_filter_getmap130_group_missingFilter.txt
A msautotest/wxs/expected/wms_filter_getmap130_one_group.png
A msautotest/wxs/expected/wms_filter_getmap130_wrong_group.txt
M msautotest/wxs/wms_filter.map
M print-test-results.sh
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 371a463f4f806f9f6fe5530ba2a6961e65b1b1ff
https://github.com/mapserver/mapserver/commit/371a463f4f806f9f6fe5530ba2a6961e65b1b1ff
Author: Steve Lime <steve.lime at state.mn.us>
Date: 2020-02-21 (Fri, 21 Feb 2020)
Changed paths:
M CMakeLists.txt
M Makefile
M README.rst
M Vagrantfile
M appveyor.yml
M ci/travis/after_success.sh
M ci/travis/before_install.sh
M ci/travis/script.sh
M cmake/FindProj.cmake
M mapchart.c
M mapcontour.c
M mapcopy.c
M mapdraw.c
M mapdrawgdal.c
M mapfile.c
M mapgdal.c
M mapimageio.c
M mapmetadata.c
M mapmssql2008.c
M mapogcfilter.c
M mapogcsld.c
M mapogroutput.c
M mappostgis.c
M mapprimitive.c
M mapproject.c
M maprasterquery.c
M mapresample.c
M mapscale.c
M mapscript/csharp/swig_csharp_extensions.i
M mapscript/php/map.c
M mapscript/python/pyextend.i
M mapscript/python/pymodule.i
M mapscript/python/tests/cases/image_test.py
M mapscript/python/tests/cases/point_test.py
M mapscript/python/tests/cases/refcount_test.py
M mapscript/python/tests/cases/style_test.py
M mapserv.c
M mapserver.h
M mapservutil.c
M mapsymbol.c
M maputil.c
M mapuvraster.c
M mapwfs.c
M mapwfslayer.c
M mapwms.c
M mapwmslayer.c
A msautotest/conftest.py
A msautotest/gdal/__init__.py
A msautotest/gdal/data/lon_wrap_180_covering_more_than_360deg.asc
A msautotest/gdal/data/lon_wrap_180_covering_more_than_360deg.prj
A msautotest/gdal/expected/lon_wrap_180_covering_more_than_360deg.png
M msautotest/gdal/expected/wmsclient_3543.png
A msautotest/gdal/lon_wrap_180_covering_more_than_360deg.map
M msautotest/gdal/run_test.py
A msautotest/misc/__init__.py
M msautotest/misc/ogr_direct.map
M msautotest/misc/run_test.py
R msautotest/mspython/bug_check.py
R msautotest/mspython/ogr_query.py
R msautotest/mspython/rqtest.py
M msautotest/mspython/run_all_tests.py
A msautotest/mspython/test_bug_check.py
M msautotest/mspython/test_mapio.py
A msautotest/mspython/test_ogr_query.py
A msautotest/mspython/test_postgis.py
A msautotest/mspython/test_rq.py
A msautotest/mspython/test_wkt.py
M msautotest/mspython/test_xmp.py
R msautotest/mspython/wkt.py
A msautotest/mssql/create_mssql_db.bat
A msautotest/mssql/expected/filters_mssql_test001.png
A msautotest/mssql/expected/filters_mssql_test002.png
A msautotest/mssql/expected/filters_mssql_test003.png
A msautotest/mssql/expected/filters_mssql_test004.png
A msautotest/mssql/expected/filters_mssql_test005.png
A msautotest/mssql/expected/filters_mssql_test006.png
A msautotest/mssql/expected/filters_mssql_test007.png
A msautotest/mssql/expected/filters_mssql_test008.png
A msautotest/mssql/expected/filters_mssql_test009.png
A msautotest/mssql/filters_mssql.map
A msautotest/mssql/include/bdry_counpy2_mssql.map
A msautotest/mssql/run_test.py
M msautotest/pymod/msautotest_viewer.py
M msautotest/pymod/mstestlib.py
M msautotest/pymod/pmstestlib.py
M msautotest/pymod/testlib.py
M msautotest/pymod/xmlvalidate.py
A msautotest/pytest.ini
A msautotest/query/__init__.py
M msautotest/query/run_test.py
A msautotest/renderers/__init__.py
M msautotest/renderers/run_test.py
A msautotest/requirements.txt
A msautotest/sld/__init__.py
M msautotest/sld/arithmetic_line.map
M msautotest/sld/arithmetic_point.map
M msautotest/sld/arithmetic_polygon.map
M msautotest/sld/arithmetic_text.map
R msautotest/sld/base.map
A msautotest/sld/data/general.map.include
A msautotest/sld/data/layer_lline.map.include
A msautotest/sld/data/layer_lpoint.map.include
A msautotest/sld/data/layer_lpoint_size.map.include
A msautotest/sld/data/layer_lpolygon.map.include
A msautotest/sld/data/symbols.map.include
A msautotest/sld/data/test_sld.map.include
R msautotest/sld/expected/base_mapfile.png
R msautotest/sld/expected/base_sldbody.png
M msautotest/sld/expected/size_mapfile.png
M msautotest/sld/expected/size_sldbody.png
M msautotest/sld/reference.map
M msautotest/sld/run_test.py
M msautotest/sld/size.map
A msautotest/wxs/__init__.py
M msautotest/wxs/contour_tileindex.map
A msautotest/wxs/expected/wfs_query_cache.json
M msautotest/wxs/expected/wms_client_111.png
M msautotest/wxs/expected/wms_client_111_axis_fail.png
A msautotest/wxs/expected/wms_client_111_legendgraphic.png
M msautotest/wxs/expected/wms_client_130.png
M msautotest/wxs/expected/wms_client_130_axis_fail.png
A msautotest/wxs/expected/wms_client_130_legendgraphic.png
A msautotest/wxs/expected/wms_contour_inline_ti_getfeatureinfo.xml
A msautotest/wxs/expected/wms_contour_inline_ti_getfeatureinfo_empty_result.xml
A msautotest/wxs/expected/wms_getfeatureinfo_lon_wrap_180_left_part_raster.xml
A msautotest/wxs/expected/wms_getfeatureinfo_lon_wrap_180_right_part_raster.xml
A msautotest/wxs/expected/wms_getstyles_expressions1.xml
A msautotest/wxs/expected/wms_getstyles_expressions10.xml
A msautotest/wxs/expected/wms_getstyles_expressions11.xml
A msautotest/wxs/expected/wms_getstyles_expressions12.xml
A msautotest/wxs/expected/wms_getstyles_expressions2.xml
A msautotest/wxs/expected/wms_getstyles_expressions3.xml
A msautotest/wxs/expected/wms_getstyles_expressions4.xml
A msautotest/wxs/expected/wms_getstyles_expressions5.xml
A msautotest/wxs/expected/wms_getstyles_expressions6.xml
A msautotest/wxs/expected/wms_getstyles_expressions7.xml
A msautotest/wxs/expected/wms_getstyles_expressions8.xml
A msautotest/wxs/expected/wms_getstyles_expressions9.xml
A msautotest/wxs/expected/wms_uvraster_map_reprojection_getfeatureinfo.xml
M msautotest/wxs/run_test.py
M msautotest/wxs/wfs_query_cache.map
M msautotest/wxs/wms_client_111.map
M msautotest/wxs/wms_client_130.map
A msautotest/wxs/wms_getfeatureinfo_lon_wrap_180.map
A msautotest/wxs/wms_styles_expressions.map
M msautotest/wxs/wms_uvraster_map_reprojection.map
M renderers/agg/include/agg_basics.h
M renderers/agg/include/agg_image_accessors.h
M renderers/agg/include/agg_trans_affine.h
M renderers/agg/src/agg_curves.cpp
M scripts/vagrant/packages.sh
M scripts/vagrant/proj6.sh
M shptree.c
M shptreetst.c
M sortshp.c
Log Message:
-----------
Merge branch 'master' of https://github.com/mapserver/mapserver
Commit: 8ad166b346ffdee9c31b419c061c33cf57ff9bea
https://github.com/mapserver/mapserver/commit/8ad166b346ffdee9c31b419c061c33cf57ff9bea
Author: Steve Lime <steve.lime at state.mn.us>
Date: 2020-04-10 (Fri, 10 Apr 2020)
Changed paths:
A .github/workflows/backport.yml
M CMakeLists.txt
M HISTORY.TXT
M Makefile
R Makefile.vc
M README.rst
M appveyor.yml
M ci/travis/script.sh
M mapcontext.c
M mapcopy.c
M mapdraw.c
M mapdrawgdal.c
M mapentities.h
M maperror.c
M maperror.h
M mapfile.c
M mapgdal.c
M mapgeos.c
A mapiconv.c
A mapiconv.h
M maplabel.c
M maplexer.c
M maplibxml2.h
M mapmetadata.c
M mapmssql2008.c
R mapogcfilter.c
A mapogcfilter.cpp
M mapogcfilter.h
M mapogcfiltercommon.cpp
M mapogcsld.c
M mapogcsld.h
M mapogr.cpp
R mapogroutput.c
A mapogroutput.cpp
M mapoutput.c
M mapows.c
M mapows.h
M mapowscommon.c
M mapowscommon.h
M mapparser.c
M mapparser.h
M mapparser.y
R mappostgis.c
A mappostgis.cpp
M mappostgis.h
M mapprimitive.c
M mapscript/mapscript.i
M mapscript/perl/tests/maps.t
M mapscript/php/mapscript_error.c
M mapscript/python/README.rst
M mapscript/python/tests/cases/style_test.py
M mapserver.h
M mapshape.c
M mapshape.h
R mapstring.c
A mapstring.cpp
M mapsymbol.c
M maptemplate.h
M maptime.h
M maputil.c
R mapwcs.c
A mapwcs.cpp
M mapwcs.h
R mapwcs11.c
A mapwcs11.cpp
R mapwcs20.c
A mapwcs20.cpp
R mapwfs.c
A mapwfs.cpp
R mapwfs11.c
A mapwfs11.cpp
R mapwms.c
A mapwms.cpp
M mapxbase.c
A msautotest/gdal/class16_classify_scaled.map
A msautotest/gdal/expected/class16_classify_scaled.png
M msautotest/gdal/expected/wmsclient.png
M msautotest/gdal/wmsclient.map
A msautotest/misc/empty_symbolset
A msautotest/misc/expected/nested_symbolset.png
A msautotest/misc/nested_symbolset.map
M msautotest/misc/ogr_empty_geojson.map
A msautotest/misc/root_nested_symbolset
M msautotest/misc/sde_join.map
M msautotest/mspython/test_mapio.py
M msautotest/mssql/create_mssql_db.bat
A msautotest/mssql/expected/wfs_mssql_maxfeatures.json
A msautotest/mssql/expected/wfs_mssql_maxfeatures_order.json
A msautotest/mssql/expected/wfs_mssql_maxfeatures_qs.json
M msautotest/mssql/include/bdry_counpy2_mssql.map
A msautotest/mssql/include/cities_mssql.map
A msautotest/mssql/wfs_mssql.map
M msautotest/pymod/mstestlib.py
A msautotest/query/expected/expressions_test010.txt
A msautotest/renderers/data/cities.cpg
A msautotest/renderers/expected/polygon-hex-alpha.png
M msautotest/renderers/expected/wmsclient.cairo.png
M msautotest/renderers/expected/wmsclient.pdf
M msautotest/renderers/expected/wmsclient.png
M msautotest/renderers/expected/wmsclient.svg
A msautotest/renderers/polygon-hex-alpha.map
M msautotest/renderers/wmsclient.map
A msautotest/sld/centroid.map
A msautotest/sld/data/bg.tif
A msautotest/sld/data/danube.json
A msautotest/sld/data/layer_multiplot.map.include
A msautotest/sld/data/multiplot.json
A msautotest/sld/data/multipolygon.map.include
M msautotest/sld/data/set.json
A msautotest/sld/data/ship.svg
A msautotest/sld/expected/map_centroid.png
A msautotest/sld/expected/map_label.png
A msautotest/sld/expected/map_linemark.png
A msautotest/sld/expected/map_painter_reference.png
A msautotest/sld/expected/map_sldlike_painter_reference.png
A msautotest/sld/expected/map_sldlikedot_painter_reference.png
A msautotest/sld/expected/map_style_reference.xml
A msautotest/sld/expected/map_style_text.png
A msautotest/sld/expected/map_style_text.xml
A msautotest/sld/expected/map_symbolizers.png
A msautotest/sld/expected/map_uom.png
M msautotest/sld/expected/size_sldbody.png
A msautotest/sld/expected/sld_centroid.png
A msautotest/sld/expected/sld_label_function.png
A msautotest/sld/expected/sld_label_literal.png
A msautotest/sld/expected/sld_label_mixed.png
A msautotest/sld/expected/sld_label_property.png
A msautotest/sld/expected/sld_label_raw.png
A msautotest/sld/expected/sld_linemark.png
M msautotest/sld/expected/sld_named_userstyle_1.png
A msautotest/sld/expected/sld_painter_reference.png
M msautotest/sld/expected/sld_point_literal_displacementx.png
M msautotest/sld/expected/sld_point_literal_displacementy.png
M msautotest/sld/expected/sld_point_literal_fill.png
M msautotest/sld/expected/sld_point_literal_opacity.png
M msautotest/sld/expected/sld_point_literal_rotation.png
M msautotest/sld/expected/sld_point_literal_size.png
M msautotest/sld/expected/sld_point_literal_stroke.png
M msautotest/sld/expected/sld_point_literal_strokewidth.png
M msautotest/sld/expected/sld_reference.png
A msautotest/sld/expected/sld_stroke_fill.png
A msautotest/sld/expected/sld_style_lline.xml
A msautotest/sld/expected/sld_style_lline2.xml
A msautotest/sld/expected/sld_style_lpoint.xml
A msautotest/sld/expected/sld_style_lpoint2.xml
A msautotest/sld/expected/sld_style_lpolygon.xml
A msautotest/sld/expected/sld_style_lpolygon2.xml
A msautotest/sld/expected/sld_symbolizers.png
M msautotest/sld/expected/sld_text_expression_fontsize.png
M msautotest/sld/expected/sld_text_expression_rotation.png
M msautotest/sld/expected/sld_text_literal_fill.png
M msautotest/sld/expected/sld_text_literal_fontsize.png
M msautotest/sld/expected/sld_text_literal_halofill.png
M msautotest/sld/expected/sld_text_literal_rotation.png
M msautotest/sld/expected/sld_text_propertyname_fill.png
M msautotest/sld/expected/sld_text_propertyname_fontsize.png
M msautotest/sld/expected/sld_text_propertyname_halofill.png
M msautotest/sld/expected/sld_text_propertyname_rotation.png
A msautotest/sld/expected/sld_uom.png
A msautotest/sld/getstyles.map
A msautotest/sld/getstyles_text.map
A msautotest/sld/label.map
A msautotest/sld/linemark.map
A msautotest/sld/painter_reference.map
M msautotest/sld/reference.map
M msautotest/sld/size.map
M msautotest/sld/sld_named_userstyle.map
A msautotest/sld/symbolyzers.map
A msautotest/sld/uom.map
A msautotest/wxs/expected/wcs_multiple_metadatalink_100_cap.xml
A msautotest/wxs/expected/wcs_multiple_metadatalink_110_cap.xml
A msautotest/wxs/expected/wcs_multiple_metadatalink_200_cap.xml
A msautotest/wxs/expected/wfs_multiple_metadataurl_100_cap.xml
A msautotest/wxs/expected/wfs_multiple_metadataurl_110_cap.xml
A msautotest/wxs/expected/wfs_multiple_metadataurl_200_cap.xml
A msautotest/wxs/expected/wms_get_map_missing_bbox.xml
A msautotest/wxs/expected/wms_get_map_missing_format.xml
A msautotest/wxs/expected/wms_get_map_missing_height.xml
A msautotest/wxs/expected/wms_get_map_missing_layers.xml
A msautotest/wxs/expected/wms_get_map_missing_srs.xml
A msautotest/wxs/expected/wms_get_map_missing_styles.xml
A msautotest/wxs/expected/wms_get_map_missing_width.xml
A msautotest/wxs/expected/wms_multiple_metadataurl_cap.xml
M msautotest/wxs/tomk_workshop.map
A msautotest/wxs/wcs_multiple_metadatalink.map
A msautotest/wxs/wfs_multiple_metadataurl.map
M msautotest/wxs/wfs_ogr.map
M msautotest/wxs/wms_filter.map
M msautotest/wxs/wms_getfeatureinfo_encoding.map
M msautotest/wxs/wms_getfeatureinfo_lon_wrap_180.map
M msautotest/wxs/wms_inspire.map
A msautotest/wxs/wms_multiple_metadataurl.map
M msautotest/wxs/wms_ogr_native_sql.map
M msautotest/wxs/wms_simple.map
M msautotest/wxs/wms_sld.map
M msautotest/wxs/wms_sld_postgis.map
M msautotest/wxs/wms_src_non_square_pixel_ticket5445.map
R nmake.opt
Log Message:
-----------
Merge remote-tracking branch 'upstream/master'
Commit: 52f1826c230448b4aa837ce657c8ca4c28535215
https://github.com/mapserver/mapserver/commit/52f1826c230448b4aa837ce657c8ca4c28535215
Author: Steve Lime <steve.lime at state.mn.us>
Date: 2020-04-15 (Wed, 15 Apr 2020)
Changed paths:
M mapfile.c
M maplexer.c
M maplexer.l
Log Message:
-----------
Fix to close included files in cases where there are parse errors (#5942).
Commit: dbac24d7111e03bc13cda37c94d3a3ffb335083a
https://github.com/mapserver/mapserver/commit/dbac24d7111e03bc13cda37c94d3a3ffb335083a
Author: Jeff McKenna <jmckenna at gatewaygeomatics.com>
Date: 2020-07-21 (Tue, 21 Jul 2020)
Changed paths:
M mapfile.c
M maplexer.c
M maplexer.l
Log Message:
-----------
Merge pull request #6050 from sdlime/issue-5942
Addresses open file handles when parse errors occur in include files (Issue #5942)
Compare: https://github.com/mapserver/mapserver/compare/ec347870be17...dbac24d7111e
More information about the mapserver-commits
mailing list