[mapguide-commits] r9450 - in sandbox/jng/deprecate_dwf: . Server/src/Services/Resource

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-01-11 08:05:46 -0800 (Fri, 11 Jan 2019)
New Revision: 9450

Modified:
   sandbox/jng/deprecate_dwf/CMakeLists.txt
   sandbox/jng/deprecate_dwf/Server/src/Services/Resource/CMakeLists.txt
   sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileWriter.cpp
Log:
Fix up Linux build

Modified: sandbox/jng/deprecate_dwf/CMakeLists.txt
===================================================================
--- sandbox/jng/deprecate_dwf/CMakeLists.txt	2019-01-09 22:25:21 UTC (rev 9449)
+++ sandbox/jng/deprecate_dwf/CMakeLists.txt	2019-01-11 16:05:46 UTC (rev 9450)
@@ -83,6 +83,7 @@
 set(MG_OEM_AGG_SOURCE_DIR "${MG_OEM_AGG_DIR}/src")
 set(MG_OEM_HTTPD_SOURCE_DIR, "${MG_OEM_ROOT_DIR}/LinuxApt/httpd-2.4.18")
 
+set(MG_OEM_MINIZIP_INCLUDE_DIR "${MG_OEM_ROOT_DIR}/gd/zlib/contrib/minizip")
 set(MG_OEM_DWF_INCLUDE_DIR "${MG_OEM_ROOT_DIR}/DWFTK/develop/global/src")
 set(MG_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Common")
 set(MG_SERVER_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Server/src/Common")

Modified: sandbox/jng/deprecate_dwf/Server/src/Services/Resource/CMakeLists.txt
===================================================================
--- sandbox/jng/deprecate_dwf/Server/src/Services/Resource/CMakeLists.txt	2019-01-09 22:25:21 UTC (rev 9449)
+++ sandbox/jng/deprecate_dwf/Server/src/Services/Resource/CMakeLists.txt	2019-01-11 16:05:46 UTC (rev 9450)
@@ -2,8 +2,9 @@
     ${FDO_INCLUDE_DIR}/ExpressionEngine
     ${ACE_INCLUDE_DIR}
     ${XERCESC_INCLUDE_DIR}
-    ${MG_OEM_DWF_INCLUDE_DIR}
     ${DBXML_INCLUDE_DIR}
+    ${MG_OEM_MINIZIP_INCLUDE_DIR}
+    ${ZLIB_INCLUDE_DIR}
     ${MG_COMMON_DIR}/Security
     ${MG_COMMON_DIR}/Foundation
     ${MG_COMMON_DIR}/Geometry
@@ -36,6 +37,8 @@
     ${DBXML_LIBRARY}
     ${XQILLA_LIBRARY}
     ${XERCESC_LIBRARIES}
+    ${ZLIB_LIBRARY}
+    minizip
 )
 install(TARGETS MgServerResourceService${MG_VERSION_SUFFIX} DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT})
 install_symlink(${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libMgServerResourceService${MG_VERSION_SUFFIX}.so libMgServerResourceService.so ${MG_COMPONENT})
\ No newline at end of file

Modified: sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileWriter.cpp
===================================================================
--- sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileWriter.cpp	2019-01-09 22:25:21 UTC (rev 9449)
+++ sandbox/jng/deprecate_dwf/Server/src/Services/Resource/ZipFileWriter.cpp	2019-01-11 16:05:46 UTC (rev 9450)
@@ -50,14 +50,14 @@
 
     if (strcmp(f, "-") != 0)
     {
-        char name[MAXFILENAME + 1];
+        char name[PATH_MAX + 1];
         int len = strlen(f);
-        if (len > MAXFILENAME)
-            len = MAXFILENAME;
+        if (len > PATH_MAX)
+            len = PATH_MAX;
 
-        strncpy(name, f, MAXFILENAME - 1);
+        strncpy(name, f, PATH_MAX - 1);
         /* strncpy doesnt append the trailing NULL, of the string is too long. */
-        name[MAXFILENAME] = '\0';
+        name[PATH_MAX] = '\0';
 
         if (name[len - 1] == '/')
             name[len - 1] = '\0';