[mapguide-commits] r9731 - trunk/MgDev/Web/src/DevHttpServer

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-09-17 02:51:07 -0700 (Thu, 17 Sep 2020)
New Revision: 9731

Added:
   trunk/MgDev/Web/src/DevHttpServer/mgdevhttpserver.sh
Modified:
   trunk/MgDev/Web/src/DevHttpServer/CMakeLists.txt
Log:
Add install targets for MgDevHttpServer. Fixes #2824

Modified: trunk/MgDev/Web/src/DevHttpServer/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/DevHttpServer/CMakeLists.txt	2020-09-15 14:34:57 UTC (rev 9730)
+++ trunk/MgDev/Web/src/DevHttpServer/CMakeLists.txt	2020-09-17 09:51:07 UTC (rev 9731)
@@ -1,4 +1,5 @@
 project(devhttpserver)
+set(MG_COMPONENT "dev-http-server")
 include_directories(
     ${MG_COMMON_DIR} #For ProductVersion.h
     ${MG_COMMON_DIR}/Foundation
@@ -19,11 +20,21 @@
     ../MapAgentCommon/MapAgentGetParser.cpp
     ../MapAgentCommon/MapAgentStrings.cpp
 )
-add_executable(MgDevHttpServer ${DevHttpServer_SRCS})
-target_link_libraries(MgDevHttpServer
+add_executable(mgdevhttpserver ${DevHttpServer_SRCS})
+target_link_libraries(mgdevhttpserver
     MgFoundation${MG_VERSION_SUFFIX}
     MgPlatformBase${MG_VERSION_SUFFIX}
     MgMdfModel${MG_VERSION_SUFFIX}
     MgMdfParser${MG_VERSION_SUFFIX}
     MgHttpHandler${MG_VERSION_SUFFIX}
-    MgWebSupport${MG_VERSION_SUFFIX})
\ No newline at end of file
+    MgWebSupport${MG_VERSION_SUFFIX})
+
+install(TARGETS mgdevhttpserver DESTINATION ${MG_INSTALL_WEB_PREFIX}/bin COMPONENT ${MG_COMPONENT})
+install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/mgdevhttpserver.sh DESTINATION ${MG_INSTALL_WEB_PREFIX}/bin COMPONENT ${MG_COMPONENT})
+
+# When installed into $PREFIX/server/bin, it will auto find libraries under $PREFIX/lib and $PREFIX/server/lib
+if(MG_CPU EQUAL 64)
+    set_target_properties(mgdevhttpserver PROPERTIES INSTALL_RPATH "$ORIGIN/../lib64:$ORIGIN/../../lib64")
+else(MG_CPU EQUAL 64)
+    set_target_properties(mgdevhttpserver PROPERTIES INSTALL_RPATH "$ORIGIN/../lib:$ORIGIN/../../lib")
+endif(MG_CPU EQUAL 64)
\ No newline at end of file

Added: trunk/MgDev/Web/src/DevHttpServer/mgdevhttpserver.sh
===================================================================
--- trunk/MgDev/Web/src/DevHttpServer/mgdevhttpserver.sh	                        (rev 0)
+++ trunk/MgDev/Web/src/DevHttpServer/mgdevhttpserver.sh	2020-09-17 09:51:07 UTC (rev 9731)
@@ -0,0 +1,5 @@
+#!/bin/sh
+MG_WWW=$(realpath ../www)
+MG_WEBCONFIG=$(realpath ../www/webconfig.ini)
+MG_MDP=$(realpath ../www)
+./mgdevhttpserver -r "${MG_WWW}" -w "${MG_WEBCONFIG}" -m "${MG_MDP}"
\ No newline at end of file