[mapguide-commits] r9768 - in sandbox/jng/vanilla_swig/Bindings/src: Bindings Bindings/DotNet/Foundation Bindings/DotNet/Geometry Bindings/DotNet/MapGuideCommon Bindings/DotNet/PlatformBase Bindings/DotNet/Web Managed/DotNet/MapGuideDotNetApi
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Nov 10 05:20:13 PST 2020
Author: jng
Date: 2020-11-10 05:20:13 -0800 (Tue, 10 Nov 2020)
New Revision: 9768
Modified:
sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj
Log:
Update glue library pre-build events to make sure to copy all direct dll dependencies to their respective nuget native library staging areas
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln 2020-11-10 12:37:34 UTC (rev 9767)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln 2020-11-10 13:20:13 UTC (rev 9768)
@@ -96,6 +96,8 @@
{42FC41FD-742B-4AED-816E-C211F1B07F3F} = {42FC41FD-742B-4AED-816E-C211F1B07F3F}
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "split", "split", "{025034E6-A625-427B-AA99-5158095ED5F9}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -219,16 +221,17 @@
{C02F44CB-D916-428D-A1A5-04E225A2A4EC} = {664329B8-67BD-4D38-AE4B-A2920B038C09}
{4A3F2DA2-F53F-48EE-9505-8285F3E089D4} = {59509894-F4A9-4C44-8B39-8B5115384DD0}
{59509894-F4A9-4C44-8B39-8B5115384DD0} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
- {73C62FF2-C188-4A61-929E-2F112D7E17AA} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
- {120AC2A9-5EBE-4512-9FF7-54EA04192196} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
- {B994F673-EB8E-4C65-8884-B56AB8783115} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
- {15A784CC-1DA1-4AF2-81EA-D9EABCD4B760} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
- {3BAE3F0E-8F3F-404B-B29B-5881C16BD33B} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
- {80D0D30B-A9E1-464B-93ED-0EFEAD4EE102} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
- {42FC41FD-742B-4AED-816E-C211F1B07F3F} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
- {B4C52243-CBA3-4FB7-BB22-4D44331D6058} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
- {0B90819D-4066-4D6C-87E6-3BE4D8F595DE} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
- {C83BF842-ABB1-4870-8003-11EF860E6741} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
+ {73C62FF2-C188-4A61-929E-2F112D7E17AA} = {025034E6-A625-427B-AA99-5158095ED5F9}
+ {120AC2A9-5EBE-4512-9FF7-54EA04192196} = {025034E6-A625-427B-AA99-5158095ED5F9}
+ {B994F673-EB8E-4C65-8884-B56AB8783115} = {025034E6-A625-427B-AA99-5158095ED5F9}
+ {15A784CC-1DA1-4AF2-81EA-D9EABCD4B760} = {025034E6-A625-427B-AA99-5158095ED5F9}
+ {3BAE3F0E-8F3F-404B-B29B-5881C16BD33B} = {025034E6-A625-427B-AA99-5158095ED5F9}
+ {80D0D30B-A9E1-464B-93ED-0EFEAD4EE102} = {025034E6-A625-427B-AA99-5158095ED5F9}
+ {42FC41FD-742B-4AED-816E-C211F1B07F3F} = {025034E6-A625-427B-AA99-5158095ED5F9}
+ {B4C52243-CBA3-4FB7-BB22-4D44331D6058} = {025034E6-A625-427B-AA99-5158095ED5F9}
+ {0B90819D-4066-4D6C-87E6-3BE4D8F595DE} = {025034E6-A625-427B-AA99-5158095ED5F9}
+ {C83BF842-ABB1-4870-8003-11EF860E6741} = {025034E6-A625-427B-AA99-5158095ED5F9}
+ {025034E6-A625-427B-AA99-5158095ED5F9} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {733BCCC2-0431-4AB7-ABB6-AAE81AB54C48}
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj 2020-11-10 12:37:34 UTC (rev 9767)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj 2020-11-10 13:20:13 UTC (rev 9768)
@@ -62,6 +62,9 @@
"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)FoundationApiGen.xml" -l C# -x "FoundationApi"
"..\..\..\Tools\swig\install\swig.exe" -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 FoundationUnmanagedApi -o "$(ProjectDir)FoundationUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation" FoundationApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\FoundationUnmanagedApi.cs
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\ACE*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\xerces-c*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgFoundation*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
@@ -99,6 +102,9 @@
"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)FoundationApiGen.xml" -l C# -x "FoundationApi"
"..\..\..\Tools\swig\install\swig.exe" -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 FoundationUnmanagedApi -o "$(ProjectDir)FoundationUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation" FoundationApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\FoundationUnmanagedApi.cs
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\ACE*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\xerces-c*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgFoundation*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj 2020-11-10 12:37:34 UTC (rev 9767)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj 2020-11-10 13:20:13 UTC (rev 9768)
@@ -99,6 +99,8 @@
"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)GeometryApiGen.xml" -l C# -x "GeometryApi"
"..\..\..\Tools\swig\install\swig.exe" -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 GeometryUnmanagedApi -o "$(ProjectDir)GeometryUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry" GeometryApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\GeometryUnmanagedApi.cs
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\GEOS*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgGeometry*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj 2020-11-10 12:37:34 UTC (rev 9767)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj 2020-11-10 13:20:13 UTC (rev 9768)
@@ -62,6 +62,7 @@
"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)MapGuideCommonApiGen.xml" -l C# -x "MapGuideCommonApi"
"..\..\..\Tools\swig\install\swig.exe" -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 MapGuideCommonUnmanagedApi -o "$(ProjectDir)MapGuideCommonUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon" MapGuideCommonApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\MapGuideCommonUnmanagedApi.cs
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMapGuideCommon*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
@@ -99,6 +100,7 @@
"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)MapGuideCommonApiGen.xml" -l C# -x "MapGuideCommonApi"
"..\..\..\Tools\swig\install\swig.exe" -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 MapGuideCommonUnmanagedApi -o "$(ProjectDir)MapGuideCommonUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon" MapGuideCommonApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\MapGuideCommonUnmanagedApi.cs
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMapGuideCommon*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj 2020-11-10 12:37:34 UTC (rev 9767)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj 2020-11-10 13:20:13 UTC (rev 9768)
@@ -62,6 +62,9 @@
"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)PlatformBaseApiGen.xml" -l C# -x "PlatformBaseApi"
"..\..\..\Tools\swig\install\swig.exe" -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 PlatformBaseUnmanagedApi -o "$(ProjectDir)PlatformBaseUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase" PlatformBaseApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\PlatformBaseUnmanagedApi.cs
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMdfModel*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMdfParser*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgPlatformBase*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
@@ -99,6 +102,9 @@
"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)PlatformBaseApiGen.xml" -l C# -x "PlatformBaseApi"
"..\..\..\Tools\swig\install\swig.exe" -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 PlatformBaseUnmanagedApi -o "$(ProjectDir)PlatformBaseUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase" PlatformBaseApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\PlatformBaseUnmanagedApi.cs
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMdfModel*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgMdfParser*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgPlatformBase*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj 2020-11-10 12:37:34 UTC (rev 9767)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj 2020-11-10 13:20:13 UTC (rev 9768)
@@ -62,6 +62,10 @@
"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)WebApiGen.xml" -l C# -x "WebApi"
"..\..\..\Tools\swig\install\swig.exe" -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 WebUnmanagedApi -o "$(ProjectDir)WebUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web" WebApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\WebUnmanagedApi.cs
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgHttpHandler*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebApp*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebSupport*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\lib_json*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
@@ -99,6 +103,10 @@
"..\..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)WebApiGen.xml" -l C# -x "WebApi"
"..\..\..\Tools\swig\install\swig.exe" -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 WebUnmanagedApi -o "$(ProjectDir)WebUnmanagedApi_wrap.cpp" -outdir "$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web" WebApi.i
del /Q ..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\WebUnmanagedApi.cs
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgHttpHandler*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebApp*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebSupport*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\lib_json*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj 2020-11-10 12:37:34 UTC (rev 9767)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj 2020-11-10 13:20:13 UTC (rev 9768)
@@ -16,6 +16,14 @@
<PackageLicenseFile>License.txt</PackageLicenseFile>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\..\..\packages\DotNet\Release</OutputPath>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\..\..\packages\DotNet\Debug</OutputPath>
+ </PropertyGroup>
+
<ItemGroup>
<Content Include="build/**" PackagePath="%(Identity)" />
<Content Include="runtimes/**" PackagePath="%(Identity)" />
More information about the mapguide-commits
mailing list