Commit 967f9ca4 authored by Bas Couwenberg's avatar Bas Couwenberg

Imported Upstream version 6.4.0-beta1

parent 0c336b08
.libs
*.o
*.lo
config.log
config.status
*.dll
build
*.swp
*.pyc
Makefile
legend
libmapserver.a
libmapserver.la
libtool
mapscript/csharp/Makefile
mapscript/java/Makefile
mapscript/perl/Makefile.PL
mapscript/python/_mapscript.la
mapscript/python/build/
mapscript/python/mapscript.py
mapscript/python/mapscript_wrap.c
mapscript/php/php_mapscript.la
mapscript/java/edu
mapscript/java/javamapscript_wrap.c
mapscript/java/libjavamapscript.la
mapscript/java/mapscript.jar
mapscript/perl/MYMETA.yml
mapscript/perl/Makefile.old
mapscriptvars
mapserv
mapserver-config
msencrypt
nbproject
scalebar
shp2img
shptree
shptreetst
shptreevis
sortshp
tile4ms
autom4te.cache
tags
language: c
language: php
php:
- 5.5
env:
global:
# Encrypted private key of the deploy key of the github.com/mapserver/coverage.git repository
- secure: "B1Tt18Q4F82+cXlj4fBoZDiyWbXLuzpJD6jt828qiS/i9ws8IEqYF7x3V4fo\nAnO1pZ84hdIOEfcSj2tFnysCPZ+zpOPzN2ma7iVEgmFTPNXf8pSx8CTXtiI/\nohUEcnARRCyuCK7cjEP5m4iWGazI+Pc563X4g67ToRPkLhIdrEg="
- secure: "OvxCriM3Dwa0wkZ+nQL8e6nuMrG2hrfET+QEPRps/fPSGSR+yRWo04hBqRn2\niBTJGpi0JvaTN0pxjCx2I/+4jbzkNt+J6IqSz2KTUzseiWA3tyAN8uel6fIo\nkS90UJ7OeKUuYkvzfVwYn6pxM6b+CN6+DTs0dlWgxyMg/AtVdz8="
- secure: "Vcf+jOzNtXapBf8qfM8N0ZTarQ9B7qqvG8X8fLJP5M2uDO2BrruMIZPpxwcL\nGMBkkZZGuofeqOs+BNxwnO1l4YOC+JUzQGQnExbEi02QDVzdR4+3sUvruXtL\nU/ppXvjghchgqvVp8QMjiVkUG1Ja1qwwCDM0GSN/PTfBy+Pjav0="
- secure: "FcCFPhMjgeAcSMFiTaZC6cp3IrAP9PvpAiuiKchG2smlQe85nvwdUbap7aFu\nJ8ujnuqzQJ1pc2+GAtCn0OZZ1Bh9mW31FEESiU74TphaKOFY8qAKrR7TamWx\n5XLqHvNu16LlOy/Cy8G82dMCGzPJCadM/ZwdI/RsWwRqjHgIHv0="
- secure: "Zs2+0yF2P6WWVT4o1kmgkSRmHUL1dkAYk+tHU0Piie+czblouMmqdJwsBNP6\nQF454VinL3Pu2tgbDAF10V+HknW/0ZevvmcrNa9k+Hjry8VtMNdM7jMqv4it\nYU5IGR55wfRg5q6c1jRxIPwc3Ssh2VOlz7HByppPG6i37prYO8I="
- secure: "rnFScHTmX9VDMUquOlP1FPGCr/GpCu64xw4m5AC5nIP/BCSdFSak02cc/JgC\nJPvuoud5xftyBspPRDB2eBP4YXOcPuSEdysibpGGBagKj7faCNQmCZSDd3zR\nWvLJwlfuQ39PoTIHU6O/TCX4U+v/gm4WJMwm1Tip1ID+wqqyoNU="
- secure: "h57JVvts9A0XF9ckGGokZwuD1hTBDOS0o1Yq3lD0Xd2BeJrgAXwgnKsBnBNP\nEMTBfRLGVyTgR8hiamySlWUUyVVQXMuLvKu1JnlrnZltMC8YGH4QEQwc7Twj\ni2GmsouUUHGOHU10U1F+YllSWZJjfLa6kgjkMNHg617c+PZfPLg="
- secure: "gB/9lGc5o6xeJSLler3s5ZmP0Kn+x1knSw5BIUQkke7rzWlMIaeZHqEf1iQm\n49Q2Aepo0I+RdAaGNlPHR3KrUc3P3/ZokWZ1zv449Mh0OKLNrLSE+CruuVYj\n2XcOrLC2vjSsMfaM9520spdjbvVpcTUKJho9kGRTPKLs8YbGLv8="
- secure: "px+guXOAtfmiBRub6sgvzlidKEmCNVthyAcaRHRzdtl6j7XoXHPGL2QHb8YH\nxV/wtDnLFIZi1eoShpLwABGvqQ1KQ20X+nz8FWZDnmDK3PXVBTqaUMyarmEB\nT7UohY94d8S2NqWJqeiOqVfMBOsIve9N1g3mcSUAlYMngEYoVt0="
- secure: "jPxrLpA61LxMH2a8k9P22l3/7Yx+Lhzmrne61xkFGo1F9oqwHap88AKm0gP3\nEApgDmCVRvHgetfEFIxapF+6yPZinE0EsqJonKS1NCeKjs91LMsM7Dr3UiU3\nNaco2w3B0v6dDOdG1JhAV6N/CqdWXz85hooSWsLrWpYMtPbOfJQ="
- secure: "dFvmnenj189QmbFdTW2ckHPbYojouowtz8cURDrR/2BiU0a3GUUDHP0h9O+c\nLDfJ1g03hsMr8m/45QdpL/x2lROimczFNu/U+uS8Vtja1z4SYaOMDjW4p3pq\nqPzQc/WmlpBY8wmfCH1WqmRRPvrfKceEDtVhWXruxpSZUx/OvoY="
- secure: "TmOZmx8kyEOCUOMmWKuPpKzqBpbCKMOJpankHhhEAwJ00iJ3bMzdZk7dFsMV\nq9sk2nAgkARsVakfhiUvM516CKgf3J5rskUq+AQs6JdFP8w9A3LKowLHxlqg\nCvhQtOm3ff1EVQKeDOfgUxaI20Ulq6sl+b1/uq2W1v25IqwR1ps="
- secure: "rYU47VfOGgheYhF/Xy6DM9iRi+NPSoyfMQ9B0Hoznm7k/TI1ojEky/wnIp3A\n+UdkoNo0xYzLZdjY4b1UBukMTKZJXVpYHs+KwKMhJQU3UaXpWEWo0Hqr8fU1\nOf7nspF27o79xcc3R+Okuz7L2J8+jD6Ggi2NW5vvp2S+jQW4Py4="
- secure: "PXqhXu3cK9nf80Pv4AgqS2R8HVLAHVGozqfAeAgPDOZQYUCbAyEm/QZ5WbPb\nzNQAYuEFVjt59H0b3fOM5rUSX8Igx0NeG9rxG6WYyitXZWinXyeKeZ5yKn1f\nI/gIZPVH1r1H30+TCOH9sD9rH/2eRzb5ycDGKccZfv5/MocwKwg="
- secure: "KK6YzOtwmbd3UbfiavTowvUkTGXN23ZMONwP7OpTTDZ+1/XVBeiuGLJAdHsn\nLPOImlytI9SavQekA6w4EaPb9VLRoC+O1CXOlllEjxfo0LojXDBKCaoyXOx3\nu1K8aXjyeZ2dPagjz06NV6r+y9tGypHrR7qXArVANRkzsajpABM="
- secure: "XH1YshS/QJTOWxlccDjHVCSnN3IDYqug8hw+xOpNXeKR/VbZ82lv6s1gURHh\nKI6jDPGUFiD/OA37SDmArT/CbZ2zDJtSB8YNDr8w/wInlp7vnWBoRWlFQ3eP\nsJDexlZTCvo3TUogHFpLrbq9WuEXLCJ/yfYq1zJfFvipDWR6MhQ="
- secure: "QoM0cJU0QioMMcD8Vs4xD04+jMGrTmbxxESpR4fwllAhP0ZpZt8E1qPQV9Hq\nVNzRVF/FLMlmDL8LzAYOFzVZASpb0X0l5KmxqRN3rRkSDc/LLSQf+701W00T\nJLAUXB05JPvJE5QBM5VgqNivO1JAC/Y0D83Pio8fHxYFUG6M9DM="
- secure: "LufnBePmcGefhwb3ofhBiPWdiGjGMa8G83HNdYv4BGMNyJqGa4rVaFg5yPa2\nLZx0JPwEoWK+i3QuI2ug37bSSBMf0130sUOn+E+Vy4fHeGrCdt3WrwSjACq5\nGgaBQ1JN6zLI8Gt4ekcOBOZNme6a+eMoW6asAhroIPoU1Jo/5o0="
- secure: "LZorvKqv/ncsk6sZS5NaZch/msx3HCHcy3e6BEJwudQHnF5iLz8TGbJFL9UL\nXjVX6H+CmnOQW9qbMEWTfMVXuLEXCVpX0YoQuhYwYEbhdSmz8PFJlv8BxxJg\n3OOZo0QgD2ZZ/KBenj3XIVVKeS2jHBUhXKP8G6D88xmdt3GtzRY="
- secure: "JmHFSkvxfoY6vfSM35K2eC4X0GN9n1SWapBzIFT70rz3PNKAY2QAGlvcMI2W\nZZ5JouXHHESXR+mujllzZRcx9ZJQ67k65OxG+a1ID+rivTO1A0kU36chBy8Q\nNgskyAD68gixuYts+4MXb1biXKdEO9AmUTu3zDvgqo5vcTIjvPU="
- secure: "QMjLOqEDegfPTTlm1f4SX2/77XLqAjpPrQ483EGRY59/xrS1aI0l9jTgpgTv\nZ/JyuYOX+JkbQBeW1ZuAhaXH1Q2AZ7Sun+adJ0B4yLZTHFiiy2mIFe7CcUCi\np+WgxwSPvi+uZUvEEAczKFWDKvM8qyUwZoHqaYj7VU4mComfsyE="
- secure: "RynRoItVw0gkM5OznZYhoDuukwOXVVXS5sF75G53FpoobXQYaUR20BoPFqtT\nHptuGei3f23Afiq3j807GWNoOxqVIaIoijMVxEBk6/xu43DYqUO3Nx4fB6Bk\nHdp4qNTfTVtsqy7IuXzbB3koS5xc1DUPHFDYh10pH5xWItUxlEc="
- secure: "UVtqSIfAKYSW0J06QEo+HveY+krqc7rEvnO5SNVzcQCFahnfWOIec6WQPd6O\nF/wPRjcC/zxg8PK/u5RHOKDNY6/nFNnRE7b8+MkxKcWZiFy0TipGjr57n6GW\nzgBGFi4Kw8XqFkC4hKC2eqiA8iYC+xCVzLNtnT3zp0fBG/nSrR8="
- secure: "jGoUxEIa0Mi1RZU+nZpgO9c5vw82Yl4s1h+0bimQ17OA44mmOD4UQ4ygkH+1\nKsDwJ1JxP85K2EVZdwI4EswHCH1gYRzHyO0Mo6r9LOB8aGb60mq4BCQj80oI\nlw/i4K037sb0zqys7uu0J0UD9Xep0F49uYBdrnXl5l/fLzHTm1w="
- secure: "CzFKm/g+wLUdsu4ecEx6v93ZS/CM0/3hcBxPtt/nRbmF95KW+QZMIpwUbmsH\nIZhljPkWjKOceB1sotdJjXWzEuPMj64rh9cJyWw2WO7eGG0NtbovZPUEZF4P\nz6sa3KcjNnLYAMq3Op29p23DLaZWzJqy6yzFvYQF8lxUYIyhLDU="
- secure: "fwO9vY9pIHgsCoETgQCkTVzKguuItFwLnkWOzZtzvt8fiJw2/ZafycnsTJMc\nh3/jZpn1+K+dQr7jMks9vKTXLq5101Z4SBbxaa0bt9NjyGlL72gf8sB331Oh\nLZ/E/415jeRT8sFoYNvKOfL+rtqqHaimJkaS/XvRUfru/zrb5Rw="
- secure: "TN6ig2qgH6EFGEttDtD9rxj2bH3BUJA4rJafjOXiAdQUVcH9E6lWeIaorzy9\n5Empsi/iC2rXF9i+JwE+OreUh47NL3P9jQN8dNkRmyLiuGpVVmreXynLydsS\nmaxPVwRKKSkL1PR54ICQ/Blw0vR27AqlvxO/gLcESG9Xu3Isa4o="
- secure: "BacSp+HDt0fEiSElLIzfTxi72sjO1VZkQc2/+AEJqYnGmBse1eofV9XRSlfd\nfm2qDXER34y2PerxBL5EmF3D0kG8vhBANOtHTHw5LlTR8xa/MJIMZag6zw7q\nBacSmiRNbw9XpTN+lcYvzrKFaf29exBvdKCGBv7qdMzLcEMxBVw="
- secure: "Bj/9iVBA6DGVcGRdbt3bQms8VglgSjdhI7IwvRkO3Gfvq0FTg1Hu8nodAiwM\nrfMfHzvTGNZudAkBRmPE6xZtIbID6v89S8CqEx3iGU+qbvni2nVt1SzEppb4\n8oZLKlZf3dCthrR2rpIdVMcccWhW3AjDfHKO9OlV2VR90NkWKz4="
- secure: "OJqQvNnWc0MWNOxsyhtfnn6XLj3Ssmcl+nRAp2KBwI691HvXMDsqmIXBEjq1\nql+iuNn7sxn9v+ooGXmrFS9CHndncmtKEvNzdi1HKlJhEAG0+MCYnwYwaQHr\n+6HhCnLoZ2wiE+OANFjodkQRNQ4VyATOEn5WFnp56CEtiFQiNzM="
compiler:
- gcc
......@@ -7,29 +43,32 @@ before_install:
- git submodule update --init --recursive
- sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
- sudo apt-get update -qq
- sudo apt-get install -qq php-pear colordiff postgis libpq-dev libpng12-dev libjpeg-dev libgif-dev libgeos-dev libgd2-noxpm-dev libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libgdal1-dev libproj-dev libxml2-dev
- sudo pear config-set auto_discover 1 && sudo pear install --alldeps channel://pear.phpunit.de/PHPUnit-3.6.12
- echo "extension=php_mapscript.so" | sudo tee -a /etc/php5/cli/php.ini
- sudo apt-get install -qq bison flex swig cmake librsvg2-dev colordiff postgis postgresql-9.1-postgis-2.0-scripts libpq-dev libpng12-dev libjpeg-dev libgif-dev libgeos-dev libgd2-noxpm-dev libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libgdal1-dev libproj-dev libxml2-dev python-dev php5-dev libexempi-dev lcov lftp
- sudo pip install git+git://github.com/tbonfort/cpp-coveralls.git@extensions
- cd msautotest
- ./create_postgis_test_data.sh
- python -m SimpleHTTPServer &> /dev/null &
- cd ..
- touch maplexer.l
- touch mapparser.y
install:
- ./configure --with-gd --with-postgis --with-wmsclient --with-wfsclient --with-kml --with-cairo --with-wcs --with-proj --with-geos --with-gdal --with-ogr --with-wfs --with-sos --with-php
- make -j3
- sudo make install
- sudo ldconfig
script:
- make -j3 test
- cd msautotest/php && ./run_test.py
- ./run-test-suite.sh
after_success:
# Only run coverage when it is safe to do so (not on pull requests), and only on master branch
- echo "$TRAVIS_SECURE_ENV_VARS"
- echo "$TRAVIS_BRANCH"
- sh -c 'if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "master"; then echo "run coverage"; ./run_code_coverage_upload.sh; fi'
- coveralls --exclude renderers --exclude mapscript --exclude apache --exclude build/mapscript/mapscriptPYTHON_wrap.c --exclude shp2img.c --exclude legend.c --exclude scalebar.c --exclude msencrypt.c --exclude sortshp.c --exclude shptreevis.c --exclude shptree.c --exclude testexpr.c --exclude sym2img.c --exclude testcopy.c --exclude shptreetst.c --exclude tile4ms.c --extension .c --extension .cpp
notifications:
email:
recipients:
- thomas.bonfort@gmail.com
irc:
channels:
- "irc.freenode.org#mapserver"
use_notice: true
This diff is collapsed.
......@@ -12,9 +12,35 @@ the top of the list.)
For a complete change history, please see the Git log comments.
Version 6.2.1 (2013-04-19):
6.4 release (2013/09/xx)
---------------------------
- RFC100: Add support for raster tile index with tiles of mixed SRS (TILESRS keyword)
- RFC94: Shape Smoothing
- RFC95 : add EXPRESSION {value1,value2,...} support to parser (#4648)
- RFC92: Migration from autotools to cmake (#4617)
- RFC88: Saving MapServer Objects to Strings (#4563)
- RFC90: Enable/Disable Layers in OGC Web Services by IP Lists
- RFC85,89 Added Simplify,SimplityPT and Generalize geomtransform, implementation of
geomtransform at the layer level
- RFC86: Scale-dependant token replacements (#4538)
- Fix symbol scaling for vector symbols with no height (#4497,#3511)
- Implementation of layer masking for WCS coverages (#4469)
- Implementation of offsets on follow labels (#4399)
6.2.0 release (git branch-6-2) 2012/11/14:
--------------------------------------------------
- Fix WFS GetFeature result bounds are not written in requested projection (#4494)
- Fixed wrong size in LegendURL of root layer (#4441)
......@@ -40,6 +66,11 @@ Version 6.2.1 (2013-04-19):
- Fixed the OGR driver to use point or line spatial filter geometries in degenerated cases (#4420)
- implement OFFSET x -99 on ANGLE FOLLOW labels (#4399)
Version 6.2 (beta1: 20120629):
-------------------------------------------------
- Fix WFS filter is produced as non-standard XML (#4171)
- Fix pixmap symbol loading issue (#4329)
......
......@@ -4,7 +4,7 @@ instructions.
Unix compilation instructions
-----------------------------
See README.CONFIGURE or the document on the MapServer website at
See INSTALL.CMAKE or the document on the MapServer website at
<http://www.mapserver.org/installation/unix.html>
Win32 compilation instructions
......
CMake Build Instructions
========================
Since version 6.4, MapServer is built with the CMake build tool instead of the
previous autotools chain. CMake is opensource and free of charge and is usually
included in distribution packages, or can be downloaded and compiled with no
third party dependencies.
CMake itself does not do the actual compiling of the MapServer source code, it
mainly creates platform specific build files that can then be used by standard
build utilities (make on unixes, visual studio on windows, xcode on osx, etc...)
Install CMake
-------------
MapServer requires at least CMake version 2.6.0, although the build process with
such an old version has not been thouroughly tested. 2.8.0 and above are
recommended.
Distro Packaged Version
.......................
Linux distributions usually include the cmake package, that can be installed
with your usual package manager: apt-get, yum, yast, etc...
Installing Your Own
...................
Head over to http://www.cmake.org/cmake/resources/software.html to download
a source tarball (for unixes) or a binary installer (for windows).
If you are building from source, the build process is detailed in the tarball
readme files, and consists only in
$ tar xzf cmake-x.y.z.tar.gz
$ cd cmake-x.y.z
$ ./bootstrap
$ make
# make install
Creating the MapServer platform specific project with CMake
-----------------------------------------------------------
Although you can run and build from MapServer's source directory as created
by downloading a tarball or using a git clone, it is **highly** recommended
to run "out-of-source" builds, i.e. having all build files be compiled and
created in a different directory than the actual MapServer sources. This allows
to have different configurations running alongside each other (e.g. release and
debug builds, cross-compiling, enabled features, etc...).
Running CMake From the Command Line
...................................
mkdir build
cd build
cmake ..
## fix dependency issues
make
Running the GUI version of cmake
................................
CMake can be run in graphical mode, in which case the list of available options
are presented in a more user-friendly manner
mkdir build
cd build
ccmake ..
## follow instructions, fix dependency issues
Options and Dependencies
........................
Depending on what packages are available in the default locations of your system,
the previous "cmake .." step will most probably have failed with messages indicating
missing dependencies (by default, MapServer has *many* of those). The error message
that CMake prints out should give you a rather good idea of what steps you should take
next, depending on wether the failed dependency is a feature you require in your build
or not.
- Either disable the dependency by rerunning cmake with -DWITH_DEPENDENCY=0, e.g.
$ cmake .. -DWITH_CAIRO=0
- Or, if the failed dependency relates to a feature you want built in, and that cmake has
not been able to find it's installation location, there are 3 possible reasons:
1 You have not installed the third party package, and/or the third party development
headers. Use your standard package manager to install the failing package, along
with it's development headers. The development packages on linux usually end with
"-dev" or "-devel", e.g. libcairo2-devel , libpng-dev, etc...
$ (sudo) apt-get install libcairo-dev
$ cmake ..
2 You have installed the third party package in a non standard location, which you
must give to cmake so it can find the required headers and libraries
$ cmake .. -DCMAKE_PREFIX_PATH=/opt/cairo-1.18.2
Cmake expects these nonstandard prefixes to contain standard subdirectories, i.e.
/opt/cairo-1.18.2/include/cairo.h and /opt/cairo-1.18.2/lib/libcairo.so.
You can specify multiple prefixes on the cmake command line by separating them with
a semi-colon, e.g.
$ cmake .. -DCMAKE_PREFIX_PATH=/opt/cairo-1.18.2;/opt/freeware
3 If you're certain that the packages development headers are installed, and/or that
you pointed to a valid installation prefix, but cmake is still failing, then there's
an issue with MapServer's cmake setup, and you can bring this up on the
mailing list or issue tracker.
Available Options
-----------------
Following is a list of option, taken from MapServer's CMakeLists.txt configuration file.
After the description of the option, the ON/OFF flag states if the option is enabled by
default (in which case the cmake step will fail if the dependency cannot be found). All
of these can be enabled or disabled by passing "-DWITH_XXX=0" or "-DWITH_XXX=1" to the
"cmake .." invocation in order to override a default selection.
- option(WITH_PROJ "Choose if reprojection support should be built in" ON)
- option(WITH_KML "Enable native KML output support (requires libxml2 support)" OFF)
- option(WITH_SOS "Enable SOS Server support (requires PROJ and libxml2 support)" OFF)
- option(WITH_WMS "Enable WMS Server support (requires proj support)" ON)
- option(WITH_GD "Choose if (old) GD support should be built in" OFF)
- option(WITH_FRIBIDI "Choose if FriBidi glyph shaping support should be built in (usefull for left-to-right languages)" ON)
- option(WITH_ICONV "Choose if Iconv Internationalization support should be built in" ON)
- option(WITH_CAIRO "Choose if CAIRO rendering support should be built in (required for SVG and PDF output)" ON)
- option(WITH_SVGCAIRO "Choose if SVG symbology support (via libsvgcairo) should be built in (requires cairo, libsvg, libsvg-cairo. Incompatible with librsvg)" OFF)
- option(WITH_RSVG "Choose if SVG symbology support (via librsvg) should be built in (requires cairo, librsvg. Incompatible with libsvg-cairo)" OFF)
- option(WITH_MYSQL "Choose if MYSQL joining support should be built in" OFF)
- option(WITH_FCGI "Choose if FastCGI support should be built in" ON)
- option(WITH_GEOS "Choose if GEOS geometry operations support should be built in" ON)
- option(WITH_POSTGIS "Choose if Postgis input support should be built in" ON)
- option(WITH_GDAL "Choose if GDAL input raster support should be built in" ON)
- option(WITH_OGR "Choose if OGR/GDAL input vector support should be built in" ON)
- option(WITH_CURL "Enable Curl HTTP support (required for wms/wfs client, remote SLDs and pixmap symbols)" OFF)
- option(WITH_CLIENT_WMS "Enable Client WMS Layer support (requires CURL and GDAL support)" OFF)
- option(WITH_CLIENT_WFS "Enable Client WMS Layer support (requires CURL and OGR support)" OFF)
- option(WITH_WFS "Enable WFS Server support (requires PROJ and OGR support)" ON)
- option(WITH_WCS "Enable WCS Server support (requires PROJ and GDAL support)" ON)
- option(WITH_LIBXML2 "Choose if libxml2 support should be built in (used for sos, wcs 1.1,2.0 and wfs 1.1)" ON)
- option(WITH_THREADS "Choose if a thread-safe version of libmapserver should be built (only recommended for some mapscripts)" OFF)
- option(WITH_GIF "Enable GIF support (for PIXMAP loading)" ON)
- option(WITH_PYTHON "Enable Python mapscript support" OFF)
- option(WITH_PHP "Enable Python mapscript support" OFF)
- option(WITH_PERL "Enable Perl mapscript support" OFF)
- option(WITH_RUBY "Enable Ruby mapscript support" OFF)
- option(WITH_JAVA "Enable Java mapscript support" OFF)
- option(WITH_CSHARP "Enable C# mapscript support" OFF)
- option(WITH_ORACLESPATIAL "include oracle spatial database input support" OFF)
- option(WITH_ORACLE_PLUGIN "include oracle spatial database input support as plugin" OFF)
- option(WITH_MSSQL2008 "include mssql 2008 database input support as plugin" OFF)
- option(WITH_SDE_PLUGIN "include ArcSDE support as a plugin (must specify SDE_INCLUDE_DIR and SDE_LIBRARY_DIR)." OFF)
- option(WITH_SDE "include ArcSDE support. Add -DSDE_VERSION=91 to use 9.1 arcSDE version" OFF)
- option(WITH_EXEMPI "include xmp output metadata support" OFF)
- option(WITH_XMLMAPFILE "include native xml mapfile support (requires libxslt/libexslt)" OFF)
The following options are for advanced users, i.e. you should not enable them unless
you know what you are doing:
- option(BUILD_STATIC "Also build a static version of mapserver" OFF)
- option(LINK_STATIC_LIBMAPSERVER "Link to static version of libmapserver (also for mapscripts)" OFF)
- option(WITH_APACHE_MODULE "include (experimental) support for apache module" OFF)
- option(WITH_GENERIC_NINT "generic rounding" OFF)
- option(WITH_POINT_Z_M "include Z and M coordinates in point structure (advanced, not recommended)" OFF)
The following are some common CMake options not specific to MapServer itself:
- CMAKE_INSTALL_PREFIX : path where mapserver binaries and libraries should be installed. Defaults
to /usr/local on unix.
- CMAKE_PREFIX_PATH : semi-colon separted list of prefixes where dependencies will be looked for, e.g.
"-DCMAKE_PREFIX_PATH=/opt/freeware;/opt/jdk-1.5.6"
- CMAKE_BUILD_TYPE : Specify the build type. Usually one of 'Debug' or 'Release', e.g.
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Debug"
You can find a more extensive list of cmake variables here: http://www.cmake.org/Wiki/CMake_Useful_Variables
This diff is collapsed.
AUTOTEST_OPTS=-strict -q
PHP_MAPSCRIPT=build/mapscript/php/php_mapscript.so
PYTHON_MAPSCRIPT_PATH=build/mapscript/python
JAVA_MAPSCRIPT_PATH=build/mapscript/java
BUILDPATH=../../build
FLEX=flex
YACC=yacc
CMAKEFLAGS=-DCMAKE_C_FLAGS="--coverage" -DCMAKE_CXX_FLAGS="--coverage" \
-DCMAKE_SHARED_LINKER_FLAGS="-lgcov" -DWITH_GD=1 -DWITH_CLIENT_WMS=1 \
-DWITH_CLIENT_WFS=1 -DWITH_KML=1 -DWITH_SOS=1 -DWITH_PHP=1 \
-DWITH_PYTHON=1 -DWITH_JAVA=1 -DWITH_THREADS=1 -DWITH_FRIBIDI=0 -DWITH_FCGI=0 -DWITH_EXEMPI=1 \
-DCMAKE_BUILD_TYPE=Release -DWITH_RSVG=1 -DWITH_CURL=1
all: cmakebuild
cmakebuild: lexer parser
if test ! -s build/Makefile; then mkdir -p build ; cd build ; cmake .. $(CMAKEFLAGS); fi
cd build && $(MAKE) $(MFLAGS)
warning:
$(error "This Makefile is used to run the \"test\" target")
wxs-testcase:
cd msautotest/wxs && export PATH=$(BUILDPATH):$(PATH) && ./run_test.py $(AUTOTEST_OPTS)
renderers-testcase:
cd msautotest/renderers && export PATH=$(BUILDPATH):$(PATH) && ./run_test.py $(AUTOTEST_OPTS)
misc-testcase:
cd msautotest/misc && export PATH=$(BUILDPATH):$(PATH) && ./run_test.py $(AUTOTEST_OPTS)
gdal-testcase:
cd msautotest/gdal && export PATH=$(BUILDPATH):$(PATH) && ./run_test.py $(AUTOTEST_OPTS)
query-testcase:
cd msautotest/query && export PATH=$(BUILDPATH):$(PATH) && ./run_test.py $(AUTOTEST_OPTS)
autotest-install:
test -d "msautotest/wxs" || ( git submodule init && git submodule update )
mspython-testcase:
test -f "$(PYTHON_MAPSCRIPT_PATH)/_mapscript.so" && (export PYTHONPATH="../../$(PYTHON_MAPSCRIPT_PATH)" && cd msautotest/mspython && python run_all_tests.py)
php-testcase:
test -f "$(PHP_MAPSCRIPT)" && (export PHP_MAPSCRIPT_SO="../../$(PHP_MAPSCRIPT)" && cd msautotest/php && ./run_test.sh)
java-testcase:
test -d "$(JAVA_MAPSCRIPT_PATH)" && (export JAVA_MAPSCRIPT_SO="../../$(JAVA_MAPSCRIPT_PATH)" && cd mapscript/java && ./run_test.sh)
test: autotest-install cmakebuild
@$(MAKE) $(MFLAGS) wxs-testcase renderers-testcase misc-testcase gdal-testcase query-testcase mspython-testcase
@./print-test-results.sh
@$(MAKE) $(MFLAGS) php-testcase
@$(MAKE) $(MFLAGS) java-testcase
lexer: maplexer.c
parser: mapparser.c
maplexer.c: maplexer.l
$(FLEX) --nounistd -Pmsyy -i -o$(CURDIR)/maplexer.c $(CURDIR)/maplexer.l
mapparser.c: mapparser.y
$(YACC) -d -o$(CURDIR)/mapparser.c $(CURDIR)/mapparser.y
This diff is collapsed.
......@@ -48,7 +48,7 @@ MS_OBJS = mapbits.obj maphash.obj mapshape.obj mapxbase.obj \
mapoglrenderer.obj mapoglcontext.obj mapogl.obj \
maptile.obj $(EPPL_OBJ) $(REGEX_OBJ) mapgeomtransform.obj mapunion.obj \
mapkmlrenderer.obj mapkml.obj mapdummyrenderer.obj mapgeomutil.obj mapquantization.obj \
mapogcfiltercommon.obj mapcluster.obj mapuvraster.obj mapservutil.obj $(AGG_OBJ)
mapogcfiltercommon.obj mapcluster.obj mapuvraster.obj mapcontour.obj mapsmoothing.obj mapservutil.obj hittest.obj $(AGG_OBJ)
MS_HDRS = mapserver.h mapfile.h
......@@ -148,7 +148,7 @@ mapscriptvars: makefile.vc nmake.opt
echo $(INCLUDES) >> mapscriptvars
echo $(LIBS_DLL) >> mapscriptvars
echo $(LIBS) >> mapscriptvars
findstr MS_VERSION mapserver.h | findstr define >> mapscriptvars
findstr MS_VERSION mapserver-version.h | findstr define >> mapscriptvars
#install: $(MS_DLL) $(MS_EXE) python csharp java php
install: $(MS_DLL) $(MS_EXE)
......
This diff is collapsed.
This diff is collapsed.
add_library(mod_mapserver MODULE mod_mapserver.c)
target_link_libraries(mod_mapserver ${MAPSERVER_LIBMAPSERVER})
set_target_properties(mod_mapserver PROPERTIES PREFIX "")
IF(APPLE)
if(HTTPD_EXECUTABLE)
if(XCODE)
SET(CMAKE_C_LINK_FLAGS
"${CMAKE_C_LINK_FLAGS} -bundle_loader ${HTTPD_EXECUTABLE}")
else(XCODE)
SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -bundle_loader ${HTTPD_EXECUTABLE}")
endif(XCODE)
else(HTTPD_EXECUTABLE)
if(XCODE)
SET(CMAKE_C_LINK_FLAGS
"${CMAKE_C_LINK_FLAGS} -undefined dynamic_lookup")
else(XCODE)
SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -Wl,-undefined,dynamic_lookup")
endif(XCODE)
endif(HTTPD_EXECUTABLE)
ENDIF(APPLE)
find_package(APACHE)
if(APACHE_FOUND)
include_directories(${APACHE_INCLUDE_DIR})
else(APACHE_FOUND)
report_mandatory_not_found(APACHE)
endif(APACHE_FOUND)
find_package(APR)
if(APR_FOUND)
include_directories(${APR_INCLUDE_DIR})
target_link_libraries(mod_mapserver ${APR_LIBRARY})
if(DEFINED APR_CPPFLAGS)
add_definitions("${APR_CPPFLAGS}")
endif(DEFINED APR_CPPFLAGS)
else(APR_FOUND)
report_mandatory_not_found(APR)
endif(APR_FOUND)
if(APACHE_MODULE_DIR)
INSTALL(TARGETS mod_mapserver DESTINATION ${APACHE_MODULE_DIR})
endif(APACHE_MODULE_DIR)
......@@ -12,9 +12,9 @@
#include "apr_tables.h"
#include "apr_file_info.h"
#include "mapserver.h" /* for mapObj */
#include "cgiutil.h"
#include "mapserv.h"
#include "../mapserver.h" /* for mapObj */
#include "../cgiutil.h"
#include "../mapserv.h"
module AP_MODULE_DECLARE_DATA mapserver_module;
......
......@@ -64,7 +64,7 @@ int readPostBody( cgiRequestObj *request, char **data )
if( *data == NULL ) {
msIO_setHeader("Content-Type","text/html");
msIO_sendHeaders();
msIO_printf("malloc() failed, Content-Length: %u unreasonably large?\n", data_max );
msIO_printf("malloc() failed, Content-Length: %u unreasonably large?\n", (unsigned int)data_max );
return MS_FAILURE;
}
......@@ -104,7 +104,7 @@ int readPostBody( cgiRequestObj *request, char **data )
}
}
*data[data_len] = '\0';
(*data)[data_len] = '\0';
return MS_SUCCESS;
}
......
#
# APACHE_FOUND - System has APACHE
# APACHE_INCLUDE_DIR - The APACHE include directory
#
# APACHE_LOCATION
# setting this enables search for apache libraries / headers in this location
#
# Include directories
#
find_path(APACHE_INCLUDE_DIR
NAMES httpd.h
PATH_SUFFIXES httpd apache apache2
)
find_program(APXS_BIN NAMES apxs apxs2
PATH_SUFFIXES httpd apache apache2
)
find_program(HTTPD_EXECUTABLE NAMES httpd
PATHS
/usr/sbin
PATH_SUFFIXES httpd apache apache2
)
if(APXS_BIN)
EXEC_PROGRAM(${APXS_BIN}
ARGS -q LIBEXECDIR
OUTPUT_VARIABLE APACHE_MODULE_DIR )
endif(APXS_BIN)
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set APACHE_FOUND to TRUE if
# all listed variables are TRUE
find_package_handle_standard_args(APACHE DEFAULT_MSG APACHE_INCLUDE_DIR )
mark_as_advanced(APACHE_INCLUDE_DIR)
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# - Find Apache Portable Runtime
# Find the APR includes and libraries
# This module defines
# APR_INCLUDE_DIR and APRUTIL_INCLUDE_DIR, where to find apr.h, etc.
# APR_LIBRARIES and APRUTIL_LIBRARIES, the libraries needed to use APR.
# APR_FOUND and APRUTIL_FOUND, If false, do not try to use APR.
# also defined, but not for general use are
# APR_LIBRARY and APRUTIL_LIBRARY, where to find the APR library.
# APR first.
FIND_PROGRAM(APR_CONFIG_BIN
NAMES apr-config apr-1-config )
if(APR_CONFIG_BIN)
execute_process(
COMMAND ${APR_CONFIG_BIN} --includedir
OUTPUT_VARIABLE HINT_APR_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process(
COMMAND ${APR_CONFIG_BIN} --cppflags
OUTPUT_VARIABLE APR_CPPFLAGS
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif(APR_CONFIG_BIN)
FIND_PATH(APR_INCLUDE_DIR
NAMES apr.h
HINTS ${HINT_APR_INCLUDE_DIR}
PATH_SUFFIXES apr-1 apr-1.0 apr
)
FIND_LIBRARY(APR_LIBRARY
NAMES apr-1 apr
PATH_SUFFIXES apr-1 apr-1.0 apr
)