diff --git a/.gitignore b/.gitignore index 756c0ef..eeebd7e 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,7 @@ packer_*.log /src/IMake/*.opendb /src/Bindings/Bindings.sdf /src/Bindings/.vs -/src/Bindings/DotNet/MapGuideDotNetApi/Constants.cs +/src/Managed/DotNet/MapGuideDotNetApi/Constants.cs /src/IMake/IMake.sdf /src/MapGuide/MgDev /src/Bindings/DotNet/MapGuideApi.i @@ -49,7 +49,7 @@ packer_*.log /src/Bindings/DotNet/MgApi_wrap.cpp /src/Bindings/DotNet/*.user /src/Bindings/*.opendb -/src/Bindings/DotNet/MapGuideDotNetApi/*.cs +/src/Managed/DotNet/MapGuideDotNetApi/*.cs /src/Bindings/MapGuideApi /src/Bindings/ipch /src/Bindings/Php/MapGuideApi.i @@ -58,36 +58,32 @@ packer_*.log /src/Bindings/Php/MgApi_wrap.cpp /src/Bindings/Php/MapGuideApi.php /src/Bindings/Php/php_MapGuideApi.h -/src/Bindings/Java/org/osgeo/mapguide/*.Java -/src/Bindings/Java/org/osgeo/mapguide/*.class +/src/Managed/Java/org/osgeo/mapguide/*.Java +/src/Managed/Java/org/osgeo/mapguide/*.class /src/Bindings/Java/MgApi_wrap.cpp /src/Bindings/Java/MapGuideApi.i /src/Bindings/Java/MapGuideApi_Doc.i /src/Bindings/Java/language.i -!/src/Bindings/Java/org/osgeo/mapguide/AppThrowable.java -!/src/Bindings/Java/org/osgeo/mapguide/MgBase64.java -!/src/Bindings/Java/org/osgeo/mapguide/MgLocalizer.java -!/src/Bindings/Java/org/osgeo/mapguide/ObjectFactory.java +!/src/Managed/Java/org/osgeo/mapguide/AppThrowable.java +!/src/Managed/Java/org/osgeo/mapguide/MgBase64.java +!/src/Managed/Java/org/osgeo/mapguide/MgLocalizer.java +!/src/Managed/Java/org/osgeo/mapguide/ObjectFactory.java /src/IMake/.vs /src/lib /src/IMake/Release /src/Bindings/DotNet/lib /src/Bindings/DotNet/MapGuideApi_Properties.i -/src/Test/Dnx/src/TestRunner/*.bin -/src/Bindings/DotNet/MapGuideDotNetApi/runtimes/win-x64/native/*.dll -/src/Bindings/DotNet/MapGuideDotNetApi/runtimes/win-x86/native/*.dll +/src/Test/DotNet/src/TestRunner/*.bin +/src/Managed/DotNet/MapGuideDotNetApi/runtimes/win-x64/native/*.dll +/src/Managed/DotNet/MapGuideDotNetApi/runtimes/win-x86/native/*.dll *.suo *.user -/src/Test/Dnx/src/TestRunner/UnitTests.log +/src/Test/DotNet/src/TestRunner/UnitTests.log /src/TestData/DrawingService/DrawingServiceTest.db /src/TestData/FeatureService/FeatureServiceTest.db /src/TestData/ResourceService/ResourceServiceTest.db -/src/Test/Dnx/src/TestCommon/project.lock.json -/src/Test/Dnx/src/TestMapGuide/project.lock.json -/src/Test/Dnx/src/TestMapGuideApi/project.lock.json -/src/Test/Dnx/src/TestRunner/project.lock.json -/src/Test/Dnx/src/TestRunner/metadata.txt -/src/Test/Dnx/src/TestRunner/metadata2.txt +/src/Test/DotNet/src/TestRunner/metadata.txt +/src/Test/DotNet/src/TestRunner/metadata2.txt /src/TestData/MapLayer/MapLayerTest.db /src/TestData/MappingService/MappingServiceTest.db /src/TestData/ServerAdmin/ServerAdminTest.db @@ -105,16 +101,6 @@ packer_*.log /src/Bindings/artifacts /sdk/* !/sdk/README.md -/src/FileReplace/.vs -/src/FileReplace/Release -/src/FileReplace/Debug -/src/FileReplace/x64 -/src/FileReplace/x86 -/src/FileReplace/*.opendb -/src/FileReplace/*.sdf -/src/FileReplace/bin/*.iobj -/src/FileReplace/bin/*.ipdb -/src/FileReplace/bin/*.pdb /src/Tools/StampVer/bin /src/Tools/artifacts constants.php diff --git a/CMakeLists.txt b/CMakeLists.txt index 828336e..b76bd81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,11 +72,14 @@ if(WIN32) endif(MSVC) endif(WIN32) +set(MG_DOTNET_PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/Managed/DotNet/MapGuideDotNetApi") +set(MG_DOTNET_OUTPUT_DIR "${MG_DOTNET_PROJECT_DIR}/runtimes/win-${MG_ARCH}/native") if (CMAKE_SYSTEM_NAME MATCHES Linux) add_definitions(-DLINUX -DLINUX_IA32 -pthread -Wno-write-strings) message(STATUS "Distro is: ${MG_DISTRO}") if (WITH_DOTNET) message(STATUS "Using .net RID of: ${MG_DOTNET_RID}") + set(MG_DOTNET_OUTPUT_DIR "${MG_DOTNET_PROJECT_DIR}/runtimes/${MG_DOTNET_RID}/native") endif (WITH_DOTNET) # CMake by default will strip RPATH when we "install" our libraries # We *don't* want this in this case as we want to retain the path to the diff --git a/build.cmd b/build.cmd index 5a82729..446dac9 100644 --- a/build.cmd +++ b/build.cmd @@ -13,7 +13,7 @@ if errorlevel 1 goto error msbuild /m /p:Configuration=%MG_CONFIG%;Platform=x64 Bindings.sln if errorlevel 1 goto error popd -pushd src\Bindings\DotNet\MapGuideDotNetApi +pushd src\Managed\DotNet\MapGuideDotNetApi call dotnet restore if errorlevel 1 goto error call dotnet pack --configuration Release --output "%PACKAGE_DIR%" diff --git a/cmake_build.cmd b/cmake_build.cmd index e9e5916..e3f67a5 100644 --- a/cmake_build.cmd +++ b/cmake_build.cmd @@ -46,7 +46,7 @@ cmake --build . --config Release if %errorlevel% neq 0 goto error popd if "%WITH_DOTNET%" == "1" ( - pushd src\Bindings\DotNet\MapGuideDotNetApi + pushd src\Managed\DotNet\MapGuideDotNetApi call dotnet restore if %errorlevel% neq 0 goto error call dotnet pack --configuration Release --output "%PACKAGE_DIR%" diff --git a/cmake_build.sh b/cmake_build.sh index 337b878..3c8b923 100755 --- a/cmake_build.sh +++ b/cmake_build.sh @@ -120,13 +120,13 @@ if test $USE_JAVA -eq 1; then fi fi if test $USE_DOTNET -eq 1; then - if [ -f $THIS_DIR/src/Bindings/DotNet/MapGuideDotNetApi/runtimes/${DOTNET_RID}/native/libMapGuideDotNetUnmanagedApi.so ]; then + if [ -f $THIS_DIR/src/Managed/DotNet/MapGuideDotNetApi/runtimes/${DOTNET_RID}/native/libMapGuideDotNetUnmanagedApi.so ]; then echo "Stripping .net glue library" - strip -s $THIS_DIR/src/Bindings/DotNet/MapGuideDotNetApi/runtimes/${DOTNET_RID}/native/libMapGuideDotNetUnmanagedApi.so + strip -s $THIS_DIR/src/Managed/DotNet/MapGuideDotNetApi/runtimes/${DOTNET_RID}/native/libMapGuideDotNetUnmanagedApi.so else echo "No .net glue library found to strip" fi - cd $THIS_DIR/src/Bindings/DotNet/MapGuideDotNetApi + cd $THIS_DIR/src/Managed/DotNet/MapGuideDotNetApi dotnet restore if test "$?" -ne 0; then exit 1 diff --git a/envsetupsdk.cmd b/envsetupsdk.cmd index 1c3ebb2..0ce68ff 100644 --- a/envsetupsdk.cmd +++ b/envsetupsdk.cmd @@ -57,7 +57,7 @@ echo Running SwigPrepare if %errorlevel% neq 0 goto error echo Stamping version [%MG_VER_MAJOR%.%MG_VER_MINOR%.%MG_VER_REV%.%MG_VER_BUILD%] -%MG_INTERNAL_TOOL_PATH%\StampVer %MG_VER_MAJOR% %MG_VER_MINOR% %MG_VER_REV% %MG_VER_BUILD% "%CD%\src\Bindings\DotNet\MapGuideDotNetApi\Properties\AssemblyInfo.cs" "%CD%\src\Bindings\DotNet\MapGuideDotNetApi\MapGuideDotNetApi.csproj" +%MG_INTERNAL_TOOL_PATH%\StampVer %MG_VER_MAJOR% %MG_VER_MINOR% %MG_VER_REV% %MG_VER_BUILD% "%CD%\src\Managed\DotNet\MapGuideDotNetApi\Properties\AssemblyInfo.cs" "%CD%\src\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetApi.csproj" if %errorlevel% neq 0 goto error REM echo Regenerating Class Maps @@ -66,8 +66,8 @@ REM call dotnet run "%SRC_BASE%" REM popd echo Preparing native binaries for nuget package -copy /y "sdk\%MG_VERSION%\Bin\*.dll" "src\Bindings\DotNet\MapGuideDotNetApi\runtimes\win-x86\native" -copy /y "sdk\%MG_VERSION%\Bin64\*.dll" "src\Bindings\DotNet\MapGuideDotNetApi\runtimes\win-x64\native" +copy /y "sdk\%MG_VERSION%\Bin\*.dll" "src\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\native" +copy /y "sdk\%MG_VERSION%\Bin64\*.dll" "src\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\native" echo Preparing native binaries for PHP extension if not exist "packages\php\Release\x86" mkdir "packages\php\Release\x86" if not exist "packages\php\Release\x64" mkdir "packages\php\Release\x64" diff --git a/envsetupsdk.sh b/envsetupsdk.sh index d34dbd6..0bc5848 100755 --- a/envsetupsdk.sh +++ b/envsetupsdk.sh @@ -172,7 +172,7 @@ if test "$?" -ne 0; then exit 1 fi echo "Stamping version [$MG_VER_MAJOR.$MG_VER_MINOR.$MG_VER_REV.$MG_VER_BUILD]" -$ROOT/tools/StampVer $MG_VER_MAJOR $MG_VER_MINOR $MG_VER_REV $MG_VER_BUILD "$ROOT/src/Bindings/DotNet/MapGuideDotNetApi/Properties/AssemblyInfo.cs" "$ROOT/src/Bindings/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj" +$ROOT/tools/StampVer $MG_VER_MAJOR $MG_VER_MINOR $MG_VER_REV $MG_VER_BUILD "$ROOT/src/Managed/DotNet/MapGuideDotNetApi/Properties/AssemblyInfo.cs" "$ROOT/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj" if test "$?" -ne 0; then exit 1 fi \ No newline at end of file diff --git a/linux_build/Ubuntu14_x64/provision.sh b/linux_build/Ubuntu14_x64/provision.sh index 6424ad5..e9b531c 100644 --- a/linux_build/Ubuntu14_x64/provision.sh +++ b/linux_build/Ubuntu14_x64/provision.sh @@ -40,4 +40,4 @@ fi echo "Copying java glue library" cp $SRC_AREA/packages/Java/Release/x64/Ubuntu14.04.x86_64/libMapGuideJavaApi.so /mapguide_sources/packages/Java/Release/x64/Ubuntu14.04.x86_64 echo "Copying .net glue library" -cp $SRC_AREA/src/Bindings/DotNet/MapGuideDotNetApi/runtimes/ubuntu.14.04-x64/native/libMapGuideDotNetUnmanagedApi.so /mapguide_sources/src/Bindings/DotNet/MapGuideDotNetApi/runtimes/ubuntu.14.04-x64/native \ No newline at end of file +cp $SRC_AREA/src/Managed/DotNet/MapGuideDotNetApi/runtimes/ubuntu.14.04-x64/native/libMapGuideDotNetUnmanagedApi.so /mapguide_sources/src/Managed/DotNet/MapGuideDotNetApi/runtimes/ubuntu.14.04-x64/native \ No newline at end of file diff --git a/src/Bindings/DotNet/CMakeLists.txt b/src/Bindings/DotNet/CMakeLists.txt index 1dad364..5cf3bf3 100644 --- a/src/Bindings/DotNet/CMakeLists.txt +++ b/src/Bindings/DotNet/CMakeLists.txt @@ -13,8 +13,6 @@ include_directories( ${XERCESC_INCLUDE_DIR} ) -set(MG_DOTNET_OUTPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/MapGuideDotNetApi/runtimes/win-${MG_ARCH}/native") - set(DotNetUnmanagedApi_SRCS ${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp ) @@ -39,14 +37,14 @@ endif (UNIX) message(STATUS "Using IMake at: ${IMAKE_TOOL}") add_custom_command(OUTPUT ${DotNetUnmanagedApi_SRCS} - COMMAND ${CMAKE_COMMAND} -E echo Removing: ${CMAKE_CURRENT_SOURCE_DIR}/MapGuideDotNetApi/*.cs + COMMAND ${CMAKE_COMMAND} -E echo Removing: ${MG_DOTNET_PROJECT_DIR}/*.cs COMMAND ${CMAKE_COMMAND} -E remove -f - ${CMAKE_CURRENT_SOURCE_DIR}/MapGuideDotNetApi/*.cs - COMMAND ${CMAKE_COMMAND} -E echo Regenerating: ${CMAKE_CURRENT_SOURCE_DIR}/MapGuideDotNetApi/Constants.cs + ${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 ${CMAKE_CURRENT_SOURCE_DIR}/MapGuideDotNetApi/Constants.cs + -o ${MG_DOTNET_PROJECT_DIR}/Constants.cs -t COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/dotnetcore.i @@ -55,7 +53,7 @@ add_custom_command(OUTPUT ${DotNetUnmanagedApi_SRCS} -l "C#" ${IMAKE_RELATIVE_RESOLUTION} -o ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E echo Running SWIG [DotNet]. Output Dir: ${CMAKE_CURRENT_SOURCE_DIR}/MapGuideDotNetApi + COMMAND ${CMAKE_COMMAND} -E echo Running SWIG [DotNet]. Output Dir: ${MG_DOTNET_PROJECT_DIR} COMMAND ${SWIG_TOOL} -c++ -csharp -DDOTNETCORE -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER @@ -63,10 +61,10 @@ add_custom_command(OUTPUT ${DotNetUnmanagedApi_SRCS} -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "${CMAKE_CURRENT_BINARY_DIR}/MgApi_wrap.cpp" - -outdir "${CMAKE_CURRENT_SOURCE_DIR}/MapGuideDotNetApi" + -outdir "${MG_DOTNET_PROJECT_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/MapGuideApi.i" COMMAND ${CMAKE_COMMAND} -E remove -f - ${CMAKE_CURRENT_SOURCE_DIR}/MapGuideDotNetApi/MapGuideDotNetUnmanagedApi.cs + ${MG_DOTNET_PROJECT_DIR}/MapGuideDotNetUnmanagedApi.cs ) target_link_libraries(MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} @@ -94,8 +92,7 @@ target_link_libraries(MapGuideDotNetUnmanagedApi${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_BINDING_SRC_DIR}/src/Bindings/DotNet/MapGuideDotNetApi/runtimes/${MG_DOTNET_RID}/native" ) + install( TARGETS MapGuideDotNetUnmanagedApi${MG_VERSION_SUFFIX} DESTINATION ${MG_DOTNET_OUTPUT_DIR}) endif (UNIX) -file(COPY "dotnetcore.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -file(COPY "MapGuideDotNetApi" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) \ No newline at end of file +file(COPY "dotnetcore.i" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) \ No newline at end of file diff --git a/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj b/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj index 2d3e971..d43e199 100644 --- a/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj +++ b/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj @@ -122,14 +122,14 @@ obj\$(Configuration)64\DotNetUnmanagedApi\ true true - MapGuideDotNetApi\runtimes\win-x86\ - MapGuideDotNetApi\runtimes\win-x86\ + ..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\ + ..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\ obj\$(Configuration)\DotNetUnmanagedApi\ obj\$(Configuration)\DotNetUnmanagedApi\ false false - MapGuideDotNetApi\runtimes\win-x64\ - MapGuideDotNetApi\runtimes\win-x64\ + ..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\ + ..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\ obj\$(Configuration)64\DotNetUnmanagedApi\ obj\$(Configuration)64\DotNetUnmanagedApi\ false @@ -169,13 +169,13 @@ - del /Q "$(ProjectDir)MapGuideDotNetApi\*.cs" + del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs" if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i" -"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)MapGuideDotNetApi\Constants.cs" -t +"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t copy "$(ProjectDir)dotnetcore.i" "$(ProjectDir)language.i" "..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C# -$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)MapGuideDotNetApi" MapGuideApi.i -del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs +$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i +del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs @@ -192,7 +192,7 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs ACEd.lib;%(AdditionalDependencies) - $(ProjectDir)MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApid.dll + $(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApid.dll $(MG_SDK_LIB);$(MG_OEM_ACE_LIB_ROOT)\lib\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)MapGuideDotNetUnmanagedApid.pdb @@ -206,13 +206,13 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs - del /Q "$(ProjectDir)MapGuideDotNetApi\*.cs" + del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs" if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i" -"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)MapGuideDotNetApi\Constants.cs" -t +"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t copy "$(ProjectDir)dotnetcore.i" "$(ProjectDir)language.i" "..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C# -$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)MapGuideDotNetApi" MapGuideApi.i -del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs +$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i +del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs @@ -229,7 +229,7 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs ACEd.lib;%(AdditionalDependencies) - $(ProjectDir)MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApid.dll + $(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApid.dll $(MG_SDK_LIB);$(MG_OEM_ACE_LIB_ROOT)\lib\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)MapGuideDotNetUnmanagedApid.pdb @@ -243,13 +243,13 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs - del /Q "$(ProjectDir)MapGuideDotNetApi\*.cs" + del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs" if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i" -"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)MapGuideDotNetApi\Constants.cs" -t +"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t copy "$(ProjectDir)dotnetcore.i" "$(ProjectDir)language.i" "..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C# -$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)MapGuideDotNetApi" MapGuideApi.i -del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs +$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i +del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs @@ -266,7 +266,7 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs ACEd.lib;%(AdditionalDependencies) - $(ProjectDir)MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApid.dll + $(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApid.dll $(MG_SDK_LIB64);$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)MapGuideDotNetUnmanagedApid.pdb @@ -280,13 +280,13 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs - del /Q "$(ProjectDir)MapGuideDotNetApi\*.cs" + del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs" if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i" -"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)MapGuideDotNetApi\Constants.cs" -t +"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t copy "$(ProjectDir)dotnetcore.i" "$(ProjectDir)language.i" "..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C# -$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)MapGuideDotNetApi" MapGuideApi.i -del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs +$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i +del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs @@ -303,7 +303,7 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs ACEd.lib;%(AdditionalDependencies) - $(ProjectDir)MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApid.dll + $(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApid.dll $(MG_SDK_LIB64);$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)MapGuideDotNetUnmanagedApid.pdb @@ -317,13 +317,13 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs - del /Q "$(ProjectDir)MapGuideDotNetApi\*.cs" + del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs" if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i" -"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)MapGuideDotNetApi\Constants.cs" -t +"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t copy "$(ProjectDir)dotnetcore.i" "$(ProjectDir)language.i" "..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C# -$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)MapGuideDotNetApi" MapGuideApi.i -del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs +$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i +del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs @@ -339,7 +339,7 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs ACE.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies) - $(ProjectDir)MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApi.dll + $(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApi.dll $(MG_SDK_LIB);$(MG_SOURCE_ROOT)\Common\lib\Release;$(MG_SOURCE_ROOT)\Web\lib\Release;$(MG_OEM_ACE_LIB_ROOT)\lib\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)MapGuideDotNetUnmanagedApi.pdb @@ -355,13 +355,13 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs - del /Q "$(ProjectDir)MapGuideDotNetApi\*.cs" + del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs" if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i" -"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)MapGuideDotNetApi\Constants.cs" -t +"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t copy "$(ProjectDir)dotnetcore.i" "$(ProjectDir)language.i" "..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C# -$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)MapGuideDotNetApi" MapGuideApi.i -del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs +$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i +del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs @@ -377,7 +377,7 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs ACE.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies) - $(ProjectDir)MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApi.dll + $(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApi.dll $(MG_SDK_LIB);$(MG_SOURCE_ROOT)\Common\lib\Release;$(MG_SOURCE_ROOT)\Web\lib\Release;$(MG_OEM_ACE_LIB_ROOT)\lib\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)\..\..\..\bin\MapGuideDotNetUnmanagedApi.pdb @@ -393,13 +393,13 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs - del /Q "$(ProjectDir)MapGuideDotNetApi\*.cs" + del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs" if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i" -"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)MapGuideDotNetApi\Constants.cs" -t +"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t copy "$(ProjectDir)dotnetcore.i" "$(ProjectDir)language.i" "..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C# -$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)MapGuideDotNetApi" MapGuideApi.i -del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs +$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i +del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs @@ -415,7 +415,7 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs ACE.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies) - $(ProjectDir)MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApi.dll + $(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApi.dll $(MG_SDK_LIB64);$(MG_SOURCE_ROOT)\Common\lib\Release64;$(MG_SOURCE_ROOT)\Web\lib\Release64;$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)MapGuideDotNetUnmanagedApi.pdb @@ -431,13 +431,13 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs - del /Q "$(ProjectDir)MapGuideDotNetApi\*.cs" + del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs" if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i" -"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)MapGuideDotNetApi\Constants.cs" -t +"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l C# -o "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\Constants.cs" -t copy "$(ProjectDir)dotnetcore.i" "$(ProjectDir)language.i" "..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l C# -$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)MapGuideDotNetApi" MapGuideApi.i -del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs +$(SWIG_TOOL_PATH)\swig -c++ -csharp -DDOTNETCORE -DWIN32 -DSWIG_CSHARP_NO_EXCEPTION_HELPER -DSWIG_CSHARP_NO_STRING_HELPER -DSWIG_CSHARP_NO_WSTRING_HELPER -namespace OSGeo.MapGuide -nodefaultctor -nodefaultdtor -module MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i +del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs @@ -453,7 +453,7 @@ del /Q MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs ACE.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies) - $(ProjectDir)MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApi.dll + $(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApi.dll $(MG_SDK_LIB64);$(MG_SOURCE_ROOT)\Common\lib\Release64;$(MG_SOURCE_ROOT)\Web\lib\Release64;$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)\..\..\..\bin\MapGuideDotNetUnmanagedApi.pdb diff --git a/src/Bindings/Java/CMakeLists.txt b/src/Bindings/Java/CMakeLists.txt index 45476ea..108f8a0 100644 --- a/src/Bindings/Java/CMakeLists.txt +++ b/src/Bindings/Java/CMakeLists.txt @@ -58,13 +58,6 @@ add_custom_command(OUTPUT ${MapGuideJavaApi_SRCS} COMMAND ${MOVE_COMMAND} ${MOVE_ARGS} *.java ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide - COMMAND ${Java_JAVAC_EXECUTABLE} -classpath ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/org/osgeo/mapguide/*.java - COMMAND ${Java_JAR_EXECUTABLE} -cf - ${MG_JAVA_OUTPUT_DIR}/MapGuideApi.jar - org/osgeo/mapguide/*.class - COMMAND ${Java_JAR_EXECUTABLE} -cf - ${MG_JAVA_OUTPUT_DIR}/MapGuideApi-sources.jar - org/osgeo/mapguide/*.java ) add_library(MapGuideJavaApi${MG_VERSION_SUFFIX} SHARED ${MapGuideJavaApi_SRCS})