[mapguide-commits] r9393 - in branches/3.1/MgDev: Common/Foundation Common/Foundation/Data Common/Foundation/System Common/MapGuideCommon Common/MapGuideCommon/Services Common/PlatformBase/MapLayer Oem/SQLite/src/SQLitePhpApi Oem/SWIGEx Oem/SWIGEx/Source/Modules Oem/SWIGEx/Win32 Oem/php Web/src/DotNetUnmanagedApi/Foundation Web/src/DotNetUnmanagedApi/Geometry Web/src/DotNetUnmanagedApi/MapGuideCommon Web/src/DotNetUnmanagedApi/PlatformBase Web/src/DotNetUnmanagedApi/Web Web/src/JavaApi Web/src/JavaApiEx Web/src/MapGuideApi Web/src/PhpApi Web/src/WebApp
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Jun 2 08:49:47 PDT 2018
Author: jng
Date: 2018-06-02 08:49:46 -0700 (Sat, 02 Jun 2018)
New Revision: 9393
Added:
branches/3.1/MgDev/Oem/SWIGEx/SwigEx.vcxproj
branches/3.1/MgDev/Oem/SWIGEx/SwigEx.vcxproj.filters
Removed:
branches/3.1/MgDev/Oem/php/TSRM/
Modified:
branches/3.1/MgDev/Common/Foundation/Data/ByteSink.h
branches/3.1/MgDev/Common/Foundation/Foundation.h
branches/3.1/MgDev/Common/Foundation/System/GuardDisposable.h
branches/3.1/MgDev/Common/MapGuideCommon/MapGuideCommon.h
branches/3.1/MgDev/Common/MapGuideCommon/Services/SiteConnection.h
branches/3.1/MgDev/Common/MapGuideCommon/Services/SiteManager.h
branches/3.1/MgDev/Common/PlatformBase/MapLayer/LayerBase.h
branches/3.1/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj
branches/3.1/MgDev/Oem/SWIGEx/Source/Modules/csharp.cxx
branches/3.1/MgDev/Oem/SWIGEx/SwigEx.sln
branches/3.1/MgDev/Oem/SWIGEx/Win32/Swig.exe
branches/3.1/MgDev/Oem/php/PROVENANCE.TXT
branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj
branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml
branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj
branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml
branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj
branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml
branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj
branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml
branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj
branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml
branches/3.1/MgDev/Web/src/JavaApi/JavaApi.vcxproj
branches/3.1/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj
branches/3.1/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml
branches/3.1/MgDev/Web/src/PhpApi/PhpApi.vcxproj
branches/3.1/MgDev/Web/src/WebApp/WebApp.h
branches/3.1/MgDev/Web/src/WebApp/WebLayout.h
Log:
Introduce a new preprocessor symbol SWIG_PUBLIC_API
With this symbol, we #ifdef out and forward-declare as much of ACE and xerces types and headers in our MapGuide common headers. The only ACE header that is leaked out now is the header for ACE_Recursive_Thread_Mutex as that is present as member of several classes in the public MapGuide API surface.
In our SWIG binding projects, SWIG_PUBLIC_API is defined. All other consuming projects do not define this symbol so they see the original set of ACE and xerces headers.
This change slightly breaks the SWIG C++ glue code for .net (which used un-qualified list), so our internal copy of SWIG is updated to use fully qualified list (std::list) and our various SWIG parameter files include the <list> header.
This change eliminates the need for us to maintain a patched copy of TSRM/readdir.h for PHP, so that is removed.
Fixes #2781
Modified: branches/3.1/MgDev/Common/Foundation/Data/ByteSink.h
===================================================================
--- branches/3.1/MgDev/Common/Foundation/Data/ByteSink.h 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Common/Foundation/Data/ByteSink.h 2018-06-02 15:49:46 UTC (rev 9393)
@@ -18,6 +18,8 @@
#ifndef MG_BYTE_SINK_H
#define MG_BYTE_SINK_H
+class ACE_SOCK_Stream;
+
/// \defgroup MgByteSink MgByteSink
/// \ingroup Common_Module
/// \{
Modified: branches/3.1/MgDev/Common/Foundation/Foundation.h
===================================================================
--- branches/3.1/MgDev/Common/Foundation/Foundation.h 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Common/Foundation/Foundation.h 2018-06-02 15:49:46 UTC (rev 9393)
@@ -45,6 +45,16 @@
// 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)
+//
+// 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"
+
+#ifndef SWIG_PUBLIC_API
#include "ace/Init_ACE.h"
#include "ace/INET_Addr.h"
@@ -71,7 +81,7 @@
#include "ace/Configuration_Import_Export.h"
#include "ace/Process_Manager.h"
#include "ace/Date_Time.h"
-
+#endif
#undef GetObject
#include "FoundationDefs.h"
#include "System/FoundationClassId.h"
@@ -90,6 +100,7 @@
#include "Data/ByteSource.h"
#include "Data/ByteSink.h"
+#ifndef SWIG_PUBLIC_API
#include "System/PacketStructure.h"
#include "System/StreamData.h"
#include "System/PacketParser.h"
@@ -101,6 +112,7 @@
#include "System/StreamWriter.h"
#include "System/Stream.h"
#include "System/StreamParser.h"
+#endif
#include "../MdfModel/UnicodeString.h"
#include "Data/Collection.h"
@@ -118,12 +130,13 @@
#include "System/FoundationConfigProperties.h"
#include "System/FileUtil.h"
#include "System/Util.h"
-
+#ifndef SWIG_PUBLIC_API
#include "System/ConfigurationSection.h"
#include "System/ConfigurationSectionCollection.h"
#include "System/ConfigurationHeap.h"
#include "System/Configuration.h"
#include "System/Resources.h"
+#endif
// Base exception classes and defines
#include "Exception/ExceptionDefs.h"
@@ -181,6 +194,7 @@
#include "Exception/XmlParserException.h"
+#ifndef SWIG_PUBLIC_API
#include "System/ByteSourceFileImpl.h"
#include "System/ByteSourceMemoryImpl.h"
@@ -227,4 +241,6 @@
static const int MG_MSG_NOSIGNAL = MSG_NOSIGNAL;
#endif
+#endif /* SWIG_PUBLIC_API */
+
#endif
Modified: branches/3.1/MgDev/Common/Foundation/System/GuardDisposable.h
===================================================================
--- branches/3.1/MgDev/Common/Foundation/System/GuardDisposable.h 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Common/Foundation/System/GuardDisposable.h 2018-06-02 15:49:46 UTC (rev 9393)
@@ -18,7 +18,7 @@
#ifndef _MGGUARDDISPOSABLE_H_
#define _MGGUARDDISPOSABLE_H_
-#include "ace/Process_Manager.h"
+class ACE_Recursive_Thread_Mutex;
/// \cond INTERNAL
/////////////////////////////////////////////////////////////////
Modified: branches/3.1/MgDev/Common/MapGuideCommon/MapGuideCommon.h
===================================================================
--- branches/3.1/MgDev/Common/MapGuideCommon/MapGuideCommon.h 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Common/MapGuideCommon/MapGuideCommon.h 2018-06-02 15:49:46 UTC (rev 9393)
@@ -53,10 +53,13 @@
#include "System/MapGuideCommonClassId.h"
#include "System/ConfigProperties.h"
#include "System/UserInformation.h"
+
+#ifndef SWIG_PUBLIC_API
#include "System/MapGuideStream.h"
#include "System/CryptographyManager.h"
#include "Util/IpUtil.h"
#include "Util/TimerUtil.h"
+#endif
#include "MapLayer/Layer.h"
#include "MapLayer/Map.h"
@@ -121,8 +124,10 @@
#include "Exception/UnsupportedProviderThreadModelException.h"
#include "Exception/UriFormatException.h"
+#ifndef SWIG_PUBLIC_API
#include "Net/IOperationHandler.h"
#include "Services/Command.h"
+#endif
#include "Services/Site.h"
#include "Services/SiteInfo.h"
#include "Services/SiteManager.h"
@@ -169,9 +174,11 @@
#include "Services/ServerAdmin.h"
#include "Services/ServerAdminDefs.h"
#include "Services/ServerConnection.h"
+#ifndef SWIG_PUBLIC_API
#include "Services/ServerConnectionImp.h"
#include "Services/ServerConnectionPool.h"
#include "Services/ServerConnectionStack.h"
+#endif
#include "Services/ServerInformation.h"
#include "Services/UnitType.h"
Modified: branches/3.1/MgDev/Common/MapGuideCommon/Services/SiteConnection.h
===================================================================
--- branches/3.1/MgDev/Common/MapGuideCommon/Services/SiteConnection.h 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Common/MapGuideCommon/Services/SiteConnection.h 2018-06-02 15:49:46 UTC (rev 9393)
@@ -21,6 +21,7 @@
// Forward declare MgConfiguration to avoid ACE header dependency
class MgConfiguration;
class MG_MAPGUIDE_API MgSiteConnection;
+class MG_MAPGUIDE_API MgServerConnection;
class MG_MAPGUIDE_API MgServerConnectionStack;
#ifdef _WIN32
Modified: branches/3.1/MgDev/Common/MapGuideCommon/Services/SiteManager.h
===================================================================
--- branches/3.1/MgDev/Common/MapGuideCommon/Services/SiteManager.h 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Common/MapGuideCommon/Services/SiteManager.h 2018-06-02 15:49:46 UTC (rev 9393)
@@ -20,6 +20,7 @@
class MgSiteInfo;
typedef std::vector<MgSiteInfo*> MgSiteVector;
+class ACE_Recursive_Thread_Mutex;
/// \cond INTERNAL
// Data structure which is passed to thread
Modified: branches/3.1/MgDev/Common/PlatformBase/MapLayer/LayerBase.h
===================================================================
--- branches/3.1/MgDev/Common/PlatformBase/MapLayer/LayerBase.h 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Common/PlatformBase/MapLayer/LayerBase.h 2018-06-02 15:49:46 UTC (rev 9393)
@@ -18,6 +18,8 @@
#ifndef _MG_LAYER_BASE_H_
#define _MG_LAYER_BASE_H_
+#include <list>
+
BEGIN_NAMESPACE_MDFMODEL
class LayerDefinition;
END_NAMESPACE_MDFMODEL
Modified: branches/3.1/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj
===================================================================
--- branches/3.1/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj 2018-06-02 15:49:46 UTC (rev 9393)
@@ -101,7 +101,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\ACE\ACE_wrappers;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\ext\w32api;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\Exceptions;..\SQLite3;..\SqliteVM;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITEPHPAPI_EXPORTS;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;SQLITEPHPAPI_EXPORTS;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -138,7 +138,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\ACE\ACE_wrappers;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\ext\w32api;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\Exceptions;..\SQLite3;..\SqliteVM;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITEPHPAPI_EXPORTS;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;SQLITEPHPAPI_EXPORTS;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -172,7 +172,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\ACE\ACE_wrappers;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\ext\w32api;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\Exceptions;..\SQLite3;..\SqliteVM;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITEPHPAPI_EXPORTS;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;SQLITEPHPAPI_EXPORTS;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -210,7 +210,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\ACE\ACE_wrappers;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\ext\w32api;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\Exceptions;..\SQLite3;..\SqliteVM;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITEPHPAPI_EXPORTS;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;SQLITEPHPAPI_EXPORTS;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
Modified: branches/3.1/MgDev/Oem/SWIGEx/Source/Modules/csharp.cxx
===================================================================
--- branches/3.1/MgDev/Oem/SWIGEx/Source/Modules/csharp.cxx 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Oem/SWIGEx/Source/Modules/csharp.cxx 2018-06-02 15:49:46 UTC (rev 9393)
@@ -717,7 +717,7 @@
Printf(f, "\t\tstrcat(exName, multibyteExName);\n");
Printf(f, "\t\tbool bFound = false;\n");
- Printf(f, "\t\tfor(list<char*>::const_iterator iter = exNames.begin(); iter != exNames.end(); iter++) {\n");
+ Printf(f, "\t\tfor(std::list<char*>::const_iterator iter = exNames.begin(); iter != exNames.end(); iter++) {\n");
Printf(f, "\t\t\tif (strcmp(*iter, exName) == 0) {\n");
Printf(f, "\t\t\t\tdelete[] exName;\n");
Printf(f, "\t\t\t\texName = *iter;\n");
@@ -742,7 +742,7 @@
Printf(f, "#endif\n\n");
Printf(f, "void ThrowDotNetExceptionWrapper(%s* e)\n{\n", baseException);
- Printf(f, "\tstatic list<char*> exNames;\n");
+ Printf(f, "\tstatic std::list<char*> exNames;\n");
Printf(f, "\tchar* exName = NULL;\n");
if(rethrowCode)
{
Modified: branches/3.1/MgDev/Oem/SWIGEx/SwigEx.sln
===================================================================
--- branches/3.1/MgDev/Oem/SWIGEx/SwigEx.sln 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Oem/SWIGEx/SwigEx.sln 2018-06-02 15:49:46 UTC (rev 9393)
@@ -1,6 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SwigEx", "SwigEx.vcproj", "{18F8AE78-14F3-4C6A-9768-CF5A1A5194D7}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2018
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SwigEx", "SwigEx.vcxproj", "{18F8AE78-14F3-4C6A-9768-CF5A1A5194D7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,4 +18,7 @@
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {79F6288B-D6E6-4D5B-AA8E-A3171117FEF2}
+ EndGlobalSection
EndGlobal
Added: branches/3.1/MgDev/Oem/SWIGEx/SwigEx.vcxproj
===================================================================
--- branches/3.1/MgDev/Oem/SWIGEx/SwigEx.vcxproj (rev 0)
+++ branches/3.1/MgDev/Oem/SWIGEx/SwigEx.vcxproj 2018-06-02 15:49:46 UTC (rev 9393)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.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="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{18F8AE78-14F3-4C6A-9768-CF5A1A5194D7}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v141</PlatformToolset>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <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>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>15.0.27625.0</_ProjectFileVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>Win32\</OutDir>
+ <IntDir>Debug\</IntDir>
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>Win32\</OutDir>
+ <IntDir>Release\</IntDir>
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>Source\Swig;Source\DOH;Source\Include;Source\Preprocessor;Source\Modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader />
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)Swig.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)SwigEx.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>Source\Swig;Source\DOH;Source\Include;Source\Preprocessor;Source\Modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <PrecompiledHeader />
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)Swig.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="Source\CParse\cscanner.c" />
+ <ClCompile Include="Source\CParse\parser.c" />
+ <ClCompile Include="Source\CParse\templ.c" />
+ <ClCompile Include="Source\CParse\util.c" />
+ <ClCompile Include="Source\Doh\base.c" />
+ <ClCompile Include="Source\Doh\file.c" />
+ <ClCompile Include="Source\Doh\fio.c" />
+ <ClCompile Include="Source\Doh\hash.c" />
+ <ClCompile Include="Source\Doh\list.c" />
+ <ClCompile Include="Source\Doh\memory.c" />
+ <ClCompile Include="Source\Doh\string.c" />
+ <ClCompile Include="Source\Doh\void.c" />
+ <ClCompile Include="Source\Modules\allocate.cxx" />
+ <ClCompile Include="Source\Modules\browser.cxx" />
+ <ClCompile Include="Source\Modules\chicken.cxx" />
+ <ClCompile Include="Source\Modules\contract.cxx" />
+ <ClCompile Include="Source\Modules\csharp.cxx" />
+ <ClCompile Include="Source\Modules\directors.cxx" />
+ <ClCompile Include="Source\Modules\emit.cxx" />
+ <ClCompile Include="Source\Modules\guile.cxx" />
+ <ClCompile Include="Source\Modules\java.cxx" />
+ <ClCompile Include="Source\Modules\lang.cxx" />
+ <ClCompile Include="Source\Modules\main.cxx" />
+ <ClCompile Include="Source\Modules\module.cxx" />
+ <ClCompile Include="Source\Modules\mzscheme.cxx" />
+ <ClCompile Include="Source\Modules\ocaml.cxx" />
+ <ClCompile Include="Source\Modules\overload.cxx" />
+ <ClCompile Include="Source\Modules\perl5.cxx" />
+ <ClCompile Include="Source\Modules\php4.cxx" />
+ <ClCompile Include="Source\Modules\php5.cxx" />
+ <ClCompile Include="Source\Modules\pike.cxx" />
+ <ClCompile Include="Source\Modules\python.cxx" />
+ <ClCompile Include="Source\Modules\ruby.cxx" />
+ <ClCompile Include="Source\Modules\s-exp.cxx" />
+ <ClCompile Include="Source\Modules\swigmain.cxx" />
+ <ClCompile Include="Source\Modules\tcl8.cxx">
+ <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PreprocessToFile>
+ <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PreprocessSuppressLineNumbers>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\typepass.cxx" />
+ <ClCompile Include="Source\Modules\utils.cxx" />
+ <ClCompile Include="Source\Modules\xml.cxx" />
+ <ClCompile Include="Source\Preprocessor\cpp.c" />
+ <ClCompile Include="Source\Preprocessor\expr.c" />
+ <ClCompile Include="Source\Swig\cwrap.c" />
+ <ClCompile Include="Source\Swig\error.c" />
+ <ClCompile Include="Source\Swig\fragment.c" />
+ <ClCompile Include="Source\Swig\getopt.c" />
+ <ClCompile Include="Source\Swig\include.c" />
+ <ClCompile Include="Source\Swig\misc.c" />
+ <ClCompile Include="Source\Swig\naming.c" />
+ <ClCompile Include="Source\Swig\parms.c" />
+ <ClCompile Include="Source\Swig\scanner.c" />
+ <ClCompile Include="Source\Swig\stype.c" />
+ <ClCompile Include="Source\Swig\symbol.c" />
+ <ClCompile Include="Source\Swig\tree.c" />
+ <ClCompile Include="Source\Swig\typemap.c" />
+ <ClCompile Include="Source\Swig\typeobj.c" />
+ <ClCompile Include="Source\Swig\typesys.c" />
+ <ClCompile Include="Source\Swig\warn.c" />
+ <ClCompile Include="Source\Swig\wrapfunc.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Source\Doh\doh.h" />
+ <ClInclude Include="Source\Doh\dohint.h" />
+ <ClInclude Include="Source\Modules\ExceptionClass.h" />
+ <ClInclude Include="Source\Swig\swig.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: branches/3.1/MgDev/Oem/SWIGEx/SwigEx.vcxproj.filters
===================================================================
--- branches/3.1/MgDev/Oem/SWIGEx/SwigEx.vcxproj.filters (rev 0)
+++ branches/3.1/MgDev/Oem/SWIGEx/SwigEx.vcxproj.filters 2018-06-02 15:49:46 UTC (rev 9393)
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Source Files\CParse">
+ <UniqueIdentifier>{26f85adf-1e7c-4abb-a0eb-4ba5473a9ac9}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\DOH">
+ <UniqueIdentifier>{7d3d3221-b5ec-4883-a45a-b1c338fe32df}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\Swig">
+ <UniqueIdentifier>{2dc0d219-ed8c-4295-adbd-8230ff6b02a5}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\Modules">
+ <UniqueIdentifier>{167abe99-4a4e-4979-a563-fe03774745b4}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\Preprocessor">
+ <UniqueIdentifier>{cb2a8ae2-a720-4e59-b76c-ff2d2a5d1483}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="Source\CParse\cscanner.c">
+ <Filter>Source Files\CParse</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\CParse\parser.c">
+ <Filter>Source Files\CParse</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\CParse\templ.c">
+ <Filter>Source Files\CParse</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\CParse\util.c">
+ <Filter>Source Files\CParse</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Doh\base.c">
+ <Filter>Source Files\DOH</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Doh\file.c">
+ <Filter>Source Files\DOH</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Doh\fio.c">
+ <Filter>Source Files\DOH</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Doh\hash.c">
+ <Filter>Source Files\DOH</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Doh\list.c">
+ <Filter>Source Files\DOH</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Doh\memory.c">
+ <Filter>Source Files\DOH</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Doh\string.c">
+ <Filter>Source Files\DOH</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Doh\void.c">
+ <Filter>Source Files\DOH</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\cwrap.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\error.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\fragment.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\getopt.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\include.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\misc.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\naming.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\parms.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\scanner.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\stype.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\symbol.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\tree.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\typemap.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\typeobj.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\typesys.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\warn.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Swig\wrapfunc.c">
+ <Filter>Source Files\Swig</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\allocate.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\browser.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\chicken.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\contract.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\csharp.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\directors.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\emit.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\guile.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\java.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\lang.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\main.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\module.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\mzscheme.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\ocaml.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\overload.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\perl5.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\php4.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\php5.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\pike.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\python.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\ruby.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\s-exp.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\swigmain.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\tcl8.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\typepass.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\utils.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Modules\xml.cxx">
+ <Filter>Source Files\Modules</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Preprocessor\cpp.c">
+ <Filter>Source Files\Preprocessor</Filter>
+ </ClCompile>
+ <ClCompile Include="Source\Preprocessor\expr.c">
+ <Filter>Source Files\Preprocessor</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="Source\Doh\doh.h">
+ <Filter>Source Files\DOH</Filter>
+ </ClInclude>
+ <ClInclude Include="Source\Doh\dohint.h">
+ <Filter>Source Files\DOH</Filter>
+ </ClInclude>
+ <ClInclude Include="Source\Swig\swig.h">
+ <Filter>Source Files\Swig</Filter>
+ </ClInclude>
+ <ClInclude Include="Source\Modules\ExceptionClass.h">
+ <Filter>Source Files\Modules</Filter>
+ </ClInclude>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Modified: branches/3.1/MgDev/Oem/SWIGEx/Win32/Swig.exe
===================================================================
(Binary files differ)
Modified: branches/3.1/MgDev/Oem/php/PROVENANCE.TXT
===================================================================
--- branches/3.1/MgDev/Oem/php/PROVENANCE.TXT 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Oem/php/PROVENANCE.TXT 2018-06-02 15:49:46 UTC (rev 9393)
@@ -12,9 +12,3 @@
Extracted from official PHP 5.5.3 source tarball (http://www.php.net/downloads.php)
Patched for compatibility with ACE
-
-TSRM\readdir.h
-
- Extracted from official PHP 5.5.3 source tarball (http://www.php.net/downloads.php)
-
- Patched for compatibility with ACE
Modified: branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj
===================================================================
--- branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj 2018-06-02 15:49:46 UTC (rev 9393)
@@ -103,7 +103,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -140,7 +140,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -177,7 +177,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -215,7 +215,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Modified: branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml
===================================================================
--- branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml 2018-06-02 15:49:46 UTC (rev 9393)
@@ -26,6 +26,7 @@
#include <string>
#include <map>
+#include <list>
#include "Foundation.h"
Modified: branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj
===================================================================
--- branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj 2018-06-02 15:49:46 UTC (rev 9393)
@@ -103,7 +103,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -140,7 +140,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -177,7 +177,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -215,7 +215,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Modified: branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml
===================================================================
--- branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml 2018-06-02 15:49:46 UTC (rev 9393)
@@ -26,6 +26,7 @@
#include <string>
#include <map>
+#include <list>
#include "Foundation.h"
#include "GeometryCommon.h"
Modified: branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj
===================================================================
--- branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj 2018-06-02 15:49:46 UTC (rev 9393)
@@ -103,7 +103,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -140,7 +140,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -177,7 +177,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -215,7 +215,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Modified: branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml
===================================================================
--- branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml 2018-06-02 15:49:46 UTC (rev 9393)
@@ -26,6 +26,7 @@
#include <string>
#include <map>
+#include <list>
#include "Foundation.h"
#include "GeometryCommon.h"
Modified: branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj
===================================================================
--- branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj 2018-06-02 15:49:46 UTC (rev 9393)
@@ -103,7 +103,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -140,7 +140,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -177,7 +177,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -215,7 +215,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Modified: branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml
===================================================================
--- branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml 2018-06-02 15:49:46 UTC (rev 9393)
@@ -26,6 +26,7 @@
#include <string>
#include <map>
+#include <list>
#include "Foundation.h"
#include "GeometryCommon.h"
Modified: branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj
===================================================================
--- branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj 2018-06-02 15:49:46 UTC (rev 9393)
@@ -103,7 +103,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -140,7 +140,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -177,7 +177,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -215,7 +215,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Modified: branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml
===================================================================
--- branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml 2018-06-02 15:49:46 UTC (rev 9393)
@@ -26,6 +26,7 @@
#include <string>
#include <map>
+#include <list>
#include "MapGuideCommon.h"
#include "WebApp.h"
Modified: branches/3.1/MgDev/Web/src/JavaApi/JavaApi.vcxproj
===================================================================
--- branches/3.1/MgDev/Web/src/JavaApi/JavaApi.vcxproj 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/JavaApi/JavaApi.vcxproj 2018-06-02 15:49:46 UTC (rev 9393)
@@ -109,7 +109,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -149,7 +149,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -189,7 +189,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -230,7 +230,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Modified: branches/3.1/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- branches/3.1/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj 2018-06-02 15:49:46 UTC (rev 9393)
@@ -109,7 +109,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -149,7 +149,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -190,7 +190,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -231,7 +231,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;SWIG_PUBLIC_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Modified: branches/3.1/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml
===================================================================
--- branches/3.1/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml 2018-06-02 15:49:46 UTC (rev 9393)
@@ -17,6 +17,15 @@
<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>
Modified: branches/3.1/MgDev/Web/src/PhpApi/PhpApi.vcxproj
===================================================================
--- branches/3.1/MgDev/Web/src/PhpApi/PhpApi.vcxproj 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/PhpApi/PhpApi.vcxproj 2018-06-02 15:49:46 UTC (rev 9393)
@@ -104,7 +104,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -139,7 +139,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -174,7 +174,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -210,7 +210,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SWIG_PUBLIC_API;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Modified: branches/3.1/MgDev/Web/src/WebApp/WebApp.h
===================================================================
--- branches/3.1/MgDev/Web/src/WebApp/WebApp.h 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/WebApp/WebApp.h 2018-06-02 15:49:46 UTC (rev 9393)
@@ -20,9 +20,10 @@
#include "MapGuideCommon.h"
+#ifndef SWIG_PUBLIC_API
#include "System/XmlDefs.h"
#include "System/XmlUtil.h"
-
+#endif
#include "WebAppExport.h"
#include "WebAppClassId.h"
Modified: branches/3.1/MgDev/Web/src/WebApp/WebLayout.h
===================================================================
--- branches/3.1/MgDev/Web/src/WebApp/WebLayout.h 2018-05-22 08:03:08 UTC (rev 9392)
+++ branches/3.1/MgDev/Web/src/WebApp/WebLayout.h 2018-06-02 15:49:46 UTC (rev 9393)
@@ -25,6 +25,11 @@
typedef map<MgWebCommandWidget*, STRING> CMD_WIDGET_MAP;
class MgResourceIdentifier;
+namespace XERCES_CPP_NAMESPACE
+{
+ class DOMNode;
+ class DOMElement;
+}
class MG_WEBAPP_API MgWebLayout : public MgGuardDisposable
{
@@ -293,37 +298,37 @@
///////////////////////////////////////////////////////////////////////////
// parse basic command specific elements
//
- void ParseBuiltInCommand(DOMNode* node, MgWebCommand* cmd);
+ void ParseBuiltInCommand(XERCES_CPP_NAMESPACE::DOMNode* node, MgWebCommand* cmd);
///////////////////////////////////////////////////////////////////////////
// parse invoke url representing an action command
//
- void ParseInvokeUrlCommand(DOMNode* node, MgWebInvokeUrlCommand* cmd);
+ void ParseInvokeUrlCommand(XERCES_CPP_NAMESPACE::DOMNode* node, MgWebInvokeUrlCommand* cmd);
///////////////////////////////////////////////////////////////////////////
// parse search specific elements
//
- void ParseSearchCommand(DOMNode* node, MgWebSearchCommand* cmd);
+ void ParseSearchCommand(XERCES_CPP_NAMESPACE::DOMNode* node, MgWebSearchCommand* cmd);
///////////////////////////////////////////////////////////////////////////
// parse invoke script specific elements
//
- void ParseInvokeScriptCommand(DOMNode* node, MgWebInvokeScriptCommand* cmd);
+ void ParseInvokeScriptCommand(XERCES_CPP_NAMESPACE::DOMNode* node, MgWebInvokeScriptCommand* cmd);
///////////////////////////////////////////////////////////////////////////
// parse print specific elements
//
- void ParsePrintCommand(DOMNode* node, MgWebPrintCommand* cmd);
+ void ParsePrintCommand(XERCES_CPP_NAMESPACE::DOMNode* node, MgWebPrintCommand* cmd);
///////////////////////////////////////////////////////////////////////////
// parse help specific elements
//
- void ParseHelpCommand(DOMNode* node, MgWebHelpCommand* cmd);
+ void ParseHelpCommand(XERCES_CPP_NAMESPACE::DOMNode* node, MgWebHelpCommand* cmd);
///////////////////////////////////////////////////////////////////////////
// parse ui target specific elements
//
- void ParseUiTargetCommand(DOMNode*, MgWebUiTargetCommand* cmd);
+ void ParseUiTargetCommand(XERCES_CPP_NAMESPACE::DOMNode*, MgWebUiTargetCommand* cmd);
///////////////////////////////////////////////////////////////////////////
// parse a UIItem element and returns an MgWebWidget object
@@ -333,12 +338,12 @@
///////////////////////////////////////////////////////////////////////////
// parse a command widget
//
- void ParseCommandWidget(DOMNode* node, MgWebCommandWidget* widget);
+ void ParseCommandWidget(XERCES_CPP_NAMESPACE::DOMNode* node, MgWebCommandWidget* widget);
///////////////////////////////////////////////////////////////////////////
// parse a flyout widget
//
- void ParseFlyoutWidget(DOMNode* node, MgWebFlyoutWidget* widget);
+ void ParseFlyoutWidget(XERCES_CPP_NAMESPACE::DOMNode* node, MgWebFlyoutWidget* widget);
///////////////////////////////////////////////////////////////////////////
// parse the Map element
More information about the mapguide-commits
mailing list