[mapguide-commits] r9758 - in sandbox/jng/vanilla_swig: Bindings Bindings/src Bindings/src/Bindings Bindings/src/Bindings/DotNet Bindings/src/Bindings/Java Bindings/src/Bindings/MapGuideApi Bindings/src/Bindings/Php Bindings/src/IMake Bindings/src/Managed/DotNet/MapGuideDotNetApi Bindings/src/Managed/DotNet/MapGuideDotNetApi/Properties Bindings/src/Managed/DotNet/MapGuideDotNetApi/runtimes Bindings/src/Managed/DotNet/MapGuideDotNetApi/runtimes/win-x64/native Bindings/src/Tools Bindings/src/Tools/swig Common/Foundation
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Nov 6 09:33:48 PST 2020
Author: jng
Date: 2020-11-06 09:33:48 -0800 (Fri, 06 Nov 2020)
New Revision: 9758
Added:
sandbox/jng/vanilla_swig/Bindings/src/Bindings/MapGuideApi/
sandbox/jng/vanilla_swig/Bindings/src/Bindings/MapGuideApi/Constants.xml
sandbox/jng/vanilla_swig/Bindings/src/Bindings/MapGuideApi/MapGuideApiGen.xml
sandbox/jng/vanilla_swig/Bindings/src/Tools/swig/
sandbox/jng/vanilla_swig/Bindings/src/Tools/swig/readme.txt
Removed:
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/runtimes/ubuntu.14.04-x64/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/runtimes/win-x86/
Modified:
sandbox/jng/vanilla_swig/Bindings/
sandbox/jng/vanilla_swig/Bindings/src/
sandbox/jng/vanilla_swig/Bindings/src/Bindings/
sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/
sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/
sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/JavaApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php/
sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php/PhpApi.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/IMake/
sandbox/jng/vanilla_swig/Bindings/src/IMake/IMake.vcxproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/Properties/AssemblyInfo.cs
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/runtimes/win-x64/native/
sandbox/jng/vanilla_swig/Common/Foundation/Foundation.h
Log:
- Remove VC11 solution/project configs
- Fix up include/linker settings for .net/Java glue projects
- Add MapGuideDotNetApi to bindings solution
- Unloaded PhpApi from bindings solution. We'll re-activate this when we're ready to integrate PHP7 into this source tree. Right now, we're just dealing with .net/Java.
- Patch up Foundation.h to stub some ACE types in a SWIG codegen context so we don't have to leak out ACE headers
Index: sandbox/jng/vanilla_swig/Bindings
===================================================================
--- sandbox/jng/vanilla_swig/Bindings 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings 2020-11-06 17:33:48 UTC (rev 9758)
Property changes on: sandbox/jng/vanilla_swig/Bindings
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+packages
Index: sandbox/jng/vanilla_swig/Bindings/src
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src 2020-11-06 17:33:48 UTC (rev 9758)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+lib
+obj
Index: sandbox/jng/vanilla_swig/Bindings/src/Bindings
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings 2020-11-06 17:33:48 UTC (rev 9758)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Bindings
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+.vs
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/Bindings.sln 2020-11-06 17:33:48 UTC (rev 9758)
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.13
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30611.23
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DotNetUnmanagedApi", "DotNet\DotNetUnmanagedApi.vcxproj", "{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}"
ProjectSection(ProjectDependencies) = postProject
@@ -30,121 +30,53 @@
{B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {B601F04C-0D42-4AFC-A092-B31185E2EA8C}
EndProjectSection
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapGuideDotNetApi", "..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetApi.csproj", "{4A3F2DA2-F53F-48EE-9505-8285F3E089D4}"
+ ProjectSection(ProjectDependencies) = postProject
+ {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E} = {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug_VC11|x64 = Debug_VC11|x64
- Debug_VC11|x86 = Debug_VC11|x86
- Debug_VC14|x64 = Debug_VC14|x64
- Debug_VC14|x86 = Debug_VC14|x86
+ Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release_VC11|x64 = Release_VC11|x64
- Release_VC11|x86 = Release_VC11|x86
- Release_VC14|x64 = Release_VC14|x64
- Release_VC14|x86 = Release_VC14|x86
+ Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
- Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC11|x64.ActiveCfg = Debug_VC11|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC11|x64.Build.0 = Debug_VC11|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC11|x86.ActiveCfg = Debug_VC11|Win32
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC11|x86.Build.0 = Debug_VC11|Win32
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC14|x64.ActiveCfg = Debug_VC14|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC14|x64.Build.0 = Debug_VC14|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC14|x86.ActiveCfg = Debug_VC14|Win32
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug_VC14|x86.Build.0 = Debug_VC14|Win32
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x64.ActiveCfg = Debug_VC14|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x64.Build.0 = Debug_VC14|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x86.ActiveCfg = Debug_VC14|Win32
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x86.Build.0 = Debug_VC14|Win32
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC11|x64.ActiveCfg = Release_VC11|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC11|x64.Build.0 = Release_VC11|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC11|x86.ActiveCfg = Release_VC11|Win32
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC11|x86.Build.0 = Release_VC11|Win32
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC14|x64.ActiveCfg = Release_VC14|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC14|x64.Build.0 = Release_VC14|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC14|x86.ActiveCfg = Release_VC14|Win32
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release_VC14|x86.Build.0 = Release_VC14|Win32
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x64.ActiveCfg = Release_VC14|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x64.Build.0 = Release_VC14|x64
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x86.ActiveCfg = Release_VC14|Win32
- {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x86.Build.0 = Release_VC14|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|x64.ActiveCfg = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|x64.Build.0 = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|x64.Deploy.0 = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|x86.ActiveCfg = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC11|x86.Build.0 = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|x64.ActiveCfg = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|x64.Build.0 = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|x64.Deploy.0 = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|x86.ActiveCfg = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug_VC14|x86.Build.0 = Debug|Win32
+ {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x64.ActiveCfg = Debug|x64
+ {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Debug|x64.Build.0 = Debug|x64
+ {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|Any CPU.ActiveCfg = Release|x64
+ {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x64.ActiveCfg = Release|x64
+ {FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}.Release|x64.Build.0 = Release|x64
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Any CPU.ActiveCfg = Debug|Win32
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x86.ActiveCfg = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x86.Build.0 = Debug|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|x64.ActiveCfg = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|x64.Build.0 = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|x64.Deploy.0 = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|x86.ActiveCfg = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC11|x86.Build.0 = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x64.ActiveCfg = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x64.Build.0 = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x64.Deploy.0 = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x86.ActiveCfg = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x86.Build.0 = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release_VC14|x86.Deploy.0 = Release|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.Build.0 = Debug|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.Deploy.0 = Debug|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Any CPU.ActiveCfg = Release|Win32
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x86.ActiveCfg = Release|Win32
- {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x86.Build.0 = Release|Win32
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug_VC11|x64.ActiveCfg = Debug|x64
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug_VC11|x64.Build.0 = Debug|x64
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug_VC11|x86.ActiveCfg = Debug|Win32
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug_VC11|x86.Build.0 = Debug|Win32
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug_VC14|x64.ActiveCfg = Debug|x64
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug_VC14|x64.Build.0 = Debug|x64
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug_VC14|x86.ActiveCfg = Debug|Win32
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug_VC14|x86.Build.0 = Debug|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|Win32
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Deploy.0 = Release|Win32
+ {696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|Any CPU.ActiveCfg = Debug|x64
{696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|x64.ActiveCfg = Debug|x64
{696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|x64.Build.0 = Debug|x64
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|x86.ActiveCfg = Debug|Win32
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|x86.Build.0 = Debug|Win32
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Release_VC11|x64.ActiveCfg = Release|x64
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Release_VC11|x64.Build.0 = Release|x64
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Release_VC11|x86.ActiveCfg = Release|Win32
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Release_VC11|x86.Build.0 = Release|Win32
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Release_VC14|x64.ActiveCfg = Release|x64
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Release_VC14|x64.Build.0 = Release|x64
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Release_VC14|x86.ActiveCfg = Release|Win32
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Release_VC14|x86.Build.0 = Release|Win32
+ {696D2664-D17F-4357-8A19-2B5DC4B29962}.Release|Any CPU.ActiveCfg = Release|x64
{696D2664-D17F-4357-8A19-2B5DC4B29962}.Release|x64.ActiveCfg = Release|x64
{696D2664-D17F-4357-8A19-2B5DC4B29962}.Release|x64.Build.0 = Release|x64
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Release|x86.ActiveCfg = Release|Win32
- {696D2664-D17F-4357-8A19-2B5DC4B29962}.Release|x86.Build.0 = Release|Win32
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug_VC11|x64.ActiveCfg = Debug|x64
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug_VC11|x64.Build.0 = Debug|x64
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug_VC11|x86.ActiveCfg = Debug|Win32
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug_VC11|x86.Build.0 = Debug|Win32
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug_VC14|x64.ActiveCfg = Debug|x64
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug_VC14|x64.Build.0 = Debug|x64
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug_VC14|x86.ActiveCfg = Debug|Win32
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug_VC14|x86.Build.0 = Debug|Win32
+ {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|Any CPU.ActiveCfg = Debug|x64
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x64.ActiveCfg = Debug|x64
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x64.Build.0 = Debug|x64
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x86.ActiveCfg = Debug|Win32
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x86.Build.0 = Debug|Win32
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release_VC11|x64.ActiveCfg = Release|x64
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release_VC11|x64.Build.0 = Release|x64
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release_VC11|x86.ActiveCfg = Release|Win32
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release_VC11|x86.Build.0 = Release|Win32
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release_VC14|x64.ActiveCfg = Release|x64
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release_VC14|x64.Build.0 = Release|x64
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release_VC14|x86.ActiveCfg = Release|Win32
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release_VC14|x86.Build.0 = Release|Win32
+ {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|Any CPU.ActiveCfg = Release|x64
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.ActiveCfg = Release|x64
{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.Build.0 = Release|x64
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x86.ActiveCfg = Release|Win32
- {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x86.Build.0 = Release|Win32
+ {4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Debug|x64.Build.0 = Debug|Any CPU
+ {4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Release|x64.ActiveCfg = Release|Any CPU
+ {4A3F2DA2-F53F-48EE-9505-8285F3E089D4}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -154,6 +86,7 @@
{B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {99132700-5CAD-4540-9939-7502C1A448EA}
{696D2664-D17F-4357-8A19-2B5DC4B29962} = {323AEA7C-774B-49D8-8D34-7A766288C549}
{C02F44CB-D916-428D-A1A5-04E225A2A4EC} = {664329B8-67BD-4D38-AE4B-A2920B038C09}
+ {4A3F2DA2-F53F-48EE-9505-8285F3E089D4} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {733BCCC2-0431-4AB7-ABB6-AAE81AB54C48}
Index: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet 2020-11-06 17:33:48 UTC (rev 9758)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,8 ##
+*.user
+lib
+obj
+language.i
+MapGuideApi.i
+MapGuideApi_Doc.i
+MapGuideApi_Properties.i
+MgApi_wrap.cpp
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/DotNet/DotNetUnmanagedApi.vcxproj 2020-11-06 17:33:48 UTC (rev 9758)
@@ -1,38 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug_VC11|Win32">
- <Configuration>Debug_VC11</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug_VC11|x64">
- <Configuration>Debug_VC11</Configuration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Debug_VC14|Win32">
- <Configuration>Debug_VC14</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug_VC14|x64">
- <Configuration>Debug_VC14</Configuration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release_VC11|Win32">
- <Configuration>Release_VC11</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release_VC11|x64">
- <Configuration>Release_VC11</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release_VC14|Win32">
- <Configuration>Release_VC14</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release_VC14|x64">
- <Configuration>Release_VC14</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E}</ProjectGuid>
@@ -40,134 +16,44 @@
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC11|Win32'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC14|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'" Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC11|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC14|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
- </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC11|Win32'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC14|Win32'" Label="PropertySheets">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC11|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC14|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'">bin\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'">bin\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'">obj\$(Configuration)\DotNetUnmanagedApi\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'">obj\$(Configuration)\DotNetUnmanagedApi\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'">bin\$(Configuration)64\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'">bin\$(Configuration)64\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'">obj\$(Configuration)64\DotNetUnmanagedApi\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'">obj\$(Configuration)64\DotNetUnmanagedApi\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_VC11|Win32'">..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_VC14|Win32'">..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_VC11|Win32'">obj\$(Configuration)\DotNetUnmanagedApi\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_VC14|Win32'">obj\$(Configuration)\DotNetUnmanagedApi\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_VC11|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_VC14|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_VC11|x64'">..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_VC14|x64'">..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_VC11|x64'">obj\$(Configuration)64\DotNetUnmanagedApi\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_VC14|x64'">obj\$(Configuration)64\DotNetUnmanagedApi\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_VC11|x64'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release_VC14|x64'">false</LinkIncremental>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'" />
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'" />
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release_VC11|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release_VC14|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release_VC11|Win32'" />
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release_VC14|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release_VC11|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release_VC14|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release_VC11|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release_VC14|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release_VC11|x64'" />
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release_VC14|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release_VC11|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release_VC14|x64'" />
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'">MapGuideDotNetUnmanagedApid</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'">MapGuideDotNetUnmanagedApid</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'">MapGuideDotNetUnmanagedApid</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'">MapGuideDotNetUnmanagedApid</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_VC11|x64'">MapGuideDotNetUnmanagedApi</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_VC14|x64'">MapGuideDotNetUnmanagedApi</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_VC11|Win32'">MapGuideDotNetUnmanagedApi</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_VC14|Win32'">MapGuideDotNetUnmanagedApi</TargetName>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">bin\$(Configuration)64\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\$(Configuration)64\DotNetUnmanagedApi\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\$(Configuration)64\DotNetUnmanagedApi\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MapGuideDotNetUnmanagedApid</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MapGuideDotNetUnmanagedApi</TargetName>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs"
if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i"
@@ -174,87 +60,13 @@
"..\..\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)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
+"..\..\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 MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_USE_32BIT_TIME_T;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB);$(MG_OEM_ACE_LIB_ROOT)\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideDotNetUnmanagedApid.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>lib\$(Configuration)\MapGuideDotNetUnmanagedApid.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'">
- <PreBuildEvent>
- <Command>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)..\..\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)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
-del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs
-</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_USE_32BIT_TIME_T;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB);$(MG_OEM_ACE_LIB_ROOT)\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideDotNetUnmanagedApid.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>lib\$(Configuration)\MapGuideDotNetUnmanagedApid.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'">
- <PreBuildEvent>
- <Command>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)..\..\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)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
-del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs
-</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Web\src\HttpHandler;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -265,11 +77,11 @@
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApid.dll</OutputFile>
<AdditionalLibraryDirectories>$(MG_SDK_LIB64);$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideDotNetUnmanagedApid.pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -278,7 +90,7 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\*.cs"
if exist "$(ProjectDir)MapGuideApi_Properties.i" del /Q "$(ProjectDir)MapGuideApi_Properties.i"
@@ -285,126 +97,13 @@
"..\..\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)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
+"..\..\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 MapGuideDotNetUnmanagedApi -o "$(ProjectDir)MgApi_wrap.cpp" -outdir "$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs
</Command>
</PreBuildEvent>
<ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB64);$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideDotNetUnmanagedApid.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>lib\$(Configuration)64\MapGuideDotNetUnmanagedApid.lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC11|Win32'">
- <PreBuildEvent>
- <Command>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)..\..\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)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
-del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs
-</Command>
- </PreBuildEvent>
- <ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_USE_32BIT_TIME_T;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACE.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB);$(MG_SOURCE_ROOT)\Common\lib\Release;$(MG_SOURCE_ROOT)\Web\lib\Release;$(MG_OEM_ACE_LIB_ROOT)\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideDotNetUnmanagedApi.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>lib\$(Configuration)\MapGuideDotNetUnmanagedApi.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC14|Win32'">
- <PreBuildEvent>
- <Command>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)..\..\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)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
-del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs
-</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_USE_32BIT_TIME_T;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACE.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x86\native\MapGuideDotNetUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB);$(MG_SOURCE_ROOT)\Common\lib\Release;$(MG_SOURCE_ROOT)\Web\lib\Release;$(MG_OEM_ACE_LIB_ROOT)\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)\..\..\..\bin\MapGuideDotNetUnmanagedApi.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>lib\$(Configuration)\MapGuideDotNetUnmanagedApi.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC11|x64'">
- <PreBuildEvent>
- <Command>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)..\..\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)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
-del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs
-</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Web\src\HttpHandler;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_WIN64;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -414,11 +113,11 @@
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB64);$(MG_SOURCE_ROOT)\Common\lib\Release64;$(MG_SOURCE_ROOT)\Web\lib\Release64;$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Common\lib\Release64;..\..\..\..\Web\lib\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideDotNetUnmanagedApi.pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -429,54 +128,10 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VC14|x64'">
- <PreBuildEvent>
- <Command>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)..\..\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)..\..\Managed\DotNet\MapGuideDotNetApi" MapGuideApi.i
-del /Q ..\..\Managed\DotNet\MapGuideDotNetApi\MapGuideDotNetUnmanagedApi.cs
-</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_WIN64;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACE.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(ProjectDir)..\..\Managed\DotNet\MapGuideDotNetApi\runtimes\win-x64\native\MapGuideDotNetUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB64);$(MG_SOURCE_ROOT)\Common\lib\Release64;$(MG_SOURCE_ROOT)\Web\lib\Release64;$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)\..\..\..\bin\MapGuideDotNetUnmanagedApi.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>lib\$(Configuration)64\MapGuideDotNetUnmanagedApi.lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="MgApi_wrap.cpp">
- <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'">false</PreprocessToFile>
- <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'">false</PreprocessToFile>
- <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|Win32'">false</PreprocessSuppressLineNumbers>
- <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|Win32'">false</PreprocessSuppressLineNumbers>
- <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'">false</PreprocessToFile>
- <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'">false</PreprocessToFile>
- <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Debug_VC11|x64'">false</PreprocessSuppressLineNumbers>
- <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Debug_VC14|x64'">false</PreprocessSuppressLineNumbers>
+ <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</PreprocessToFile>
+ <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</PreprocessSuppressLineNumbers>
</ClCompile>
</ItemGroup>
<ItemGroup>
Index: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java 2020-11-06 17:33:48 UTC (rev 9758)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,5 ##
+*.user
+language.i
+MapGuideApi.i
+MapGuideApi_Doc.i
+MgApi_wrap.cpp
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/JavaApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/JavaApi.vcxproj 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/Java/JavaApi.vcxproj 2020-11-06 17:33:48 UTC (rev 9758)
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
@@ -24,16 +16,6 @@
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
@@ -47,12 +29,6 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
@@ -62,82 +38,33 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\packages\Java\$(Configuration)\x86\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\obj\$(Configuration)\JavaApi\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\packages\Java\$(Configuration)\x64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\obj\$(Configuration)64\JavaApi\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\packages\Java\$(Configuration)\x86\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\obj\$(Configuration)\JavaApi\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\packages\Java\$(Configuration)\x64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\obj\$(Configuration)64\JavaApi\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MapGuideJavaApid</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MapGuideJavaApid</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MapGuideJavaApi</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MapGuideJavaApi</TargetName>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent>
- <Command>"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l Java -o . -t
-copy .\java.i .\language.i
-"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l Java
-$(SWIG_TOOL_PATH)\swig -c++ -java -DJAVA -DWIN32 -package org.osgeo.mapguide -nodefaultctor -nodefaultdtor -module MapGuideJavaApi -o MgApi_wrap.cpp MapGuideApi.i
-move /Y *.java "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide"
-if exist "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class" del "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class"</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB);$(MG_OEM_ACE_LIB_ROOT)\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>..\..\lib\$(Configuration)\MapGuideJavaApid.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l Java -o . -t
copy .\java.i .\language.i
"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l Java
-$(SWIG_TOOL_PATH)\swig -c++ -java -DJAVA -DWIN32 -package org.osgeo.mapguide -nodefaultctor -nodefaultdtor -module MapGuideJavaApi -o MgApi_wrap.cpp MapGuideApi.i
+"..\..\Tools\swig\install\swig.exe" -c++ -java -DJAVA -DWIN32 -package org.osgeo.mapguide -nodefaultctor -nodefaultdtor -module MapGuideJavaApi -o MgApi_wrap.cpp MapGuideApi.i
move /Y "$(ProjectDir)*.java" "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide"
if exist "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class" del "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class"</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Web\src\HttpHandler;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -148,9 +75,9 @@
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB64);$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -161,54 +88,18 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent>
- <Command>"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l Java -o . -t
-copy .\java.i .\language.i
-"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l Java
-$(SWIG_TOOL_PATH)\swig -c++ -java -DJAVA -DWIN32 -package org.osgeo.mapguide -nodefaultctor -nodefaultdtor -module MapGuideJavaApi -o MgApi_wrap.cpp MapGuideApi.i
-move /Y *.java "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide"
-if exist "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class" del "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class"</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACE.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)MapGuideJavaApi.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB);$(MG_OEM_ACE_LIB_ROOT)\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideJavaApi.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>..\..\lib\$(Configuration)\MapGuideJavaApi.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l Java -o . -t
copy .\java.i .\language.i
"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l Java
-$(SWIG_TOOL_PATH)\swig -c++ -java -DJAVA -DWIN32 -package org.osgeo.mapguide -nodefaultctor -nodefaultdtor -module MapGuideJavaApi -o MgApi_wrap.cpp MapGuideApi.i
+"..\..\Tools\swig\install\swig.exe" -c++ -java -DJAVA -DWIN32 -package org.osgeo.mapguide -nodefaultctor -nodefaultdtor -module MapGuideJavaApi -o MgApi_wrap.cpp MapGuideApi.i
move /Y *.java "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide"
if exist "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class" del "$(ProjectDir)..\..\Managed\Java\org\osgeo\mapguide\*.class"</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Web\src\HttpHandler;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -218,9 +109,9 @@
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApi.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB64);$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\Common\lib\Release64;..\..\..\..\Web\lib\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Added: sandbox/jng/vanilla_swig/Bindings/src/Bindings/MapGuideApi/Constants.xml
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/MapGuideApi/Constants.xml (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/MapGuideApi/Constants.xml 2020-11-06 17:33:48 UTC (rev 9758)
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Parameters>
+
+<!--
+ Type replacements.
+-->
+<PHPTypeReplacements>
+ <TypeReplacement oldtype="STRING" newtype="" />
+ <TypeReplacement oldtype="INT8" newtype="" />
+ <TypeReplacement oldtype="INT16" newtype="" />
+ <TypeReplacement oldtype="INT32" newtype="" />
+ <TypeReplacement oldtype="int" newtype="" />
+ <TypeReplacement oldtype="float" newtype="" />
+ <TypeReplacement oldtype="double" newtype="" />
+ <TypeReplacement oldtype="static" newtype="" />
+ <TypeReplacement oldtype="bool" newtype="" />
+</PHPTypeReplacements>
+<CSharpTypeReplacements>
+ <TypeReplacement oldtype="STRING" newtype="string" />
+ <TypeReplacement oldtype="INT8" newtype="byte" />
+ <TypeReplacement oldtype="INT16" newtype="short" />
+ <TypeReplacement oldtype="INT32" newtype="int" />
+ <TypeReplacement oldtype="int" newtype="int" />
+ <TypeReplacement oldtype="float" newtype="float" />
+ <TypeReplacement oldtype="double" newtype="double" />
+ <TypeReplacement oldtype="static" newtype="" />
+ <TypeReplacement oldtype="const" newtype="const" />
+</CSharpTypeReplacements>
+<JavaTypeReplacements>
+ <TypeReplacement oldtype="STRING" newtype="String" />
+ <TypeReplacement oldtype="INT8" newtype="short" />
+ <TypeReplacement oldtype="INT16" newtype="short" />
+ <TypeReplacement oldtype="INT32" newtype="int" />
+ <TypeReplacement oldtype="int" newtype="int" />
+ <TypeReplacement oldtype="float" newtype="float" />
+ <TypeReplacement oldtype="double" newtype="double" />
+ <TypeReplacement oldtype="const" newtype="final" />
+ <TypeReplacement oldtype="bool" newtype="boolean" />
+</JavaTypeReplacements>
+
+<!--
+ Inline section.
+-->
+<Inline>
+//
+// Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+</Inline>
+
+<Namespace>OSGeo.MapGuide</Namespace>
+<Package>org.osgeo.mapguide</Package>
+
+<Classes>
+ <Class name="MgServiceType" />
+ <Class name="MgUser" />
+ <Class name="MgGroup" />
+ <Class name="MgRole" />
+ <Class name="MgRepositoryType" />
+ <Class name="MgResourceType" />
+ <Class name="MgResourceTag" />
+ <Class name="MgResourceDataName" />
+ <Class name="MgResourceDataType" />
+ <Class name="MgResourcePermission" />
+ <Class name="MgResourceHeaderProperties" />
+ <Class name="MgMimeType" />
+ <Class name="MgPropertyType" />
+ <Class name="MgPageUnitsType" />
+ <Class name="MgCoordinateSpace" />
+ <Class name="MgGeometryEntityType" />
+ <Class name="MgCoordinateDimension" />
+ <Class name="MgGeometricPathInstructionType" />
+ <Class name="MgGeometryType" />
+ <Class name="MgGeometryComponentType" />
+ <Class name="MgGeometrySimplificationAlgorithmType" />
+ <Class name="MgLayerGroupType" />
+ <Class name="MgLayerType" />
+ <Class name="MgFeatureGeometricType" />
+ <Class name="MgReaderType" />
+ <Class name="MgOrderingOption" />
+ <Class name="MgFeatureSpatialOperations" />
+ <Class name="MgFeatureCommandType" />
+ <Class name="MgFeaturePropertyType" />
+ <Class name="MgObjectPropertyType" />
+ <Class name="MgParameterDirection" />
+ <Class name="MgSpatialContextExtentType" />
+ <Class name="MgWebWidgetType" />
+ <Class name="MgWebTaskButtonType" />
+ <Class name="MgWebTargetType" />
+ <Class name="MgWebTargetViewerType" />
+ <Class name="MgWebActions" />
+ <Class name="MgConfigProperties" />
+ <Class name="MgLogFileType" />
+ <Class name="MgServerInformationProperties" />
+ <Class name="MgCoordinateSystemCodeFormat" />
+ <Class name="MgCoordinateSystemErrorCode" />
+ <Class name="MgCoordinateSystemGeodeticTransformationMethod" />
+ <Class name="MgCoordinateSystemGridOrientation" />
+ <Class name="MgCoordinateSystemGridSpecializationType" />
+ <Class name="MgCoordinateSystemMgrsGridLevel" />
+ <Class name="MgCoordinateSystemMgrsLetteringScheme" />
+ <Class name="MgCoordinateSystemMgrsGridSquarePosition" />
+ <Class name="MgCoordinateSystemProjectionCode" />
+ <Class name="MgCoordinateSystemProjectionFormatType" />
+ <Class name="MgCoordinateSystemProjectionLogicalType" />
+ <Class name="MgCoordinateSystemProjectionParameterType" />
+ <Class name="MgCoordinateSystemType" />
+ <Class name="MgCoordinateSystemUnitCode" />
+ <Class name="MgCoordinateSystemUnitType" />
+ <Class name="MgCoordinateSystemWktFlavor" />
+ <Class name="MgCoordinateSystemGeodeticTransformDefType" />
+ <Class name="MgCoordinateSystemGeodeticAnalyticalTransformationMethod" />
+ <Class name="MgCoordinateSystemGeodeticMultipleRegressionTransformationMethod" />
+ <Class name="MgCoordinateSystemGeodeticTransformGridFileFormat" />
+ <Class name="MgImageFormats" />
+ <Class name="MgMapPlotInstruction" />
+ <Class name="MgUnitType" />
+ <Class name="MgPackageStatus" />
+ <Class name="MgRasterDataModelType" />
+ <Class name="MgExceptionCodes" />
+</Classes>
+
+<!--
+ C++ Headers section. If you add headers to this section then you
+ must also add them to Makefile.am in the JavaApi and PhpApi folders.
+-->
+<Headers>
+
+ <!-- API -->
+
+ <Header path="../../../../Common/Foundation/Data/FeaturePropertyType.h" />
+ <Header path="../../../../Common/Foundation/Data/MimeType.h" />
+ <Header path="../../../../Common/Foundation/Data/PropertyType.h" />
+ <Header path="../../../../Common/Foundation/Exception/ExceptionCodes.h" />
+
+ <Header path="../../../../Common/PlatformBase/MapLayer/LayerGroupType.h" />
+ <Header path="../../../../Common/PlatformBase/MapLayer/LayerType.h" />
+ <Header path="../../../../Common/PlatformBase/Services/BaseServiceDefs.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureCommandType.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureGeometricType.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureSpatialOperations.h" />
+ <Header path="../../../../Common/PlatformBase/Services/ObjectPropertyType.h" />
+ <Header path="../../../../Common/PlatformBase/Services/OrderingOption.h" />
+ <Header path="../../../../Common/PlatformBase/Services/ParameterDirection.h" />
+ <Header path="../../../../Common/PlatformBase/Services/RasterTypes.h" />
+ <Header path="../../../../Common/PlatformBase/Services/ReaderType.h" />
+ <Header path="../../../../Common/PlatformBase/Services/ResourceDefs.h" />
+ <Header path="../../../../Common/PlatformBase/Services/SpatialContextExtentType.h" />
+
+ <Header path="../../../../Common/Geometry/CoordinateDimension.h" />
+ <Header path="../../../../Common/Geometry/GeometricEntityType.h" />
+ <Header path="../../../../Common/Geometry/GeometricPathInstructionType.h" />
+ <Header path="../../../../Common/Geometry/GeometryComponentType.h" />
+ <Header path="../../../../Common/Geometry/GeometryType.h" />
+ <Header path="../../../../Common/Geometry/GeometrySimplificationAlgorithmType.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemCodeFormat.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemErrorCode.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformationMethod.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridOrientation.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridSpecializationType.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsLetteringScheme.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridSquarePosition.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionFormatType.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionLogicalType.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionParameterType.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemType.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitType.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemWktFlavor.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformationMethod.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformationMethod.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFileFormat.h" />
+
+ <Header path="../../../../Common/MapGuideCommon/Services/ImageFormats.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/MappingDefs.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/MapPlotInstruction.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/ServerAdminDefs.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/UnitType.h" />
+ <Header path="../../../../Common/MapGuideCommon/System/ConfigProperties.h" />
+
+ <Header path="../../../../Web/src/WebApp/WebActions.h" />
+ <Header path="../../../../Web/src/WebApp/WebTargetType.h" />
+ <Header path="../../../../Web/src/WebApp/WebTargetViewerType.h" />
+ <Header path="../../../../Web/src/WebApp/WebTaskButtonType.h" />
+ <Header path="../../../../Web/src/WebApp/WebWidgetType.h" />
+
+</Headers>
+
+</Parameters>
Added: sandbox/jng/vanilla_swig/Bindings/src/Bindings/MapGuideApi/MapGuideApiGen.xml
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/MapGuideApi/MapGuideApiGen.xml (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/MapGuideApi/MapGuideApiGen.xml 2020-11-06 17:33:48 UTC (rev 9758)
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Parameters>
+<!--
+ Module section.
+-->
+<Module name="MapGuideApi" />
+
+<!--
+ Target section.
+-->
+<Target path="./MapGuideApi.i" />
+<DocTarget path="./MapGuideApi_Doc.i" />
+
+<!--
+ C++ inline section.
+-->
+<CppInline>
+#ifdef _WIN32
+#pragma warning(disable: 4251)
+
+//These will be set as a result of pulling windows headers somewhere in the dependency chain.
+//
+//These have to be unset as we have class methods of the same name which the windows headers
+//will erroneously try to rewrite to CreateServiceW/GetClassNameW/GetUserNameW on our class methods.
+#undef CreateService
+#undef GetClassName
+#undef GetUserName
+
+#endif
+
+#include <string>
+#include <map>
+#include "MapGuideCommon.h"
+#include "WebApp.h"
+
+#ifdef _WIN32
+#include "WebSupport.h"
+#else
+#include "InitializeWebTier.cpp"
+#include "UnicodeString.h"
+#endif
+#include "HttpHandlerApiDllExport.h"
+#include "HttpHandler.h"
+
+#if defined(PHP) || defined(JAVA)
+typedef std::wstring STRINGPARAM;
+#else
+typedef wchar_t* STRINGPARAM;
+#endif
+</CppInline>
+
+<!--
+ Type replacements.
+-->
+<TypeReplacements>
+ <TypeReplacement oldtype="CREFSTRING" newtype="STRINGPARAM" />
+ <TypeReplacement oldtype="INT64" newtype="long long" />
+</TypeReplacements>
+
+<!--
+ Swig inline section.
+-->
+<SwigInline>
+ %include "MapGuideApi_Doc.i" //translated doxygen fragments
+ %include "language.i" //typemaps specific for each language
+ %include "../../../../Common/Foundation/System/FoundationClassId.h"
+ %include "../../../../Common/Geometry/GeometryClassId.h"
+ %include "../../../../Common/PlatformBase/Services/PlatformBaseClassId.h"
+ %include "../../../../Common/MapGuideCommon/System/MapGuideCommonClassId.h"
+ %include "../../../../Web/src/WebApp/WebAppClassId.h"
+ %include "../../../../Web/src/HttpHandler/HttpHandlerClassId.h"
+
+#if defined(PHPSWIG)
+ // We force UTF-8 encoding for PHP
+ typedef char* STRINGPARAM;
+ typedef char* STRING;
+ typedef char* BYTE_ARRAY_IN;
+ typedef char* BYTE_ARRAY_OUT;
+ typedef unsigned char BYTE;
+#elseif defined(JAVA)
+ typedef std::wstring STRINGPARAM;
+ typedef signed char BYTE; //mapped to byte in Java
+#else // .Net
+ typedef char* BYTE_ARRAY_IN;
+ typedef char* BYTE_ARRAY_OUT;
+ typedef unsigned char BYTE; //mapped to byte in C#
+#endif
+
+ typedef int STATUS;
+ typedef short INT8;
+ typedef short INT16;
+ typedef int INT32;
+ typedef int UINT32;
+
+</SwigInline>
+
+<!--
+ C++ Headers section. If you add headers to this section then you
+ must also add them to Makefile.am in the JavaApi and PhpApi folders.
+-->
+<Headers>
+
+ <!-- Foundation classes -->
+
+ <Header path="../../../../Common/Foundation/System/Object.h" />
+ <Header path="../../../../Common/Foundation/System/Disposable.h" />
+ <Header path="../../../../Common/Foundation/System/GuardDisposable.h" />
+ <Header path="../../../../Common/Foundation/System/Serializable.h" />
+ <Header path="../../../../Common/Foundation/System/NamedSerializable.h" />
+
+ <Header path="../../../../Common/Foundation/Data/Collection.h" />
+ <Header path="../../../../Common/Foundation/Data/Property.h" />
+
+ <!-- The MgDisposableCollection depends on the MgCollection above and so must come after it -->
+ <Header path="../../../../Common/Foundation/System/DisposableCollection.h" />
+
+ <Header path="../../../../Common/Foundation/Data/BatchPropertyCollection.h" />
+ <Header path="../../../../Common/Foundation/Data/ByteReader.h" />
+ <Header path="../../../../Common/Foundation/Data/ByteSink.h" />
+ <Header path="../../../../Common/Foundation/Data/ByteSource.h" />
+ <Header path="../../../../Common/Foundation/Data/DateTime.h" />
+ <Header path="../../../../Common/Foundation/Data/NullableProperty.h" />
+ <Header path="../../../../Common/Foundation/Data/PropertyCollection.h" />
+ <Header path="../../../../Common/Foundation/Data/PropertyDefinition.h" />
+ <Header path="../../../../Common/Foundation/Data/StringCollection.h" />
+ <Header path="../../../../Common/Foundation/Data/StringProperty.h" />
+
+ <Header path="../../../../Common/Foundation/Exception/Exception.h" />
+
+ <!-- Geometry classes -->
+
+ <Header path="../../../../Common/Geometry/GeometricEntity.h" />
+ <Header path="../../../../Common/Geometry/Geometry.h" />
+ <Header path="../../../../Common/Geometry/GeometryComponent.h" />
+ <Header path="../../../../Common/Geometry/Curve.h" />
+ <Header path="../../../../Common/Geometry/CurveSegment.h" />
+ <Header path="../../../../Common/Geometry/Ring.h" />
+ <Header path="../../../../Common/Geometry/Region.h" />
+
+ <Header path="../../../../Common/Geometry/AgfReaderWriter.h" />
+ <Header path="../../../../Common/Geometry/AggregateGeometry.h" />
+ <Header path="../../../../Common/Geometry/ArcSegment.h" />
+ <Header path="../../../../Common/Geometry/Coordinate.h" />
+ <Header path="../../../../Common/Geometry/CoordinateCollection.h" />
+ <Header path="../../../../Common/Geometry/CoordinateIterator.h" />
+ <Header path="../../../../Common/Geometry/CoordinateXY.h" />
+ <Header path="../../../../Common/Geometry/CoordinateXYM.h" />
+ <Header path="../../../../Common/Geometry/CoordinateXYZ.h" />
+ <Header path="../../../../Common/Geometry/CoordinateXYZM.h" />
+ <Header path="../../../../Common/Geometry/CurvePolygon.h" />
+ <Header path="../../../../Common/Geometry/CurvePolygonCollection.h" />
+ <Header path="../../../../Common/Geometry/CurveRing.h" />
+ <Header path="../../../../Common/Geometry/CurveRingCollection.h" />
+ <Header path="../../../../Common/Geometry/CurveSegmentCollection.h" />
+ <Header path="../../../../Common/Geometry/CurveString.h" />
+ <Header path="../../../../Common/Geometry/CurveStringCollection.h" />
+ <Header path="../../../../Common/Geometry/Envelope.h" />
+ <Header path="../../../../Common/Geometry/GeometryCollection.h" />
+ <Header path="../../../../Common/Geometry/GeometryFactory.h" />
+ <Header path="../../../../Common/Geometry/LinearRing.h" />
+ <Header path="../../../../Common/Geometry/LinearRingCollection.h" />
+ <Header path="../../../../Common/Geometry/LinearSegment.h" />
+ <Header path="../../../../Common/Geometry/LineString.h" />
+ <Header path="../../../../Common/Geometry/LineStringCollection.h" />
+ <Header path="../../../../Common/Geometry/Measure.h" />
+ <Header path="../../../../Common/Geometry/MultiCurvePolygon.h" />
+ <Header path="../../../../Common/Geometry/MultiCurveString.h" />
+ <Header path="../../../../Common/Geometry/MultiGeometry.h" />
+ <Header path="../../../../Common/Geometry/MultiLineString.h" />
+ <Header path="../../../../Common/Geometry/MultiPoint.h" />
+ <Header path="../../../../Common/Geometry/MultiPolygon.h" />
+ <Header path="../../../../Common/Geometry/Point.h" />
+ <Header path="../../../../Common/Geometry/PointCollection.h" />
+ <Header path="../../../../Common/Geometry/Polygon.h" />
+ <Header path="../../../../Common/Geometry/PolygonCollection.h" />
+ <Header path="../../../../Common/Geometry/PreparedGeometry.h" />
+ <Header path="../../../../Common/Geometry/Transform.h" />
+ <Header path="../../../../Common/Geometry/WktReaderWriter.h" />
+
+ <Header path="../../../../Common/Geometry/GeometrySimplifier.h" />
+
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystem.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryBase.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemCatalog.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategory.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategoryDictionary.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatumDictionary.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionary.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryUtility.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoidDictionary.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemEnum.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemEnumInteger32.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemFilter.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemFilterInteger32.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemFormatConverter.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemMathComparator.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionInformation.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h" />
+ <Header path="../../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitInformation.h" />
+
+ <!-- PlatformBase classes -->
+
+ <Header path="../../../../Common/PlatformBase/Data/BlobProperty.h" />
+ <Header path="../../../../Common/PlatformBase/Data/BooleanProperty.h" />
+ <Header path="../../../../Common/PlatformBase/Data/ByteProperty.h" />
+ <Header path="../../../../Common/PlatformBase/Data/ClobProperty.h" />
+ <Header path="../../../../Common/PlatformBase/Data/Color.h" />
+ <Header path="../../../../Common/PlatformBase/Data/DateTimeProperty.h" />
+ <Header path="../../../../Common/PlatformBase/Data/DoubleProperty.h" />
+ <Header path="../../../../Common/PlatformBase/Data/Int16Property.h" />
+ <Header path="../../../../Common/PlatformBase/Data/Int32Property.h" />
+ <Header path="../../../../Common/PlatformBase/Data/Int64Property.h" />
+ <Header path="../../../../Common/PlatformBase/Data/IntCollection.h" />
+ <Header path="../../../../Common/PlatformBase/Data/PropertyDefinitionCollection.h" />
+ <Header path="../../../../Common/PlatformBase/Data/SingleProperty.h" />
+ <Header path="../../../../Common/PlatformBase/Data/StringPropertyCollection.h" />
+
+ <Header path="../../../../Common/PlatformBase/Services/FeatureCommand.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureQueryOptions.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureSourceParams.h" />
+ <Header path="../../../../Common/PlatformBase/Services/Reader.h" />
+ <Header path="../../../../Common/PlatformBase/Services/Service.h" />
+
+ <Header path="../../../../Common/PlatformBase/Services/BaseService.h" />
+ <Header path="../../../../Common/PlatformBase/Services/ClassDefinition.h" />
+ <Header path="../../../../Common/PlatformBase/Services/ClassDefinitionCollection.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FileFeatureSourceParams.h" />
+ <Header path="../../../../Common/PlatformBase/Services/DataPropertyDefinition.h" />
+ <Header path="../../../../Common/PlatformBase/Services/DataReader.h" />
+ <Header path="../../../../Common/PlatformBase/Services/DeleteFeatures.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureAggregateOptions.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureCommandCollection.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureProperty.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureReader.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureSchema.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureSchemaCollection.h" />
+ <Header path="../../../../Common/PlatformBase/Services/FeatureService.h" />
+ <Header path="../../../../Common/PlatformBase/Services/GeoJsonWriter.h" />
+ <Header path="../../../../Common/PlatformBase/Services/GeometricPropertyDefinition.h" />
+ <Header path="../../../../Common/PlatformBase/Services/GeometryProperty.h" />
+ <Header path="../../../../Common/PlatformBase/Services/GeometryTypeInfo.h" />
+ <Header path="../../../../Common/PlatformBase/Services/GwsFeatureReader.h" />
+ <Header path="../../../../Common/PlatformBase/Services/InsertFeatures.h" />
+ <Header path="../../../../Common/PlatformBase/Services/LongTransactionReader.h" />
+ <Header path="../../../../Common/PlatformBase/Services/ObjectPropertyDefinition.h" />
+ <Header path="../../../../Common/PlatformBase/Services/Parameter.h" />
+ <Header path="../../../../Common/PlatformBase/Services/ParameterCollection.h" />
+ <Header path="../../../../Common/PlatformBase/Services/Raster.h" />
+ <Header path="../../../../Common/PlatformBase/Services/RasterProperty.h" />
+ <Header path="../../../../Common/PlatformBase/Services/RasterPropertyDefinition.h" />
+ <Header path="../../../../Common/PlatformBase/Services/Resource.h" />
+ <Header path="../../../../Common/PlatformBase/Services/ResourceIdentifier.h" />
+ <Header path="../../../../Common/PlatformBase/Services/ResourceService.h" />
+ <Header path="../../../../Common/PlatformBase/Services/SpatialContextReader.h" />
+ <Header path="../../../../Common/PlatformBase/Services/SqlDataReader.h" />
+ <Header path="../../../../Common/PlatformBase/Services/Transaction.h" />
+ <Header path="../../../../Common/PlatformBase/Services/UpdateFeatures.h" />
+ <Header path="../../../../Common/PlatformBase/Services/Warnings.h" />
+
+ <Header path="../../../../Common/PlatformBase/MapLayer/LayerBase.h" />
+ <Header path="../../../../Common/PlatformBase/MapLayer/LayerCollection.h" />
+ <Header path="../../../../Common/PlatformBase/MapLayer/LayerGroup.h" />
+ <Header path="../../../../Common/PlatformBase/MapLayer/LayerGroupCollection.h" />
+ <Header path="../../../../Common/PlatformBase/MapLayer/MapBase.h" />
+ <Header path="../../../../Common/PlatformBase/MapLayer/MapCollection.h" />
+ <Header path="../../../../Common/PlatformBase/MapLayer/ReadOnlyLayerCollection.h" />
+ <Header path="../../../../Common/PlatformBase/MapLayer/SelectionBase.h" />
+
+ <!-- MapGuideCommon classes -->
+
+ <Header path="../../../../Common/MapGuideCommon/Services/DrawingService.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/DwfVersion.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/FeatureInformation.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/KmlService.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/Layout.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/MappingService.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/MapPlot.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/MapPlotCollection.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/Metatile.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/PackageStatusInformation.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/PlotSpecification.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/ProfilingService.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/RenderingOptions.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/RenderingService.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/ServerAdmin.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/Site.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/SiteConnection.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/SiteInfo.h" />
+ <Header path="../../../../Common/MapGuideCommon/Services/TileService.h" />
+
+ <Header path="../../../../Common/MapGuideCommon/System/UserInformation.h" />
+
+ <Header path="../../../../Common/MapGuideCommon/MapLayer/Layer.h" />
+ <Header path="../../../../Common/MapGuideCommon/MapLayer/Map.h" />
+ <Header path="../../../../Common/MapGuideCommon/MapLayer/Selection.h" />
+
+ <!-- WebApp classes -->
+
+ <Header path="../../../../Web/src/WebApp/WebCommand.h" />
+ <Header path="../../../../Web/src/WebApp/WebUiTargetCommand.h" />
+ <Header path="../../../../Web/src/WebApp/WebWidget.h" />
+ <Header path="../../../../Web/src/WebApp/WebWidgetCollection.h" />
+ <Header path="../../../../Web/src/WebApp/WebUiPane.h" />
+ <Header path="../../../../Web/src/WebApp/WebUiSizablePane.h" />
+
+ <Header path="../../../../Web/src/WebApp/WebBufferCommand.h" />
+ <Header path="../../../../Web/src/WebApp/WebCommandCollection.h" />
+ <Header path="../../../../Web/src/WebApp/WebCommandWidget.h" />
+ <Header path="../../../../Web/src/WebApp/WebContextMenu.h" />
+ <Header path="../../../../Web/src/WebApp/WebFlyoutWidget.h" />
+ <Header path="../../../../Web/src/WebApp/WebGetPrintablePageCommand.h" />
+ <Header path="../../../../Web/src/WebApp/WebHelpCommand.h" />
+ <Header path="../../../../Web/src/WebApp/WebInformationPane.h" />
+ <Header path="../../../../Web/src/WebApp/WebInvokeScriptCommand.h" />
+ <Header path="../../../../Web/src/WebApp/WebInvokeUrlCommand.h" />
+ <Header path="../../../../Web/src/WebApp/WebLayout.h" />
+ <Header path="../../../../Web/src/WebApp/WebMeasureCommand.h" />
+ <Header path="../../../../Web/src/WebApp/WebPrintCommand.h" />
+ <Header path="../../../../Web/src/WebApp/WebSearchCommand.h" />
+ <Header path="../../../../Web/src/WebApp/WebSelectWithinCommand.h" />
+ <Header path="../../../../Web/src/WebApp/WebSeparatorWidget.h" />
+ <Header path="../../../../Web/src/WebApp/WebTaskBar.h" />
+ <Header path="../../../../Web/src/WebApp/WebTaskBarWidget.h" />
+ <Header path="../../../../Web/src/WebApp/WebTaskPane.h" />
+ <Header path="../../../../Web/src/WebApp/WebToolbar.h" />
+ <Header path="../../../../Web/src/WebApp/WebViewOptionsCommand.h" />
+
+ <!-- HttpHandler classes -->
+
+ <Header path="../../../../Web/src/HttpHandler/HttpHeader.h" />
+ <Header path="../../../../Web/src/HttpHandler/HttpPrimitiveValue.h" />
+ <Header path="../../../../Web/src/HttpHandler/HttpRequest.h" />
+ <Header path="../../../../Web/src/HttpHandler/HttpRequestMetadata.h" />
+ <Header path="../../../../Web/src/HttpHandler/HttpRequestParam.h" />
+ <Header path="../../../../Web/src/HttpHandler/HttpResponse.h" />
+ <Header path="../../../../Web/src/HttpHandler/HttpResult.h" />
+
+</Headers>
+
+</Parameters>
Index: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php 2020-11-06 17:33:48 UTC (rev 9758)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+PhpApi.vcxproj.user
Modified: sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php/PhpApi.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php/PhpApi.vcxproj 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Bindings/Php/PhpApi.vcxproj 2020-11-06 17:33:48 UTC (rev 9758)
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
@@ -24,16 +16,6 @@
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
@@ -47,12 +29,6 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
@@ -62,73 +38,21 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\packages\php\$(Configuration)\x86\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\obj\$(Configuration)\PhpApi\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\packages\php\$(Configuration)\x64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\obj\$(Configuration)64\PhpApi\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\packages\php\$(Configuration)\x86\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\obj\$(Configuration)\PhpApi\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\packages\php\$(Configuration)\x64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\obj\$(Configuration)64\PhpApi\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">php_MapGuideApid</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">php_MapGuideApid</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">php_MapGuideApi</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">php_MapGuideApi</TargetName>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent>
- <Command>"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l PHP -o ./constants.php -t
-copy .\constants.php ..\mapadmin
-copy .\constants.php ..\mapviewerphp
-copy .\php.i "$(ProjectDir)language.i"
-"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l PHP
-$(SWIG_TOOL_PATH)\swig -c++ -php7 -DWIN32 -DPHPSWIG -nodefaultctor -nodefaultdtor -o "$(ProjectDir)MgApi_wrap_orig.cpp" MapGuideApi.i
-move /Y "$(ProjectDir)\*.php" "$(OutDir)"
-sed "s#(MapGuideApi_globals.error_msg)#ZEND_MODULE_GLOBALS_ACCESSOR(MapGuideApi, error_msg)#g; s#(MapGuideApi_globals.error_code)#ZEND_MODULE_GLOBALS_ACCESSOR(MapGuideApi, error_code)#g" "$(ProjectDir)MgApi_wrap_orig.cpp" > "$(ProjectDir)MgApi_wrap.cpp"
-</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;SWIG_PUBLIC_API;_XKEYCHECK_H;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;PHP;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACEd.lib;php7.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)php_MapGuideApid.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB);..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)php_MapGuideApid.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>..\..\lib\$(Configuration)\php_MapGuideApid.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l PHP -o ./constants.php -t
@@ -143,7 +67,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Web\src\HttpHandler;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;SWIG_PUBLIC_API;_XKEYCHECK_H;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;PHP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -167,45 +91,6 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent>
- <Command>"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l PHP -o ./constants.php -t
-copy .\constants.php ..\mapadmin
-copy .\constants.php ..\mapviewerphp
-copy .\php.i "$(ProjectDir)language.i"
-"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\MapGuideApiGen.xml" -l PHP
-$(SWIG_TOOL_PATH)\swig -c++ -php7 -DWIN32 -DPHPSWIG -nodefaultctor -nodefaultdtor -o "$(ProjectDir)MgApi_wrap_orig.cpp" MapGuideApi.i
-move /Y "$(ProjectDir)\*.php" "$(OutDir)"
-sed "s#(MapGuideApi_globals.error_msg)#ZEND_MODULE_GLOBALS_ACCESSOR(MapGuideApi, error_msg)#g; s#(MapGuideApi_globals.error_code)#ZEND_MODULE_GLOBALS_ACCESSOR(MapGuideApi, error_code)#g" "$(ProjectDir)MgApi_wrap_orig.cpp" > "$(ProjectDir)MgApi_wrap.cpp"
-</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>$(MG_SDK_INC);$(MG_HTTPHANDLER_INCLUDE_DIR);$(MG_WEBAPP_INCLUDE_DIR);$(MG_WEBSUPPORT_INCLUDE_DIR);$(MG_MDFMODEL_INCLUDE_DIR);$(MG_FOUNDATION_INCLUDE_DIR);$(MG_GEOMETRY_INCLUDE_DIR);$(MG_PLATFORMBASE_INCLUDE_DIR);$(MG_MAPGUIDECOMMON_INCLUDE_DIR);$(MG_OEM_ACE_INCLUDE_DIR);$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;SWIG_PUBLIC_API;_XKEYCHECK_H;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;PHP;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACE.lib;php7.lib;MgFoundation.lib;MgGeometry.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)php_MapGuideApi.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB);..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)php_MapGuideApi.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>..\..\lib\$(Configuration)\php_MapGuideApi.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>"..\..\IMake\Win32\IMake.exe" -p "$(ProjectDir)..\MapGuideApi\Constants.xml" -l PHP -o ./constants.php -t
@@ -253,8 +138,6 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="MgApi_wrap.cpp">
- <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PreprocessToFile>
- <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PreprocessSuppressLineNumbers>
<PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</PreprocessToFile>
<PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</PreprocessSuppressLineNumbers>
</ClCompile>
Index: sandbox/jng/vanilla_swig/Bindings/src/IMake
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/IMake 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/IMake 2020-11-06 17:33:48 UTC (rev 9758)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/IMake
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+Release
+Win32
+IMake.vcxproj.user
Modified: sandbox/jng/vanilla_swig/Bindings/src/IMake/IMake.vcxproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/IMake/IMake.vcxproj 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/IMake/IMake.vcxproj 2020-11-06 17:33:48 UTC (rev 9758)
@@ -59,7 +59,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <AdditionalIncludeDirectories>..\..\thirdparty\tclap-1.2.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Oem\tclap-1.2.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<OutputFile>$(OutDir)IMake.exe</OutputFile>
@@ -78,7 +78,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <AdditionalIncludeDirectories>..\..\thirdparty\tclap-1.2.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Oem\tclap-1.2.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<OutputFile>$(OutDir)IMake.exe</OutputFile>
Index: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi 2020-11-06 17:33:48 UTC (rev 9758)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+*.cs
+bin
+obj
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-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj 2020-11-06 17:33:48 UTC (rev 9758)
@@ -5,13 +5,15 @@
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PlatformTarget>AnyCPU</PlatformTarget>
- <Version>3.1.1.9389</Version>
- <PackageLicenseUrl>https://www.gnu.org/licenses/lgpl-2.1.txt</PackageLicenseUrl>
- <PackageProjectUrl>https://github.com/jumpinjackie/mapguide-api-bindings/</PackageProjectUrl>
- <RepositoryUrl>https://github.com/jumpinjackie/mapguide-api-bindings/</RepositoryUrl>
+ <Version>4.0.0.0</Version>
+ <PackageProjectUrl>https://mapguide.osgeo.org/</PackageProjectUrl>
+ <RepositoryUrl>https://mapguide.osgeo.org/</RepositoryUrl>
<PackageIconUrl>https://mapguide.osgeo.org/</PackageIconUrl>
<PackageTags>MapGuide GIS Geospatial Maps</PackageTags>
- <Authors>Jackie Ng</Authors>
+ <Authors>OSGeo</Authors>
+ <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+ <PackageLicenseExpression></PackageLicenseExpression>
+ <PackageLicenseFile>License.txt</PackageLicenseFile>
</PropertyGroup>
<ItemGroup>
@@ -19,4 +21,11 @@
<Content Include="runtimes/**" PackagePath="%(Identity)" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\..\..\License.txt">
+ <Pack>True</Pack>
+ <PackagePath></PackagePath>
+ </None>
+ </ItemGroup>
+
</Project>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/Properties/AssemblyInfo.cs
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/Properties/AssemblyInfo.cs 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/Properties/AssemblyInfo.cs 2020-11-06 17:33:48 UTC (rev 9758)
@@ -25,7 +25,7 @@
// associated with an assembly.
//
[assembly: AssemblyTitle("MapGuide .net API Dynamic Link Library")]
-[assembly: AssemblyDescription(".net wrapper for the MapGuide API")]
+[assembly: AssemblyDescription(".net wrapper for the MapGuide API (64-bit only)")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("MapGuide Open Source")]
@@ -45,9 +45,9 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("3.1.1.9389")]
-[assembly: AssemblyFileVersion("3.1.1.9389")]
-[assembly: AssemblyInformationalVersion("3.1.1.9389")]
+[assembly: AssemblyVersion("4.0.0.9389")]
+[assembly: AssemblyFileVersion("4.0.0.9389")]
+[assembly: AssemblyInformationalVersion("4.0.0.0")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Index: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/runtimes/win-x64/native
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/runtimes/win-x64/native 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/runtimes/win-x64/native 2020-11-06 17:33:48 UTC (rev 9758)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/runtimes/win-x64/native
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+*.dll
+*.pdb
Index: sandbox/jng/vanilla_swig/Bindings/src/Tools/swig
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Tools/swig 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Bindings/src/Tools/swig 2020-11-06 17:33:48 UTC (rev 9758)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Tools/swig
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+install
Added: sandbox/jng/vanilla_swig/Bindings/src/Tools/swig/readme.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Tools/swig/readme.txt (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Tools/swig/readme.txt 2020-11-06 17:33:48 UTC (rev 9758)
@@ -0,0 +1 @@
+Extract SWIG to the install subdirectory here
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Common/Foundation/Foundation.h
===================================================================
--- sandbox/jng/vanilla_swig/Common/Foundation/Foundation.h 2020-11-06 16:04:14 UTC (rev 9757)
+++ sandbox/jng/vanilla_swig/Common/Foundation/Foundation.h 2020-11-06 17:33:48 UTC (rev 9758)
@@ -45,14 +45,15 @@
// ignore warnings about using deprecated methods
#pragma warning(disable: 4996)
-// Unfortunately, we must leak this header out in a SWIG generation context as ACE_Recursive_Thread_Mutex
-// is a private and public member of several classes thare are exported out to the public MapGuide API
-// surface area (MgGuardDisposable/MgSiteManager)
+#ifdef SWIG_PUBLIC_API
+// ACE_Recursive_Thread_Mutex and ACE_thread_t are currently exposed as private members of several
+// classes thare are exported out to the public MapGuide API surface area (MgGuardDisposable/MgSiteManager)
//
-// Every other ACE type/header however are internal implementation details that can be safely walled-off
-// with SWIG_PUBLIC_API or forward-declared away to reduce the ACE header surface area to this one single
-// header below
-#include "ace/Recursive_Thread_Mutex.h"
+// Private members do not (at least for us) factor into the SWIG code generation context, so for the
+// purpose of SWIG codegen, we can just stub these missing types
+typedef int ACE_thread_t;
+class ACE_Recursive_Thread_Mutex { };
+#endif
#ifndef SWIG_PUBLIC_API
#include "ace/Init_ACE.h"
More information about the mapguide-commits
mailing list