* fix server plugin build on windows

* move src/mapserver to src/server (IMHO better name and in sync with
  python/server)
* rename cmake option WITH_MAPSERVER to WITH_SERVER
* rename define MAPSERVER_HAVE_PYTHON_PLUGINS to HAVE_SERVER_PYTHON_PLUGINS

Author: jef-n

.travis.yml

@@ -13,6 +13,6 @@ before_install:
 install:
   - mkdir build
   - cd build
-  - cmake -DWITH_MAPSERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF -DSUPPRESS_QT_WARNINGS=ON ..
+  - cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF -DSUPPRESS_QT_WARNINGS=ON ..
 
 script: xvfb-run ctest -V -E 'PyQgsPalLabelingCanvas|PyQgsPalLabelingServer|qgis_wcsprovidertest' -S ../qgis-test-travis.ctest --output-on-failure

CMakeLists.txt

@@ -40,16 +40,16 @@ ENDIF (WITH_GRASS)
 
 SET (WITH_DESKTOP TRUE CACHE BOOL "Determines whether QGIS desktop should be built")
 
-# mapserver by us disabled default because it needs FastCGI (which is optional dependency)
-SET (WITH_MAPSERVER FALSE CACHE BOOL "Determines whether QGIS mapserver should be built")
-IF(WITH_MAPSERVER)
-  SET (MAPSERVER_SKIP_ECW FALSE CACHE BOOL "Determines whether QGIS mapserver should disable ECW (ECW in server apps requires a special license)")
+# server disabled default because it needs FastCGI (which is optional dependency)
+SET (WITH_SERVER FALSE CACHE BOOL "Determines whether QGIS server should be built")
+IF(WITH_SERVER)
+  SET (SERVER_SKIP_ECW FALSE CACHE BOOL "Determines whether QGIS server should disable ECW (ECW in server apps requires a special license)")
 
-  SET (WITH_SERVER_PLUGINS TRUE CACHE BOOL "Determines whether QGIS mapserver support for python plugins should be built")
+  SET (WITH_SERVER_PLUGINS TRUE CACHE BOOL "Determines whether QGIS server support for python plugins should be built")
   IF(WITH_SERVER_PLUGINS)
-    SET(MAPSERVER_HAVE_PYTHON_PLUGINS TRUE)
+    SET(HAVE_SERVER_PYTHON_PLUGINS TRUE)
   ENDIF(WITH_SERVER_PLUGINS)
-ENDIF(WITH_MAPSERVER)
+ENDIF(WITH_SERVER)
 
 # Custom widgets
 SET (WITH_CUSTOM_WIDGETS FALSE CACHE BOOL "Determines whether QGIS custom widgets for Qt Designer should be built")
@@ -540,6 +540,7 @@ ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DAPP_EXPORT=${DLLIMPORT}")
 ADD_DEFINITIONS("-DCUSTOMWIDGETS_EXPORT=${DLLIMPORT}")
+ADD_DEFINITIONS("-DSERVER_EXPORT=${DLLIMPORT}")
 
 #############################################################
 # user-changeable settings which can be used to customize

cmake/MacBundleMacros.cmake

@@ -115,7 +115,7 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
             INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QBINDIR}/${QA}.app/Contents/MacOS/${QA}")
         ENDFOREACH (QA)
         # qgis-mapserver
-        IF (${WITH_MAPSERVER})
+        IF (${WITH_SERVER})
             IF (${OSX_HAVE_LOADERPATH})
                 SET (LIB_CHG_TO "${ATEXECUTABLE}/${QGIS_CGIBIN_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
             ENDIF ()

cmake_templates/qgsconfig.h.in

@@ -54,9 +54,9 @@
 
 #cmakedefine HAVE_OSGEARTHQT
 
-#cmakedefine MAPSERVER_SKIP_ECW
+#cmakedefine SERVER_SKIP_ECW
 
-#cmakedefine MAPSERVER_HAVE_PYTHON_PLUGINS
+#cmakedefine HAVE_SERVER_PYTHON_PLUGINS
 
 #endif
 

debian/rules

@@ -50,8 +50,8 @@ CMAKE_OPTS := \
 	-DBINDINGS_GLOBAL_INSTALL=TRUE \
 	-DPEDANTIC=TRUE \
 	-DWITH_QSPATIALITE=TRUE \
-	-DWITH_MAPSERVER=TRUE \
-	-DMAPSERVER_SKIP_ECW=TRUE \
+	-DWITH_SERVER=TRUE \
+	-DSERVER_SKIP_ECW=TRUE \
 	-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
 	-DWITH_APIDOC=TRUE \
 	-DWITH_CUSTOM_WIDGETS=TRUE \

doc/osx.t2t

@@ -883,7 +883,7 @@ component on Leopard and Snow, add the following line before the last line in
 the above configuration:
 
 ```
--D WITH_MAPSERVER=TRUE \
+-D WITH_SERVER=TRUE \
 ```
 
 On Lion you are on your own to figure out how to install libfcgi and add fcgi

mac/cmake/0vars.cmake.in

@@ -38,7 +38,7 @@ SET (QGIS_DATA_SUBDIR_REV "@QGIS_DATA_SUBDIR_REV@")
 # optional components
 SET (WITH_GLOBE "@WITH_GLOBE@")
 SET (WITH_GRASS "@WITH_GRASS@")
-SET (WITH_MAPSERVER "@WITH_MAPSERVER@")
+SET (WITH_SERVER "@WITH_SERVER@")
 SET (WITH_POSTGRESQL "@WITH_POSTGRESQL@")
 SET (WITH_QSPATIALITE "@WITH_QSPATIALITE@")
 

ms-windows/cygwin/package.sh

@@ -12,7 +12,7 @@ cmake -D BUILDNAME="cygwin" \
         -D WITH_GRASS=FALSE \
         -D WITH_SPATIALITE=TRUE \
         -D WITH_QSPATIALITE=TRUE \
-        -D WITH_MAPSERVER=TRUE \
+        -D WITH_SERVER=TRUE \
         -D WITH_ASTYLE=TRUE \
         -D WITH_GLOBE=TRUE \
         -D WITH_TOUCH=TRUE \

ms-windows/osgeo4w/package-nightly.cmd

@@ -141,8 +141,8 @@ cmake %CMAKE_OPT% ^
 	-D SITE="qgis.org" ^
 	-D PEDANTIC=TRUE ^
 	-D WITH_QSPATIALITE=TRUE ^
-	-D WITH_MAPSERVER=TRUE ^
-	-D MAPSERVER_SKIP_ECW=TRUE ^
+	-D WITH_SERVER=TRUE ^
+	-D SERVER_SKIP_ECW=TRUE ^
 	-D WITH_ASTYLE=TRUE ^
 	-D WITH_GLOBE=TRUE ^
 	-D WITH_TOUCH=TRUE ^

ms-windows/osgeo4w/package.cmd

@@ -134,8 +134,8 @@ set GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS_VERSION%
 cmake %CMAKE_OPT% ^
 	-D PEDANTIC=TRUE ^
 	-D WITH_QSPATIALITE=TRUE ^
-	-D WITH_MAPSERVER=TRUE ^
-	-D MAPSERVER_SKIP_ECW=TRUE ^
+	-D WITH_SERVER=TRUE ^
+	-D SERVER_SKIP_ECW=TRUE ^
 	-D WITH_GLOBE=TRUE ^
 	-D WITH_TOUCH=TRUE ^
 	-D WITH_ORACLE=TRUE ^
@@ -268,8 +268,11 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-server/%PACKAGENAME
 	--exclude-from exclude ^
 	--exclude "*.pyc" ^
 	"apps/%PACKAGENAME%/bin/qgis_mapserv.fcgi.exe" ^
+	"apps/%PACKAGENAME%/bin/qgis_server.dll" ^
 	"apps/%PACKAGENAME%/bin/admin.sld" ^
 	"apps/%PACKAGENAME%/bin/wms_metadata.xml" ^
+	"apps/%PACKAGENAME%/python/_server.pyd" ^
+	"apps/%PACKAGENAME%/python/server" ^
 	"httpd.d/httpd_%PACKAGENAME%.conf.tmpl" ^
 	"etc/postinstall/%PACKAGENAME%-server.bat" ^
 	"etc/preremove/%PACKAGENAME%-server.bat"
@@ -298,6 +301,8 @@ if not exist %ARCH%\release\qgis\%PACKAGENAME% mkdir %ARCH%\release\qgis\%PACKAG
 tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
 	--exclude-from exclude ^
 	--exclude "*.pyc" ^
+	--exclude "apps/%PACKAGENAME%/python/_server.pyd" ^
+	--exclude "apps/%PACKAGENAME%/python/server" ^
 	"bin/%PACKAGENAME%-browser-bin.exe" ^
 	"bin/%PACKAGENAME%-bin.exe" ^
 	"apps/%PACKAGENAME%/bin/qgis.reg.tmpl" ^