[mapguide-commits] r9804 - in sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet: . Geometry MapGuideCommon PlatformBase

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Nov 26 07:26:22 PST 2020


Author: jng
Date: 2020-11-26 07:26:21 -0800 (Thu, 26 Nov 2020)
New Revision: 9804

Modified:
   sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/CMakeLists.txt
   sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/CMakeLists.txt
   sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/CMakeLists.txt
   sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/CMakeLists.txt
Log:
Get Geometry/PlatformBase/MapGuideCommon .net glue libraries building on the Linux side

Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/CMakeLists.txt	2020-11-26 15:14:38 UTC (rev 9803)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/CMakeLists.txt	2020-11-26 15:26:21 UTC (rev 9804)
@@ -19,93 +19,4 @@
 add_subdirectory(MapGuideCommon)
 add_subdirectory(Web)
 
-#set(DotNetUnmanagedApi_SRCS
-#    ${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp
-#)
-#
-#add_library(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} SHARED ${DotNetUnmanagedApi_SRCS})
-#add_dependencies(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} IMake)
-#if (UNIX)
-#    add_definitions(-DDOTNETCORE)
-#endif (UNIX)
-#if (MSVC)
-#    add_definitions(-DSWIG_PUBLIC_API)
-#    add_definitions(/bigobj)
-#    set_target_properties(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${MG_DOTNET_OUTPUT_DIR} )
-#    set_target_properties(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${MG_DOTNET_OUTPUT_DIR} )
-#    set_target_properties(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${MG_DOTNET_OUTPUT_DIR} )
-#endif (MSVC)
-#
-#set(IMAKE_RELATIVE_RESOLUTION "-r ${CMAKE_CURRENT_SOURCE_DIR}")
-#if (UNIX)
-#    set(IMAKE_RELATIVE_RESOLUTION "-a")
-#endif (UNIX)
-#
-#set(SWIG_DOTNET_DEFS "")
-#if (WIN32)
-#    set(SWIG_DOTNET_DEFS "-DWIN32")
-#endif (WIN32)
-#
-#message(STATUS "Using IMake at: ${IMAKE_TOOL}")
-#add_custom_command(OUTPUT ${DotNetUnmanagedApi_SRCS}
-#    COMMAND ${CMAKE_COMMAND} -E echo Removing: ${MG_DOTNET_PROJECT_DIR}/*.cs
-#    COMMAND ${CMAKE_COMMAND} -E remove -f 
-#            ${MG_DOTNET_PROJECT_DIR}/*.cs
-#    COMMAND ${CMAKE_COMMAND} -E echo Regenerating: ${MG_DOTNET_PROJECT_DIR}/Constants.cs
-#    COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_BINARY_DIR}/../MapGuideApi/Constants.xml 
-#            -l "C#"
-#            ${IMAKE_RELATIVE_RESOLUTION}
-#            -o ${MG_DOTNET_PROJECT_DIR}/Constants.cs
-#            -t
-#    COMMAND ${CMAKE_COMMAND} -E copy
-#            ${CMAKE_CURRENT_BINARY_DIR}/dotnetcore.i
-#            ${CMAKE_CURRENT_BINARY_DIR}/language.i
-#    COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_BINARY_DIR}/../MapGuideApi/MapGuideApiGen.xml
-#            -l "C#"
-#            ${IMAKE_RELATIVE_RESOLUTION}
-#            -o ${CMAKE_CURRENT_BINARY_DIR}
-#    COMMAND ${CMAKE_COMMAND} -E echo Running SWIG [DotNet]. Output Dir: ${MG_DOTNET_PROJECT_DIR}
-#    COMMAND ${SWIG_TOOL} -c++ -csharp 
-#            ${SWIG_DOTNET_DEFS} -DDOTNETCORE -DSWIG_CSHARP_NO_EXCEPTION_HELPER
-#            -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER
-#            -namespace OSGeo.MapGuide
-#            -nodefaultctor -nodefaultdtor
-#            -module MapGuideDotNetUnmanagedApi
-#            -o "${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp"
-#            -outdir "${MG_DOTNET_PROJECT_DIR}" 
-#            "${CMAKE_CURRENT_BINARY_DIR}/MapGuideApi.i"
-#    COMMAND ${CMAKE_COMMAND} -E remove -f 
-#            ${MG_DOTNET_PROJECT_DIR}/MapGuideDotNetUnmanagedApi.cs
-#)
-#
-#target_link_libraries(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX}
-#    ${ACE_LIBRARY}
-#    ${MG_FOUNDATION_LIBRARY}
-#    ${MG_GEOMETRY_LIBRARY}
-#    ${MG_PLATFORMBASE_LIBRARY}
-#    ${MG_COMMON_LIBRARY}
-#    ${MG_HTTPHANDLER_LIBRARY}
-#    ${MG_WEBAPP_LIBRARY}
-#    ${MG_MDFMODEL_LIBRARY}
-#    ${MG_MDFPARSER_LIBRARY}
-#    ${MG_WEBSUPPORT_LIBRARY}
-#    #MgFoundation${MG_VERSION_SUFFIX}
-#    #MgGeometry${MG_VERSION_SUFFIX}
-#    #MgPlatformBase${MG_VERSION_SUFFIX}
-#    #MgMapGuideCommon${MG_VERSION_SUFFIX}
-#    #MgHttpHandler${MG_VERSION_SUFFIX}
-#    #MgMdfModel${MG_VERSION_SUFFIX}
-#    #MgMdfParser${MG_VERSION_SUFFIX}
-#    ${XERCESC_LIBRARIES}
-#    #MgWebApp${MG_VERSION_SUFFIX}
-#)
-#
-## Only needed for Linux
-#if (UNIX)
-#    file(COPY "InitializeWebTier.cpp" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-#    install( TARGETS MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} DESTINATION ${MG_DOTNET_OUTPUT_DIR})
-#endif (UNIX)
-#
-#file(COPY "dotnetcore.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
 file(COPY "dotnetcore_split.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file

Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/CMakeLists.txt	2020-11-26 15:14:38 UTC (rev 9803)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/CMakeLists.txt	2020-11-26 15:26:21 UTC (rev 9804)
@@ -0,0 +1,70 @@
+project(GeometryUnmanagedApi)
+
+set(GeometryUnmanagedApi_SRCS
+    ${CMAKE_CURRENT_BINARY_DIR}/GeometryUnmanagedApi_wrap.cpp
+)
+
+add_library(GeometryUnmanagedApi SHARED ${GeometryUnmanagedApi_SRCS})
+add_dependencies(GeometryUnmanagedApi IMake)
+if (UNIX)
+    add_definitions(-DDOTNETCORE)
+    # NOTE: We don't care where this source is generated because the C# source is only built on windows
+    set(MG_DOTNET_PROJECT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(GeometryUnmanagedApi PROPERTIES INSTALL_RPATH "$ORIGIN")
+endif (UNIX)
+if (MSVC)
+    add_definitions(-DSWIG_PUBLIC_API)
+    add_definitions(/bigobj)
+    set_target_properties(GeometryUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${MG_DOTNET_OUTPUT_DIR} )
+    set_target_properties(GeometryUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${MG_DOTNET_OUTPUT_DIR} )
+    set_target_properties(GeometryUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${MG_DOTNET_OUTPUT_DIR} )
+endif (MSVC)
+
+set(IMAKE_RELATIVE_RESOLUTION "-r ${CMAKE_CURRENT_SOURCE_DIR}")
+if (UNIX)
+    set(IMAKE_RELATIVE_RESOLUTION "-a")
+endif (UNIX)
+
+set(SWIG_DOTNET_DEFS "")
+if (WIN32)
+    set(SWIG_DOTNET_DEFS "-DWIN32")
+endif (WIN32)
+
+message(STATUS "Using IMake at: ${IMAKE_TOOL}")
+add_custom_command(OUTPUT ${GeometryUnmanagedApi_SRCS}
+    COMMAND ${CMAKE_COMMAND} -E echo Removing: ${MG_DOTNET_PROJECT_DIR}/*.cs
+    COMMAND ${CMAKE_COMMAND} -E remove -f 
+            ${MG_DOTNET_PROJECT_DIR}/*.cs
+    COMMAND ${CMAKE_COMMAND} -E echo Regenerating: ${MG_DOTNET_PROJECT_DIR}/Constants.cs
+    COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_SOURCE_DIR}/GeometryConstants.xml 
+            -l "C#"
+            ${IMAKE_RELATIVE_RESOLUTION}
+            -o ${MG_DOTNET_PROJECT_DIR}/Constants.cs
+            -t
+    COMMAND ${CMAKE_COMMAND} -E copy
+            ${CMAKE_CURRENT_BINARY_DIR}/../dotnetcore_split.i
+            ${CMAKE_CURRENT_BINARY_DIR}/language.i
+    COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_SOURCE_DIR}/GeometryApiGen.xml
+            -l "C#"
+            -x "GeometryApi"
+            ${IMAKE_RELATIVE_RESOLUTION}
+            -o ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${CMAKE_COMMAND} -E echo Running SWIG [DotNet]. Output Dir: ${MG_DOTNET_PROJECT_DIR}
+    COMMAND ${SWIG_EXECUTABLE} -c++ -csharp 
+            ${SWIG_DOTNET_DEFS} -DDOTNETCORE -DSWIG_CSHARP_NO_EXCEPTION_HELPER
+            -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER
+            -namespace OSGeo.MapGuide
+            -nodefaultctor -nodefaultdtor
+            -module GeometryUnmanagedApi
+            -o "${CMAKE_CURRENT_BINARY_DIR}/GeometryUnmanagedApi_wrap.cpp"
+            -outdir "${MG_DOTNET_PROJECT_DIR}" 
+            "${CMAKE_CURRENT_BINARY_DIR}/GeometryApi.i"
+)
+
+target_link_libraries(GeometryUnmanagedApi
+    ${ACE_LIBRARY}
+    MgGeometry${MG_VERSION_SUFFIX}
+    ${XERCESC_LIBRARIES}
+)
+
+install( TARGETS GeometryUnmanagedApi DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
\ No newline at end of file

Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/CMakeLists.txt	2020-11-26 15:14:38 UTC (rev 9803)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/CMakeLists.txt	2020-11-26 15:26:21 UTC (rev 9804)
@@ -0,0 +1,70 @@
+project(MapGuideCommonUnmanagedApi)
+
+set(MapGuideCommonUnmanagedApi_SRCS
+    ${CMAKE_CURRENT_BINARY_DIR}/MapGuideCommonUnmanagedApi_wrap.cpp
+)
+
+add_library(MapGuideCommonUnmanagedApi SHARED ${MapGuideCommonUnmanagedApi_SRCS})
+add_dependencies(MapGuideCommonUnmanagedApi IMake)
+if (UNIX)
+    add_definitions(-DDOTNETCORE)
+    # NOTE: We don't care where this source is generated because the C# source is only built on windows
+    set(MG_DOTNET_PROJECT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(MapGuideCommonUnmanagedApi PROPERTIES INSTALL_RPATH "$ORIGIN")
+endif (UNIX)
+if (MSVC)
+    add_definitions(-DSWIG_PUBLIC_API)
+    add_definitions(/bigobj)
+    set_target_properties(MapGuideCommonUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${MG_DOTNET_OUTPUT_DIR} )
+    set_target_properties(MapGuideCommonUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${MG_DOTNET_OUTPUT_DIR} )
+    set_target_properties(MapGuideCommonUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${MG_DOTNET_OUTPUT_DIR} )
+endif (MSVC)
+
+set(IMAKE_RELATIVE_RESOLUTION "-r ${CMAKE_CURRENT_SOURCE_DIR}")
+if (UNIX)
+    set(IMAKE_RELATIVE_RESOLUTION "-a")
+endif (UNIX)
+
+set(SWIG_DOTNET_DEFS "")
+if (WIN32)
+    set(SWIG_DOTNET_DEFS "-DWIN32")
+endif (WIN32)
+
+message(STATUS "Using IMake at: ${IMAKE_TOOL}")
+add_custom_command(OUTPUT ${MapGuideCommonUnmanagedApi_SRCS}
+    COMMAND ${CMAKE_COMMAND} -E echo Removing: ${MG_DOTNET_PROJECT_DIR}/*.cs
+    COMMAND ${CMAKE_COMMAND} -E remove -f 
+            ${MG_DOTNET_PROJECT_DIR}/*.cs
+    COMMAND ${CMAKE_COMMAND} -E echo Regenerating: ${MG_DOTNET_PROJECT_DIR}/Constants.cs
+    COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_SOURCE_DIR}/MapGuideCommonConstants.xml 
+            -l "C#"
+            ${IMAKE_RELATIVE_RESOLUTION}
+            -o ${MG_DOTNET_PROJECT_DIR}/Constants.cs
+            -t
+    COMMAND ${CMAKE_COMMAND} -E copy
+            ${CMAKE_CURRENT_BINARY_DIR}/../dotnetcore_split.i
+            ${CMAKE_CURRENT_BINARY_DIR}/language.i
+    COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_SOURCE_DIR}/MapGuideCommonApiGen.xml
+            -l "C#"
+            -x "MapGuideCommonApi"
+            ${IMAKE_RELATIVE_RESOLUTION}
+            -o ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${CMAKE_COMMAND} -E echo Running SWIG [DotNet]. Output Dir: ${MG_DOTNET_PROJECT_DIR}
+    COMMAND ${SWIG_EXECUTABLE} -c++ -csharp 
+            ${SWIG_DOTNET_DEFS} -DDOTNETCORE -DSWIG_CSHARP_NO_EXCEPTION_HELPER
+            -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER
+            -namespace OSGeo.MapGuide
+            -nodefaultctor -nodefaultdtor
+            -module MapGuideCommonUnmanagedApi
+            -o "${CMAKE_CURRENT_BINARY_DIR}/MapGuideCommonUnmanagedApi_wrap.cpp"
+            -outdir "${MG_DOTNET_PROJECT_DIR}" 
+            "${CMAKE_CURRENT_BINARY_DIR}/MapGuideCommonApi.i"
+)
+
+target_link_libraries(MapGuideCommonUnmanagedApi
+    ${ACE_LIBRARY}
+    MgMapGuideCommon${MG_VERSION_SUFFIX}
+    ${XERCESC_LIBRARIES}
+)
+
+install( TARGETS MapGuideCommonUnmanagedApi DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
\ No newline at end of file

Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/CMakeLists.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/CMakeLists.txt	2020-11-26 15:14:38 UTC (rev 9803)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/CMakeLists.txt	2020-11-26 15:26:21 UTC (rev 9804)
@@ -0,0 +1,70 @@
+project(PlatformBaseUnmanagedApi)
+
+set(PlatformBaseUnmanagedApi_SRCS
+    ${CMAKE_CURRENT_BINARY_DIR}/PlatformBaseUnmanagedApi_wrap.cpp
+)
+
+add_library(PlatformBaseUnmanagedApi SHARED ${PlatformBaseUnmanagedApi_SRCS})
+add_dependencies(PlatformBaseUnmanagedApi IMake)
+if (UNIX)
+    add_definitions(-DDOTNETCORE)
+    # NOTE: We don't care where this source is generated because the C# source is only built on windows
+    set(MG_DOTNET_PROJECT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(PlatformBaseUnmanagedApi PROPERTIES INSTALL_RPATH "$ORIGIN")
+endif (UNIX)
+if (MSVC)
+    add_definitions(-DSWIG_PUBLIC_API)
+    add_definitions(/bigobj)
+    set_target_properties(PlatformBaseUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${MG_DOTNET_OUTPUT_DIR} )
+    set_target_properties(PlatformBaseUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${MG_DOTNET_OUTPUT_DIR} )
+    set_target_properties(PlatformBaseUnmanagedApi PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${MG_DOTNET_OUTPUT_DIR} )
+endif (MSVC)
+
+set(IMAKE_RELATIVE_RESOLUTION "-r ${CMAKE_CURRENT_SOURCE_DIR}")
+if (UNIX)
+    set(IMAKE_RELATIVE_RESOLUTION "-a")
+endif (UNIX)
+
+set(SWIG_DOTNET_DEFS "")
+if (WIN32)
+    set(SWIG_DOTNET_DEFS "-DWIN32")
+endif (WIN32)
+
+message(STATUS "Using IMake at: ${IMAKE_TOOL}")
+add_custom_command(OUTPUT ${PlatformBaseUnmanagedApi_SRCS}
+    COMMAND ${CMAKE_COMMAND} -E echo Removing: ${MG_DOTNET_PROJECT_DIR}/*.cs
+    COMMAND ${CMAKE_COMMAND} -E remove -f 
+            ${MG_DOTNET_PROJECT_DIR}/*.cs
+    COMMAND ${CMAKE_COMMAND} -E echo Regenerating: ${MG_DOTNET_PROJECT_DIR}/Constants.cs
+    COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_SOURCE_DIR}/PlatformBaseConstants.xml 
+            -l "C#"
+            ${IMAKE_RELATIVE_RESOLUTION}
+            -o ${MG_DOTNET_PROJECT_DIR}/Constants.cs
+            -t
+    COMMAND ${CMAKE_COMMAND} -E copy
+            ${CMAKE_CURRENT_BINARY_DIR}/../dotnetcore_split.i
+            ${CMAKE_CURRENT_BINARY_DIR}/language.i
+    COMMAND ${IMAKE_TOOL} -p ${CMAKE_CURRENT_SOURCE_DIR}/PlatformBaseApiGen.xml
+            -l "C#"
+            -x "PlatformBaseApi"
+            ${IMAKE_RELATIVE_RESOLUTION}
+            -o ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${CMAKE_COMMAND} -E echo Running SWIG [DotNet]. Output Dir: ${MG_DOTNET_PROJECT_DIR}
+    COMMAND ${SWIG_EXECUTABLE} -c++ -csharp 
+            ${SWIG_DOTNET_DEFS} -DDOTNETCORE -DSWIG_CSHARP_NO_EXCEPTION_HELPER
+            -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER
+            -namespace OSGeo.MapGuide
+            -nodefaultctor -nodefaultdtor
+            -module PlatformBaseUnmanagedApi
+            -o "${CMAKE_CURRENT_BINARY_DIR}/PlatformBaseUnmanagedApi_wrap.cpp"
+            -outdir "${MG_DOTNET_PROJECT_DIR}" 
+            "${CMAKE_CURRENT_BINARY_DIR}/PlatformBaseApi.i"
+)
+
+target_link_libraries(PlatformBaseUnmanagedApi
+    ${ACE_LIBRARY}
+    MgPlatformBase${MG_VERSION_SUFFIX}
+    ${XERCESC_LIBRARIES}
+)
+
+install( TARGETS PlatformBaseUnmanagedApi DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${MG_COMPONENT} )
\ No newline at end of file



More information about the mapguide-commits mailing list