[commit] r2738 - in trunk: . Doc GME/Annotator GME/Common GME/Console GME/ConstraintManager GME/Core GME/DotNetPIAs GME/GMEActiveBrowser GME/Gme GME/Interfaces GME/Meta GME/Mga GME/MgaDecorators GME/MgaUtil GME/ObjectInspector GME/PanningView GME/Parser GME/PartBrowser GME/Search GME/XmlBackEnd Install/Build Paradigms/HFSM/HFSMSimulator Paradigms/MetaGME Paradigms/MetaGME/BONExtender Paradigms/MetaGME/MetaDecorator Paradigms/MetaGME/MetaInterpreter Paradigms/MetaGME/NamespaceConfig Paradigms/MetaGME/Paradigm Paradigms/SF/BON2SFInterpreter Paradigms/SF/BON2SFSample Paradigms/SF/SFInterpreter Paradigms/SF/demo Paradigms/UML/decorator SDK/Decorator Examples/NewSample SDK/Decorator Examples/PlainSample SDK/DecoratorLib SDK/DecoratorWizard/Templates/1033 SDK/Java/native/AutoRouter SDK/Java/native/Jaut SDK/Java/native/JavaCompRegister SDK/Java/native/JavaCompRunner SDK/Java/native/MgaDecoratorWrap SDK/PatternProcessor Tests/GPyUnit/Leaks/TestGMELeaks Tools/AutoLayout Tools/GMEplin k Tools/ModelMigrate/FrontEnd Tools/ModelMigrate/IDLComp Tools/TableEditor
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Mon Feb 5 11:28:40 CST 2018
Author: ksmyth
Date: Mon Feb 5 11:28:40 2018
New Revision: 2738
Log:
Compile with Visual Studio 2015
Added:
trunk/Doc/GME_release.cmd
trunk/appveyor.yml
Modified:
trunk/.gitignore
trunk/GME/Annotator/Annotator.vcxproj
trunk/GME/Annotator/DecoratorApp.cpp
trunk/GME/Common/Common.vcxproj
trunk/GME/Console/Console.vcxproj
trunk/GME/ConstraintManager/ConstraintManager.vcxproj
trunk/GME/ConstraintManager/OCLType.cpp
trunk/GME/Core/Core.vcxproj
trunk/GME/DotNetPIAs/DotNetPIAs.vcxproj
trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj
trunk/GME/Gme/GME.vcxproj
trunk/GME/Interfaces/Interfaces.vcxproj
trunk/GME/Meta/Meta.vcxproj
trunk/GME/Mga/Mga.vcxproj
trunk/GME/MgaDecorators/MgaDecorators.vcxproj
trunk/GME/MgaUtil/MgaUtil.vcxproj
trunk/GME/MgaUtil/MgaUtilApp.cpp
trunk/GME/ObjectInspector/ObjectInspector.vcxproj
trunk/GME/PanningView/PanningView.vcxproj
trunk/GME/Parser/Parser.vcxproj
trunk/GME/Parser/StdAfx.h
trunk/GME/PartBrowser/PartBrowser.vcxproj
trunk/GME/Search/Search.vcxproj
trunk/GME/XmlBackEnd/StdAfx.h
trunk/GME/XmlBackEnd/XmlBackEnd.cpp
trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj
trunk/Install/Build/build.py
trunk/Install/Build/prefs.py
trunk/Install/Build/tools.py
trunk/Paradigms/HFSM/HFSMSimulator/HFSMSimulator.vcxproj
trunk/Paradigms/MetaGME/BONExtender/BONExtender.vcxproj
trunk/Paradigms/MetaGME/MetaDecorator/DecoratorApp.cpp
trunk/Paradigms/MetaGME/MetaDecorator/MetaDecorator.vcxproj
trunk/Paradigms/MetaGME/MetaGME.sln
trunk/Paradigms/MetaGME/MetaInterpreter/MetaInterpreter.vcxproj
trunk/Paradigms/MetaGME/NamespaceConfig/NamespaceConfig.vcxproj
trunk/Paradigms/MetaGME/Paradigm/Paradigm.vcxproj
trunk/Paradigms/SF/BON2SFInterpreter/BON2SFInterpreter.vcxproj
trunk/Paradigms/SF/BON2SFSample/BON2SFSample.vcxproj
trunk/Paradigms/SF/SFInterpreter/SFInterpreter.vcxproj
trunk/Paradigms/SF/demo/mdemo.vcxproj
trunk/Paradigms/UML/decorator/UMLDecorator.vcxproj
trunk/SDK/Decorator Examples/NewSample/DecoratorApp.cpp
trunk/SDK/Decorator Examples/PlainSample/DecoratorApp.cpp
trunk/SDK/DecoratorLib/DecoratorLib.vcxproj
trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.cpp
trunk/SDK/Java/native/AutoRouter/AutoRouter.vcxproj
trunk/SDK/Java/native/Jaut/JAUT.vcxproj
trunk/SDK/Java/native/JavaCompRegister/JavaCompRegister.vcxproj
trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj
trunk/SDK/Java/native/MgaDecoratorWrap/MgaDecoratorWrap.vcxproj
trunk/SDK/PatternProcessor/PatternProcessor.vcxproj
trunk/Tests/GPyUnit/Leaks/TestGMELeaks/TestGMELeaks.cpp
trunk/Tests/GPyUnit/Leaks/TestGMELeaks/TestGMELeaks.vcxproj
trunk/Tools/AutoLayout/AutoLayout.vcxproj
trunk/Tools/AutoLayout/LayoutOptimization.cpp
trunk/Tools/GMEplink/GMEplink.vcxproj
trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.vcxproj
trunk/Tools/ModelMigrate/IDLComp/IDLComp.vcxproj
trunk/Tools/TableEditor/TableEditor.vcxproj
trunk/Tools/TableEditor/TableEditorDumper.cpp
Modified: trunk/.gitignore
==============================================================================
--- trunk/.gitignore Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/.gitignore Mon Feb 5 11:28:40 2018 (r2738)
@@ -431,3 +431,16 @@
Tests/GPyUnit/DsmlGeneratorTest/bin/
Tests/GPyUnit/DsmlGeneratorTest/packages/
Tools/AutoLayout/x64/
+Install/GME_bundle.exe
+Install/Redist/
+Install/Windows6.0-KB2999226-x64.msu
+Install/Windows6.1-KB2999226-x64.msu
+Install/Windows8-RT-KB2999226-x64.msu
+Install/Windows8.1-KB2999226-x64.msu
+Install/vc_redist.x64.v14.0.24123.exe
+Install/vc_redist.x64.v9.0.30729.4148.exe
+Install/vc_redist.x86.v14.0.24123.exe
+Tests/GPyUnit/GME_310/DerivedRefport_test.mga
+/redist/
+/GME-*.*.*_src/
+/GME-src.zip
Added: trunk/Doc/GME_release.cmd
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/Doc/GME_release.cmd Mon Feb 5 11:28:40 2018 (r2738)
@@ -0,0 +1,84 @@
+Setlocal EnableDelayedExpansion
+
+set PATH=c:\Program Files\Git\usr\bin;%PATH%;c:\Program Files\7-Zip;c:\cygwin\bin;C:\Program Files (x86)\Subversion\bin
+if not exist "%PYTHON%" set PYTHON=%userprofile%\Downloads\markdown\Scripts\python.exe
+
+rem where "%PYTHON%" || exit /b !ERRORLEVEL!
+rem pip install pywin32
+"%PYTHON%" -c "import win32com.client" || exit /b !ERRORLEVEL!
+"%PYTHON_x64%" -c "import win32com.client" || exit /b !ERRORLEVEL!
+"%PYTHON%" -c "import requests" || exit /b !ERRORLEVEL!
+"%PYTHON_x64%" -c "import requests" || exit /b !ERRORLEVEL!
+"%PYTHON%" -c "import markdown" || exit /b !ERRORLEVEL!
+rem python should be 2.7 x86
+where 7z.exe || exit /b !ERRORLEVEL!
+find -maxdepth 0 || exit /b !ERRORLEVEL!
+dir "%GME_ROOT%" || exit /b !ERRORLEVEL!
+if not exist "%SYMSTORE%" set SYMSTORE=C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore.exe
+dir "%SYMSTORE%" || exit /b !ERRORLEVEL!
+
+if exist redist echo Move redist out of the way
+if exist redist exit /b 1
+
+rem C:\Program Files (x86)\Debugging Tools for Windows (x86)\symstore.exe
+rem C:\Program Files (x86)\Windows Kits\8.0\Debuggers\x64\symstore.exe
+rem C:\Program Files (x86)\Windows Kits\8.0\Debuggers\x86\symstore.exe
+
+pushd %GME_ROOT%
+
+for /f "usebackq" %%a in (`%python% -c "import time; print '.'.join(map(str, time.localtime()[0:3]))[2:]"`) do set VERSION=%%a
+echo Version %VERSION%
+
+"%PYTHON%" Install\Build\build.py -s 1 -e build_msi -v || exit /b !ERRORLEVEL!
+"%PYTHON_x64%" Install\Build\build.py -s 1 -e build_msms -v -a x64 || exit /b !ERRORLEVEL!
+"%PYTHON%" Install\Build\build.py -s build_msi -e build_msi -v -a x64 || exit /b !ERRORLEVEL!
+
+mkdir redist
+
+find Install -iname \*.wixlib -exec cp "{}" redist ";" || exit /b !ERRORLEVEL!
+find Install -iname \*.msi -exec cp "{}" redist ";" || exit /b !ERRORLEVEL!
+find Install -iname GME\*.exe -exec cp "{}" redist ";" || exit /b !ERRORLEVEL!
+
+rem export https://svn.isis.vanderbilt.edu/GMESRC/trunk GME-%VERSION%_src || exit /b !ERRORLEVEL!
+rem xe a GME-%VERSION%_src.7z GME-%VERSION%_src/ || exit /b !ERRORLEVEL!
+git archive -o GME-src.zip HEAD || exit /b !ERRORLEVEL!
+rd /s/q GME-%VERSION%_src
+7z x -oGME-%VERSION%_src GME-src.zip || exit /b !ERRORLEVEL!
+7z a GME-%VERSION%_src.7z GME-%VERSION%_src || exit /b !ERRORLEVEL!
+
+move /y GME-%VERSION%_src.7z redist || exit /b !ERRORLEVEL!
+
+move redist\GME.msi redist\GME-%VERSION%.msi || exit /b !ERRORLEVEL!
+move redist\GME_x64.msi redist\GME_x64-%VERSION%.msi || exit /b !ERRORLEVEL!
+
+mkdir GME-%VERSION%_symbols
+"%SYMSTORE%" add /r /f "%GME_ROOT%" /s GME-%VERSION%_symbols /t GME || exit /b !ERRORLEVEL!
+find GME-%VERSION%_symbols -type f -iname vc100.pdb -delete || exit /b !ERRORLEVEL!
+find GME-%VERSION%_symbols -type f -iname vc140.pdb -delete || exit /b !ERRORLEVEL!
+find GME-%VERSION%_symbols -type f ^^! -iname "*.pdb" -delete || exit /b !ERRORLEVEL!
+find GME-%VERSION%_symbols -type d -empty -delete || exit /b !ERRORLEVEL!
+
+"c:\Program Files\7-Zip\7z.exe" a -xr^^!.svn redist\GME-%VERSION%_symbols.7z GME-%VERSION%_symbols || exit /b !ERRORLEVEL!
+
+echo Success
+
+exit /b 0
+
+for /f "usebackq" %%a in (`%python% -c "import time; print '.'.join(map(str, time.localtime()[0:3]))[2:]"`) do set VERSION=%%a
+echo Version %VERSION%
+
+set PATH=%PATH%;c:\Program Files\7-Zip;c:\Program Files\Git\usr\bin;c:\cygwin\bin;C:\Program Files (x86)\Subversion\bin
+
+rem where svn.exe || exit /b !ERRORLEVEL!
+rem svn ls https://svn.isis.vanderbilt.edu/GMESRC || exit /b !ERRORLEVEL!
+svn cp -m "Tag Release %VERSION%" https://svn.isis.vanderbilt.edu/GMESRC/trunk https://svn.isis.vanderbilt.edu/GMESRC/tags/Release_%VERSION%
+
+cd redist
+ssh repo at repo.isis.vanderbilt.edu mkdir GME/%VERSION%/ && \
+scp ../Doc/README.txt GME-%VERSION%.msi GME_x64-%VERSION%.msi GME-%VERSION%_src.7z repo at repo.isis.vanderbilt.edu:GME/%VERSION%/ && \
+scp GME-%VERSION%_symbols.7z repo at repo.isis.vanderbilt.edu:GME/%VERSION%/ && \
+ssh repo at repo.isis.vanderbilt.edu chmod -R a+r GME/%VERSION%/
+
+pushd %GME_ROOT%\Doc
+%userprofile%\Downloads\markdown\scripts\python %userprofile%\Downloads\markdown\upload.py
+
Modified: trunk/GME/Annotator/Annotator.vcxproj
==============================================================================
--- trunk/GME/Annotator/Annotator.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Annotator/Annotator.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition="'$(Configuration)'==''">Release</Configuration>
</PropertyGroup>
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/Annotator/DecoratorApp.cpp
==============================================================================
--- trunk/GME/Annotator/DecoratorApp.cpp Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Annotator/DecoratorApp.cpp Mon Feb 5 11:28:40 2018 (r2738)
@@ -111,6 +111,8 @@
/////////////////////////////////////////////////////////////////////////////
// DllRegisterServer - Adds entries to the system registry
+// dllmain.h : Declaration of module class.
+
STDAPI DllRegisterServer(void)
{
AFX_MANAGE_STATE(AfxGetStaticModuleState());//z
@@ -122,7 +124,11 @@
{CONSTOLESTR("TYPELIB_UUID"), CONSTOLESTR(TYPELIB_UUID)},
{0, 0}
};
- HRESULT hr = _Module.UpdateRegistryFromResourceD( IDR_DECORATOR, TRUE, regMap );
+#if _ATL_VER >= 0x0E00
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_DECORATOR, TRUE, regMap);
+#else
+ HRESULT hr = _Module.UpdateRegistryFromResourceD(IDR_DECORATOR, TRUE, regMap);
+#endif
/* if ( SUCCEEDED( hr ) ) //do not use this !
{
@@ -148,7 +154,11 @@
{CONSTOLESTR("TYPELIB_UUID"), CONSTOLESTR(TYPELIB_UUID)},
{0, 0}
};
- HRESULT hr = _Module.UpdateRegistryFromResourceD( IDR_DECORATOR, FALSE, regMap );
+#if _ATL_VER >= 0x0E00
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_DECORATOR, FALSE, regMap);
+#else
+ HRESULT hr = _Module.UpdateRegistryFromResourceD(IDR_DECORATOR, FALSE, regMap);
+#endif
/* if ( SUCCEEDED( hr ) ) //do not use this !
{
Modified: trunk/GME/Common/Common.vcxproj
==============================================================================
--- trunk/GME/Common/Common.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Common/Common.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -31,24 +31,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/Console/Console.vcxproj
==============================================================================
--- trunk/GME/Console/Console.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Console/Console.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/ConstraintManager/ConstraintManager.vcxproj
==============================================================================
--- trunk/GME/ConstraintManager/ConstraintManager.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/ConstraintManager/ConstraintManager.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/ConstraintManager/OCLType.cpp
==============================================================================
--- trunk/GME/ConstraintManager/OCLType.cpp Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/ConstraintManager/OCLType.cpp Mon Feb 5 11:28:40 2018 (r2738)
@@ -211,7 +211,7 @@
if ( (*i).second.pType->IsDynamic() )
i->second.pType.reset();
else
- m_mapTypes.insert( TypeResultMap::value_type( (*i).first, std::move((*i).second) ) );
+ m_mapTypes.insert( TypeResultMap::value_type( (*i).first, (*i).second ) );
}
void TypeManager::ClearGlobals()
@@ -261,11 +261,11 @@
}
TypeResultMap::iterator it = m_mapTypes.insert( TypeResultMap::value_type( std::move(nameResult), std::move(typeResult) ) ).first;
// WAS: m_mapTypes.insert( TypeResultMap::value_type( strName, typeResult ) );
- RegisterType( typeResult );
- if ( typeResult.bIsValid )
- return typeResult.pType;
+ RegisterType( it->second );
+ if ( it->second.bIsValid )
+ return it->second.pType;
else
- throw OclCommon::Exception( *typeResult.pException );
+ throw OclCommon::Exception( *it->second.pException );
}
int TypeManager::IsTypeAR( const std::string& strName1, const std::string& strName2, int iLevel )
Modified: trunk/GME/Core/Core.vcxproj
==============================================================================
--- trunk/GME/Core/Core.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Core/Core.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -41,6 +41,7 @@
<ProjectGuid>{0B16B893-5512-48B8-B764-EE72C522EAD8}</ProjectGuid>
<RootNamespace>Core</RootNamespace>
<Keyword>AtlProj</Keyword>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -49,6 +50,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -56,6 +58,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -63,6 +66,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGInstrument</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -70,6 +74,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGInstrument</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -77,6 +82,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGOptimize</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -84,18 +90,21 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGOptimize</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/DotNetPIAs/DotNetPIAs.vcxproj
==============================================================================
--- trunk/GME/DotNetPIAs/DotNetPIAs.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/DotNetPIAs/DotNetPIAs.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,23 +27,27 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj
==============================================================================
--- trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/Gme/GME.vcxproj
==============================================================================
--- trunk/GME/Gme/GME.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Gme/GME.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/Interfaces/Interfaces.vcxproj
==============================================================================
--- trunk/GME/Interfaces/Interfaces.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Interfaces/Interfaces.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -21,10 +21,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/Meta/Meta.vcxproj
==============================================================================
--- trunk/GME/Meta/Meta.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Meta/Meta.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -41,6 +41,7 @@
<ProjectGuid>{3ED3216E-B64C-4D0B-881F-68BFF2CB3E83}</ProjectGuid>
<RootNamespace>Meta</RootNamespace>
<Keyword>AtlProj</Keyword>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -49,6 +50,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -56,6 +58,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGOptimize</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -63,6 +66,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGInstrument</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -70,6 +74,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -77,6 +82,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGOptimize</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -84,18 +90,21 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGInstrument</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/Mga/Mga.vcxproj
==============================================================================
--- trunk/GME/Mga/Mga.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Mga/Mga.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -41,6 +41,7 @@
<ProjectGuid>{86DAEF74-2527-41E5-82CE-52C31C5BBE8E}</ProjectGuid>
<RootNamespace>Mga</RootNamespace>
<Keyword>AtlProj</Keyword>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -48,12 +49,14 @@
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -61,6 +64,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -68,6 +72,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGOptimize</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -75,6 +80,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGInstrument</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -82,6 +88,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -89,6 +96,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGOptimize</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -96,6 +104,7 @@
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>PGInstrument</WholeProgramOptimization>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/MgaDecorators/MgaDecorators.vcxproj
==============================================================================
--- trunk/GME/MgaDecorators/MgaDecorators.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/MgaDecorators/MgaDecorators.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition="'$(Configuration)'==''">Release</Configuration>
</PropertyGroup>
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/MgaUtil/MgaUtil.vcxproj
==============================================================================
--- trunk/GME/MgaUtil/MgaUtil.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/MgaUtil/MgaUtil.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/MgaUtil/MgaUtilApp.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaUtilApp.cpp Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/MgaUtil/MgaUtilApp.cpp Mon Feb 5 11:28:40 2018 (r2738)
@@ -100,16 +100,24 @@
STDAPI DllRegisterServer(void)
{
// registers object, typelib and all interfaces in typelib
- _Module.UpdateRegistryFromResource(IDR_MGAUTIL, TRUE);
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_MGAUTIL, TRUE);
+ if (FAILED(hr))
+ {
+ return hr;
+ }
return _Module.RegisterServer(TRUE);
}
/////////////////////////////////////////////////////////////////////////////
// DllUnregisterServer - Removes entries from the system registry
STDAPI DllUnregisterServer(void)
{
- _Module.UpdateRegistryFromResource(IDR_MGAUTIL, FALSE);
- _Module.UnregisterServer(TRUE); //TRUE indicates that typelib is unreg'd
- return S_OK;
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_MGAUTIL, FALSE);
+ if (FAILED(hr))
+ {
+ return hr;
+ }
+ //TRUE indicates that typelib is unreg'd
+ return _Module.UnregisterServer(TRUE);
}
BOOL CMgaUtilApp::InitInstance()
Modified: trunk/GME/ObjectInspector/ObjectInspector.vcxproj
==============================================================================
--- trunk/GME/ObjectInspector/ObjectInspector.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/ObjectInspector/ObjectInspector.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/PanningView/PanningView.vcxproj
==============================================================================
--- trunk/GME/PanningView/PanningView.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/PanningView/PanningView.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/Parser/Parser.vcxproj
==============================================================================
--- trunk/GME/Parser/Parser.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Parser/Parser.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -32,24 +32,28 @@
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/Parser/StdAfx.h
==============================================================================
--- trunk/GME/Parser/StdAfx.h Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Parser/StdAfx.h Mon Feb 5 11:28:40 2018 (r2738)
@@ -21,6 +21,8 @@
#define _ATL_APARTMENT_THREADED
+#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS 1
+
#include <atlbase.h>
//You may derive a class from CComModule and use it if you want to override
//something, but do not change the name of _Module
Modified: trunk/GME/PartBrowser/PartBrowser.vcxproj
==============================================================================
--- trunk/GME/PartBrowser/PartBrowser.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/PartBrowser/PartBrowser.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/Search/Search.vcxproj
==============================================================================
--- trunk/GME/Search/Search.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/Search/Search.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/GME/XmlBackEnd/StdAfx.h
==============================================================================
--- trunk/GME/XmlBackEnd/StdAfx.h Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/XmlBackEnd/StdAfx.h Mon Feb 5 11:28:40 2018 (r2738)
@@ -29,6 +29,7 @@
//something, but do not change the name of _Module
extern CComModule _Module;
#include <atlcom.h>
+#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS 1
#include <hash_map>
#define _NOTHREADS
Modified: trunk/GME/XmlBackEnd/XmlBackEnd.cpp
==============================================================================
--- trunk/GME/XmlBackEnd/XmlBackEnd.cpp Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/XmlBackEnd/XmlBackEnd.cpp Mon Feb 5 11:28:40 2018 (r2738)
@@ -125,4 +125,11 @@
return _Module.UnregisterServer(TRUE);
}
+extern "C" FILE * __cdecl __iob_func(void)
+{
+ terminate();
+ return NULL;
+}
+// https://msdn.microsoft.com/en-us/library/bb531344.aspx#BK_CRT
+#pragma comment(lib, "legacy_stdio_definitions.lib")
Modified: trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj
==============================================================================
--- trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -32,24 +32,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Install/Build/build.py Mon Feb 5 11:28:40 2018 (r2738)
@@ -10,6 +10,7 @@
import os
import os.path
import getopt
+import platform
from prefs import prefs
import tools
import win32com
@@ -53,11 +54,11 @@
print "Current dev. source tree:", GME_ROOT
raise
- # Test for Microsoft Visual Studio 2010
+ # Test for Microsoft Visual Studio 2015
try:
tools.test_VS()
except:
- print "Microsoft Visual Studio 2010 is not installed!"
+ print "Microsoft Visual Studio 2015 is not installed!"
raise
# Test for zip utility
@@ -115,11 +116,12 @@
lines = f.readlines()
lines = [line for line in lines if line.find(u'DLLDATA.C') == -1]
with codecs.open(tlog, 'w', encoding='utf-16-le') as f:
- for line in lines: f.write(line)
+ for line in lines:
+ f.write(line)
def compile_GME():
"Compile GME core components"
- if prefs['arch'] == 'x64':
+ if prefs['arch'] == 'x64' and '64bit' not in platform.architecture():
# To use 32bit Python.exe for the tests, 32bit CoreCollectionHandler must be registered
sln_file = os.path.join(GME_ROOT, "GME", "GME.sln")
_remove_dlldata_from_tlog()
@@ -142,10 +144,12 @@
config = '%s.config' % filename
dll = '%s.dll' % filename
if newer(os.path.join(pia_dir, config), os.path.join(pia_dir, dll)):
- tools.system([r'C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\al.exe',
+ tools.system([
+ tools.VCVARS, 'x86', '&',
+ 'al.exe',
'/link:' + config, '/out:' + dll,
'/keyfile:..\MgaDotNetServices\MgaDotNetServicesKey.snk', '/platform:anycpu', '/version:1.0.0.0'], pia_dir)
- tools.system([r'C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\gacutil.exe', '/i', dll], pia_dir)
+ tools.system([tools.VCVARS, 'x86', '&', 'gacutil.exe', '/i', dll], pia_dir)
def _Release_PGO_dir():
if prefs['arch'] == 'x64':
@@ -203,13 +207,16 @@
def PGO_train():
"Run tests/Create training data for the PGO binaries"
import glob
- for file in glob.glob(GME_ROOT + '\\GME' + ('\\x64' if prefs['arch'] == 'x64' else '') + '\\Release_PGO\\*.pgc'):
+ pgc_glob = GME_ROOT + '\\GME' + ('\\x64' if prefs['arch'] == 'x64' else '') + '\\Release_PGO\\*.pgc'
+ for file in glob.glob(pgc_glob):
os.remove(file)
tools.system([sys.executable, '-m', 'GPyUnit.__main__', '-x'] + (['-a', 'x64', '-o', 'tests_x64.xml'] if prefs['arch'] == 'x64' else []), os.path.join(GME_ROOT, 'Tests'))
if prefs['arch'] == 'x64':
# wait for dllhost.exe to exit
import time
time.sleep(31)
+ if len(glob.glob(pgc_glob)) < 3:
+ raise ValueError('3 .pgc files not created. Looking for {}. (Use a 64bit Python for 64bit GME)'.format(pgc_glob))
def compile_meta():
"Compile MetaGME components"
@@ -221,7 +228,8 @@
def compile_JBON():
"Compile Java component support (JBON)"
- if prefs['arch'] == 'x64': return
+ if prefs['arch'] == 'x64':
+ return
tools.system(r"reg add HKLM\Software\GME /t REG_SZ /v JavaClassPath /d".split() +
[os.path.join(GME_ROOT, "SDK", "Java", "gme.jar"), "/reg:32", "/f"])
sln_file = os.path.join(GME_ROOT, "SDK", "Java", "native", "JavaSupport.sln")
@@ -247,12 +255,12 @@
tools.build_VS(sln_file, "Release", arch='Any CPU', msbuild=(prefs['arch'] == 'x64' and tools.MSBUILD.replace('Framework', 'Framework64') or tools.MSBUILD))
if prefs['arch'] == 'x64':
- tools.system([r'%windir%\Microsoft.NET\Framework64\v4.0.30319\RegAsm.exe', '/codebase',
+ tools.system([tools.VCVARS, 'amd64', '&', 'RegAsm.exe', '/codebase',
os.path.join(GME_ROOT, 'Tools', 'DumpWMF', 'bin', 'Release', 'DumpWMF.dll')])
with _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT, r"CLSID\{A051FEEA-E310-3F6A-8D71-A55E3F4F2E14}", 0, _winreg.KEY_WRITE | _winreg.KEY_WOW64_64KEY) as key:
_winreg.SetValueEx(key, "AppID", 0, _winreg.REG_SZ, "{461F30AF-3BF0-11D4-B3F0-005004D38590}")
- tools.system([r'%windir%\Microsoft.NET\Framework64\v4.0.30319\RegAsm.exe', '/codebase',
+ tools.system([tools.VCVARS, 'amd64', '&', 'RegAsm.exe', '/codebase',
os.path.join(GME_ROOT, 'SDK', 'DotNet', 'DsmlGenerator', 'CSharpDsmlGenerator', 'bin', 'Release', 'CSharpDSMLGenerator.dll')])
return
@@ -274,7 +282,8 @@
sln_file = os.path.join(GME_ROOT, "Paradigms", "UML", "decorator", "UMLDecorator.sln")
tools.build_VS( sln_file, "Release" )
- if prefs['arch'] == 'x64': return
+ if prefs['arch'] == 'x64':
+ return
sln_file = os.path.join(GME_ROOT, "SDK", "PatternProcessor", "PatternProcessor.sln")
tools.build_VS( sln_file, "Release" )
@@ -391,7 +400,7 @@
def build_msi():
"""Build WiX installer (msi file)."""
- # tools.build_WiX([os.path.join(GME_ROOT, "Install", "GME.wxs")])
+ tools.build_WiX([os.path.join(GME_ROOT, "Install", "GME.wxs")])
if prefs['arch'] == 'x64':
tools.download_bundle_deps(os.path.join(GME_ROOT, "Install", "GME_bundle.wxs"), [os.path.join(GME_ROOT, "Install", "GME_inc.wxi"), os.path.join(GME_ROOT, "Install", "GME_bundle.wxs")])
@@ -544,10 +553,7 @@
print "Building GME version " + prefs["version_string"] + " " + prefs["arch"]
_pfx86 = os.environ.get('ProgramFiles(x86)', os.environ['ProgramFiles'])
-if prefs['toolset'] == '11':
- prefs['VS_dir'] = os.path.join(_pfx86, r"Microsoft Visual Studio 11.0")
-else:
- prefs['VS_dir'] = os.path.join(_pfx86, r"Microsoft Visual Studio 10.0")
+prefs['VS_dir'] = os.path.join(_pfx86, r"Microsoft Visual Studio {}.0".format(prefs['toolset']))
try:
for i in range(len(build_steps)):
Modified: trunk/Install/Build/prefs.py
==============================================================================
--- trunk/Install/Build/prefs.py Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Install/Build/prefs.py Mon Feb 5 11:28:40 2018 (r2738)
@@ -12,12 +12,12 @@
# Preferences & default values (used by other modules)
#
prefs = {
- "clean" : False,
- "verbose" : False,
- "version_major" : (time.localtime()[0] - 2000),
- "version_minor" : time.localtime()[1],
- "version_patch" : time.localtime()[2],
- "version_build" : 0,
- "arch" : "x86",
- "toolset": "10",
- }
\ No newline at end of file
+ "clean" : False,
+ "verbose" : False,
+ "version_major" : (time.localtime()[0] - 2000),
+ "version_minor" : time.localtime()[1],
+ "version_patch" : time.localtime()[2],
+ "version_build" : 0,
+ "arch" : "x86",
+ "toolset": "14",
+ }
Modified: trunk/Install/Build/tools.py
==============================================================================
--- trunk/Install/Build/tools.py Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Install/Build/tools.py Mon Feb 5 11:28:40 2018 (r2738)
@@ -20,7 +20,8 @@
WIX_CANDLE_ARG = "-dPIADir.1.0.0.0=..\GME\DotNetPIAs_1.0.0.0 -dPIADir.1.0.1.0=..\GME\DotNetPIAs_1.0.1.0 -dPIADir=..\GME\DotNetPIAs"
WIX_LIGHT_PRG = "light.exe"
WIX_LIGHT_ARG = "-sw1076 -sw1055 -sw1056 -sice:ICE43 -sice:ICE57 -ext WixUIExtension -ext WixUtilExtension -ext WiXNetFxExtension" # See comments in GME.wxs
-MSBUILD = r"c:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe"
+MSBUILD = r"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe"
+VCVARS = r"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
#
# Classes
@@ -51,7 +52,7 @@
def test_SVN():
"Test for SVN client. Raises exception if not found."
- system(['svn', '-v', '>NUL'])
+ system(['svn', '--version', '>NUL'])
def test_zip():
@@ -107,9 +108,9 @@
def test_VS():
- "Test for Microsoft Visual Studio 2010. Raises exception if not found."
+ "Test for Microsoft Visual Studio 2015. Raises exception if not found."
toolmsg("Trying to create VisualStudio.DTE object")
- win32com.client.Dispatch("VisualStudio.DTE.10.0")
+ win32com.client.Dispatch("VisualStudio.DTE.14.0")
def build_VS(sln_path, config_name, arch=None, msbuild=MSBUILD, target=None):
"""
Modified: trunk/Paradigms/HFSM/HFSMSimulator/HFSMSimulator.vcxproj
==============================================================================
--- trunk/Paradigms/HFSM/HFSMSimulator/HFSMSimulator.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/HFSM/HFSMSimulator/HFSMSimulator.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -18,11 +18,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Paradigms/MetaGME/BONExtender/BONExtender.vcxproj
==============================================================================
--- trunk/Paradigms/MetaGME/BONExtender/BONExtender.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/MetaGME/BONExtender/BONExtender.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -28,24 +28,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<UseOfAtl>Dynamic</UseOfAtl>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<UseOfAtl>Dynamic</UseOfAtl>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<UseOfAtl>Dynamic</UseOfAtl>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<UseOfAtl>Dynamic</UseOfAtl>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Paradigms/MetaGME/MetaDecorator/DecoratorApp.cpp
==============================================================================
--- trunk/Paradigms/MetaGME/MetaDecorator/DecoratorApp.cpp Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/MetaGME/MetaDecorator/DecoratorApp.cpp Mon Feb 5 11:28:40 2018 (r2738)
@@ -109,6 +109,8 @@
/////////////////////////////////////////////////////////////////////////////
// DllRegisterServer - Adds entries to the system registry
+// dllmain.h : Declaration of module class.
+
STDAPI DllRegisterServer(void)
{
// AFX_MANAGE_STATE(AfxGetStaticModuleState( ));
@@ -119,7 +121,11 @@
{CONSTOLESTR("TYPELIB_UUID"), CONSTOLESTR(TYPELIB_UUID)},
{0, 0}
};
- HRESULT hr = _Module.UpdateRegistryFromResourceD( IDR_DECORATOR, TRUE, regMap );
+#if _ATL_VER >= 0x0E00
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_DECORATOR, TRUE, regMap);
+#else
+ HRESULT hr = _Module.UpdateRegistryFromResourceD(IDR_DECORATOR, TRUE, regMap);
+#endif
/* All the classes are registered here. We do not use the register functions in the classes themselves
if ( SUCCEEDED( hr ) )
@@ -144,7 +150,11 @@
{CONSTOLESTR("TYPELIB_UUID"), CONSTOLESTR(TYPELIB_UUID)},
{0, 0}
};
- HRESULT hr = _Module.UpdateRegistryFromResourceD( IDR_DECORATOR, FALSE, regMap );
+#if _ATL_VER >= 0x0E00
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_DECORATOR, FALSE, regMap);
+#else
+ HRESULT hr = _Module.UpdateRegistryFromResourceD(IDR_DECORATOR, FALSE, regMap);
+#endif
/* All the classes are registered here. We do not use the register functions in the classes themselves
if ( SUCCEEDED( hr ) )
Modified: trunk/Paradigms/MetaGME/MetaDecorator/MetaDecorator.vcxproj
==============================================================================
--- trunk/Paradigms/MetaGME/MetaDecorator/MetaDecorator.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/MetaGME/MetaDecorator/MetaDecorator.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -29,24 +29,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Paradigms/MetaGME/MetaGME.sln
==============================================================================
--- trunk/Paradigms/MetaGME/MetaGME.sln Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/MetaGME/MetaGME.sln Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaDecorator", "MetaDecorator\MetaDecorator.vcxproj", "{8789990A-1CEB-457D-9E99-C718A6D89781}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Paradigm", "Paradigm\Paradigm.vcxproj", "{E0F4960A-05DD-483D-92EE-F5CBB354FE43}"
Modified: trunk/Paradigms/MetaGME/MetaInterpreter/MetaInterpreter.vcxproj
==============================================================================
--- trunk/Paradigms/MetaGME/MetaInterpreter/MetaInterpreter.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/MetaGME/MetaInterpreter/MetaInterpreter.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,21 +27,25 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Paradigms/MetaGME/NamespaceConfig/NamespaceConfig.vcxproj
==============================================================================
--- trunk/Paradigms/MetaGME/NamespaceConfig/NamespaceConfig.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/MetaGME/NamespaceConfig/NamespaceConfig.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,21 +27,25 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Paradigms/MetaGME/Paradigm/Paradigm.vcxproj
==============================================================================
--- trunk/Paradigms/MetaGME/Paradigm/Paradigm.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/MetaGME/Paradigm/Paradigm.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,21 +27,25 @@
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Paradigms/SF/BON2SFInterpreter/BON2SFInterpreter.vcxproj
==============================================================================
--- trunk/Paradigms/SF/BON2SFInterpreter/BON2SFInterpreter.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/SF/BON2SFInterpreter/BON2SFInterpreter.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -19,11 +19,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Paradigms/SF/BON2SFSample/BON2SFSample.vcxproj
==============================================================================
--- trunk/Paradigms/SF/BON2SFSample/BON2SFSample.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/SF/BON2SFSample/BON2SFSample.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -20,12 +20,14 @@
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
<UseOfAtl>Dynamic</UseOfAtl>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Paradigms/SF/SFInterpreter/SFInterpreter.vcxproj
==============================================================================
--- trunk/Paradigms/SF/SFInterpreter/SFInterpreter.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/SF/SFInterpreter/SFInterpreter.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -19,11 +19,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Paradigms/SF/demo/mdemo.vcxproj
==============================================================================
--- trunk/Paradigms/SF/demo/mdemo.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/SF/demo/mdemo.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
@@ -14,6 +14,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Paradigms/UML/decorator/UMLDecorator.vcxproj
==============================================================================
--- trunk/Paradigms/UML/decorator/UMLDecorator.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Paradigms/UML/decorator/UMLDecorator.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -29,24 +29,28 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/SDK/Decorator Examples/NewSample/DecoratorApp.cpp
==============================================================================
--- trunk/SDK/Decorator Examples/NewSample/DecoratorApp.cpp Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/SDK/Decorator Examples/NewSample/DecoratorApp.cpp Mon Feb 5 11:28:40 2018 (r2738)
@@ -109,6 +109,8 @@
/////////////////////////////////////////////////////////////////////////////
// DllRegisterServer - Adds entries to the system registry
+// dllmain.h : Declaration of module class.
+
STDAPI DllRegisterServer(void)
{
_ATL_REGMAP_ENTRY regMap[] = {
@@ -118,7 +120,11 @@
{CONSTOLESTR("TYPELIB_UUID"), CONSTOLESTR(TYPELIB_UUID)},
{0, 0}
};
- HRESULT hr = _Module.UpdateRegistryFromResourceD( IDR_DECORATOR, TRUE, regMap );
+#if _ATL_VER >= 0x0E00
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_DECORATOR, TRUE, regMap);
+#else
+ HRESULT hr = _Module.UpdateRegistryFromResourceD(IDR_DECORATOR, TRUE, regMap);
+#endif
/* if ( SUCCEEDED( hr ) ) //do not use this !
{
// registers object, typelib and all
@@ -141,7 +147,11 @@
{CONSTOLESTR("TYPELIB_UUID"), CONSTOLESTR(TYPELIB_UUID)},
{0, 0}
};
- HRESULT hr = _Module.UpdateRegistryFromResourceD( IDR_DECORATOR, FALSE, regMap );
+#if _ATL_VER >= 0x0E00
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_DECORATOR, FALSE, regMap);
+#else
+ HRESULT hr = _Module.UpdateRegistryFromResourceD(IDR_DECORATOR, FALSE, regMap);
+#endif
/* if ( SUCCEEDED( hr ) ) //do not use this !
{
// registers object, typelib and all
Modified: trunk/SDK/Decorator Examples/PlainSample/DecoratorApp.cpp
==============================================================================
--- trunk/SDK/Decorator Examples/PlainSample/DecoratorApp.cpp Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/SDK/Decorator Examples/PlainSample/DecoratorApp.cpp Mon Feb 5 11:28:40 2018 (r2738)
@@ -81,6 +81,8 @@
/////////////////////////////////////////////////////////////////////////////
// DllRegisterServer - Adds entries to the system registry
+// dllmain.h : Declaration of module class.
+
STDAPI DllRegisterServer(void)
{
_ATL_REGMAP_ENTRY regMap[] = {
@@ -90,7 +92,11 @@
{CONSTOLESTR("TYPELIB_UUID"), CONSTOLESTR(TYPELIB_UUID)},
{0, 0}
};
- HRESULT hr = _Module.UpdateRegistryFromResourceD( IDR_DECORATOR, TRUE, regMap );
+#if _ATL_VER >= 0x0E00
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_DECORATOR, TRUE, regMap);
+#else
+ HRESULT hr = _Module.UpdateRegistryFromResourceD(IDR_DECORATOR, TRUE, regMap);
+#endif
/* if ( SUCCEEDED( hr ) ) //do not use this !
{
// registers object, typelib and all
@@ -113,7 +119,11 @@
{CONSTOLESTR("TYPELIB_UUID"), CONSTOLESTR(TYPELIB_UUID)},
{0, 0}
};
- HRESULT hr = _Module.UpdateRegistryFromResourceD( IDR_DECORATOR, FALSE, regMap );
+#if _ATL_VER >= 0x0E00
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_DECORATOR, FALSE, regMap);
+#else
+ HRESULT hr = _Module.UpdateRegistryFromResourceD(IDR_DECORATOR, FALSE, regMap);
+#endif
/* if ( SUCCEEDED( hr ) ) //do not use this !
{
// registers object, typelib and all
Modified: trunk/SDK/DecoratorLib/DecoratorLib.vcxproj
==============================================================================
--- trunk/SDK/DecoratorLib/DecoratorLib.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/SDK/DecoratorLib/DecoratorLib.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition="'$(Configuration)'==''">Release</Configuration>
</PropertyGroup>
@@ -48,48 +48,56 @@
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseUnicode|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseUnicode|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugUnicode|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugUnicode|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.cpp
==============================================================================
--- trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.cpp Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.cpp Mon Feb 5 11:28:40 2018 (r2738)
@@ -109,6 +109,8 @@
/////////////////////////////////////////////////////////////////////////////
// DllRegisterServer - Adds entries to the system registry
+// dllmain.h : Declaration of module class.
+
STDAPI DllRegisterServer(void)
{
_ATL_REGMAP_ENTRY regMap[] = {
@@ -118,7 +120,11 @@
{CONSTOLESTR("TYPELIB_UUID"), CONSTOLESTR(TYPELIB_UUID)},
{0, 0}
};
- HRESULT hr = _Module.UpdateRegistryFromResourceD( IDR_DECORATOR, TRUE, regMap );
+#if _ATL_VER >= 0x0E00
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_DECORATOR, TRUE, regMap);
+#else
+ HRESULT hr = _Module.UpdateRegistryFromResourceD(IDR_DECORATOR, TRUE, regMap);
+#endif
/* if ( SUCCEEDED( hr ) ) //do not use this !
{
// registers object, typelib and all
@@ -141,7 +147,11 @@
{CONSTOLESTR("TYPELIB_UUID"), CONSTOLESTR(TYPELIB_UUID)},
{0, 0}
};
- HRESULT hr = _Module.UpdateRegistryFromResourceD( IDR_DECORATOR, FALSE, regMap );
+#if _ATL_VER >= 0x0E00
+ HRESULT hr = _Module.UpdateRegistryFromResource(IDR_DECORATOR, FALSE, regMap);
+#else
+ HRESULT hr = _Module.UpdateRegistryFromResourceD(IDR_DECORATOR, FALSE, regMap);
+#endif
/* if ( SUCCEEDED( hr ) ) //do not use this !
{
// registers object, typelib and all
Modified: trunk/SDK/Java/native/AutoRouter/AutoRouter.vcxproj
==============================================================================
--- trunk/SDK/Java/native/AutoRouter/AutoRouter.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/SDK/Java/native/AutoRouter/AutoRouter.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -20,11 +20,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Static</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Static</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/SDK/Java/native/Jaut/JAUT.vcxproj
==============================================================================
--- trunk/SDK/Java/native/Jaut/JAUT.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/SDK/Java/native/Jaut/JAUT.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -21,12 +21,14 @@
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Static</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<UseOfAtl>Static</UseOfAtl>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/SDK/Java/native/JavaCompRegister/JavaCompRegister.vcxproj
==============================================================================
--- trunk/SDK/Java/native/JavaCompRegister/JavaCompRegister.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/SDK/Java/native/JavaCompRegister/JavaCompRegister.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -20,11 +20,13 @@
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj
==============================================================================
--- trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/SDK/Java/native/JavaCompRunner/JavaCompRunner.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -19,11 +19,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/SDK/Java/native/MgaDecoratorWrap/MgaDecoratorWrap.vcxproj
==============================================================================
--- trunk/SDK/Java/native/MgaDecoratorWrap/MgaDecoratorWrap.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/SDK/Java/native/MgaDecoratorWrap/MgaDecoratorWrap.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -20,11 +20,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Static</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/SDK/PatternProcessor/PatternProcessor.vcxproj
==============================================================================
--- trunk/SDK/PatternProcessor/PatternProcessor.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/SDK/PatternProcessor/PatternProcessor.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -18,11 +18,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Tests/GPyUnit/Leaks/TestGMELeaks/TestGMELeaks.cpp
==============================================================================
--- trunk/Tests/GPyUnit/Leaks/TestGMELeaks/TestGMELeaks.cpp Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Tests/GPyUnit/Leaks/TestGMELeaks/TestGMELeaks.cpp Mon Feb 5 11:28:40 2018 (r2738)
@@ -50,14 +50,14 @@
project->BeginTransactionInNewTerr(TRANSACTION_GENERAL);
auto aspects = project->ObjectByPath[L"/@Aspects"];
IMgaFCOPtr aspectsFco = aspects;
- auto copy = aspectsFco->ParentFolder->CopyFCODisp(aspectsFco);
- copy->DestroyObject();
-
- project->CommitTransaction();
- project->Undo();
- project->Redo();
- project->Undo();
- project->FlushUndoQueue();
+ auto copy = aspectsFco->ParentFolder->CopyFCODisp(aspectsFco);
+ copy->DestroyObject();
+
+ project->CommitTransaction();
+ project->Undo();
+ project->Redo();
+ project->Undo();
+ project->FlushUndoQueue();
project->Close(VARIANT_TRUE);
Modified: trunk/Tests/GPyUnit/Leaks/TestGMELeaks/TestGMELeaks.vcxproj
==============================================================================
--- trunk/Tests/GPyUnit/Leaks/TestGMELeaks/TestGMELeaks.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Tests/GPyUnit/Leaks/TestGMELeaks/TestGMELeaks.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -19,12 +19,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Tools/AutoLayout/AutoLayout.vcxproj
==============================================================================
--- trunk/Tools/AutoLayout/AutoLayout.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Tools/AutoLayout/AutoLayout.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,21 +27,25 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Tools/AutoLayout/LayoutOptimization.cpp
==============================================================================
--- trunk/Tools/AutoLayout/LayoutOptimization.cpp Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Tools/AutoLayout/LayoutOptimization.cpp Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,6 +1,7 @@
#include "stdafx.h"
#include <cmath>
#include <cfloat>
+#include <algorithm>
#include "Random.h"
#include "LayoutOptimization.h"
#include "GAOptimizer.h"
Modified: trunk/Tools/GMEplink/GMEplink.vcxproj
==============================================================================
--- trunk/Tools/GMEplink/GMEplink.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Tools/GMEplink/GMEplink.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,21 +27,25 @@
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.vcxproj
==============================================================================
--- trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -21,11 +21,13 @@
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>Static</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Tools/ModelMigrate/IDLComp/IDLComp.vcxproj
==============================================================================
--- trunk/Tools/ModelMigrate/IDLComp/IDLComp.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Tools/ModelMigrate/IDLComp/IDLComp.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -20,11 +20,13 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<CLRSupport>OldSyntax</CLRSupport>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<CLRSupport>OldSyntax</CLRSupport>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Tools/TableEditor/TableEditor.vcxproj
==============================================================================
--- trunk/Tools/TableEditor/TableEditor.vcxproj Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Tools/TableEditor/TableEditor.vcxproj Mon Feb 5 11:28:40 2018 (r2738)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -19,11 +19,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Tools/TableEditor/TableEditorDumper.cpp
==============================================================================
--- trunk/Tools/TableEditor/TableEditorDumper.cpp Mon Feb 5 11:28:23 2018 (r2737)
+++ trunk/Tools/TableEditor/TableEditorDumper.cpp Mon Feb 5 11:28:40 2018 (r2738)
@@ -104,19 +104,19 @@
// ------- Low level stuff
-inline void TableEditorDumper::StartElem(const char *name)
+void TableEditorDumper::StartElem(const char *name)
{
ASSERT( name != NULL );
ofs << '<' << name << '>';
}
-inline void TableEditorDumper::StartElemAttr(const char *name)
+void TableEditorDumper::StartElemAttr(const char *name)
{
ASSERT( name != NULL );
ofs << '<' << name;
}
-inline void TableEditorDumper::Attr(const char *name, const char *value, BOOL last)
+void TableEditorDumper::Attr(const char *name, const char *value, BOOL last)
{
ASSERT( name != NULL );
ASSERT( value != NULL );
@@ -125,7 +125,7 @@
if(last) ofs << ">";
}
-inline void TableEditorDumper::EndElem(const char *name)
+void TableEditorDumper::EndElem(const char *name)
{
ofs << "</" << name << ">\n";
}
\ No newline at end of file
Added: trunk/appveyor.yml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/appveyor.yml Mon Feb 5 11:28:40 2018 (r2738)
@@ -0,0 +1,22 @@
+cache:
+ - '%LOCALAPPDATA%\pip\cache -> appveyor.yml'
+
+build_script:
+ - set GME_ROOT=%CD%
+ - set PYTHON=C:\Python27\Python.exe
+ - set PYTHON_x64=C:\Python27-x64\Python.exe
+ - "%PYTHON% -m pip install pywin32 requests markdown"
+ - "%PYTHON_x64% -m pip install pywin32 requests markdown"
+ - copy c:\Python27\Lib\site-packages\pywin32_system32\pywintypes27.dll c:\windows\SysWOW64
+ - copy c:\Python27-x64\Lib\site-packages\pywin32_system32\pywintypes27.dll c:\windows\System32
+ - cmd /c Doc\GME_release.cmd || exit 1
+# - curl -O https://raw.githubusercontent.com/ksmyth/GitHub-Source-Indexer/master/github-sourceindexer.ps1
+# - >-
+# for /f "usebackq" %%x in (`git rev-parse HEAD`) do set HEAD=%%x
+# - >-
+# powershell -ExecutionPolicy unrestricted .\github-sourceindexer.ps1 -userId "ksmyth" -repository "xerces-c" -symbolsFolder "%CD%" -branch %HEAD% -sourcesRoot "%CD%" -verbose -dbgToolsPath "'C:\Program Files (x86)\Windows Kits\10\Debuggers\x64'" -ignoreUnknown -verifyLocalRepo
+
+test: off
+
+artifacts:
+ - path: "redist/*"
More information about the gme-commit
mailing list