[commit] r2465 - in trunk/Tools/ModelMigrate: . FrontEnd IDLComp

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Wed Apr 16 13:12:39 CDT 2014


Author: ksmyth
Date: Wed Apr 16 13:12:39 2014
New Revision: 2465

Log:
ModelMigrate: compile with VS2010

Added:
   trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.vcxproj
   trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.vcxproj.filters
   trunk/Tools/ModelMigrate/IDLComp/IDLComp.vcxproj
   trunk/Tools/ModelMigrate/IDLComp/IDLComp.vcxproj.filters
Modified:
   trunk/Tools/ModelMigrate/FrontEnd/CMgaXslt.cpp
   trunk/Tools/ModelMigrate/FrontEnd/Extractor.cpp
   trunk/Tools/ModelMigrate/FrontEnd/stdafx.h
   trunk/Tools/ModelMigrate/IDLComp/gmeidls.idl
   trunk/Tools/ModelMigrate/ModelMigrate.sln

Modified: trunk/Tools/ModelMigrate/FrontEnd/CMgaXslt.cpp
==============================================================================
--- trunk/Tools/ModelMigrate/FrontEnd/CMgaXslt.cpp	Wed Apr 16 13:12:21 2014	(r2464)
+++ trunk/Tools/ModelMigrate/FrontEnd/CMgaXslt.cpp	Wed Apr 16 13:12:39 2014	(r2465)
@@ -11,7 +11,7 @@
 
 
 void CXslt::doNativeXslt( LPCTSTR pScrF, LPCTSTR pInF, LPCTSTR pOutF, CString& resError)
-{
+{/*
 	// native vtable based
 	CComPtr<IMgaXslt> xslt;
 	HRESULT hr = xslt.CoCreateInstance(L"Mga.MgaXslt");
@@ -34,6 +34,7 @@
 		else 
 			resError = "COM Error!";
 	}
+	*/
 }
 
 void CXslt::doDispatchXslt( LPCTSTR pScrF, LPCTSTR pInF, LPCTSTR pOutF, CString& resError)

Modified: trunk/Tools/ModelMigrate/FrontEnd/Extractor.cpp
==============================================================================
--- trunk/Tools/ModelMigrate/FrontEnd/Extractor.cpp	Wed Apr 16 13:12:21 2014	(r2464)
+++ trunk/Tools/ModelMigrate/FrontEnd/Extractor.cpp	Wed Apr 16 13:12:39 2014	(r2465)
@@ -33,7 +33,8 @@
 		// 
 		file.getline( buff, 1024);
 		std::string bf( buff);
-		for( unsigned int i = 0; i < bf.length() && (bf[i] == ' ' || bf[i] == 9); ++i);
+		unsigned int i = 0;
+		for (; i < bf.length() && (bf[i] == ' ' || bf[i] == 9); ++i);
 		const int kindsNo = 6;
 		std::string kinds[ kindsNo ] =
 			{ "<atom name"

Added: trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.vcxproj
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.vcxproj	Wed Apr 16 13:12:39 2014	(r2465)
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ModelMigrate</ProjectName>
+    <ProjectGuid>{73E065E0-27FD-4D46-A483-EFB75438F74E}</ProjectGuid>
+    <RootNamespace>ModelMigrate</RootNamespace>
+    <Keyword>MFCProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <AdditionalIncludeDirectories>$(GME_ROOT)\Interfaces;$(GME_ROOT)\Gme\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <PreprocessorDefinitions>_AFXDLL;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>$(GME_ROOT)\Interfaces;$(GME_ROOT)\Gme\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="AboutDlg.cpp" />
+    <ClCompile Include="AttrGlobalDlg.cpp" />
+    <ClCompile Include="AttrNameDlg.cpp" />
+    <ClCompile Include="AttrTypeChangeDlg.cpp" />
+    <ClCompile Include="CMgaXslt.cpp" />
+    <ClCompile Include="EnumAttrValueDlg.cpp" />
+    <ClCompile Include="Extractor.cpp" />
+    <ClCompile Include="FileListCtrl.cpp" />
+    <ClCompile Include="FileTransDlg.cpp" />
+    <ClCompile Include="Log.cpp" />
+    <ClCompile Include="ModelMigrate.cpp" />
+    <ClCompile Include="MoveDownElem.cpp" />
+    <ClCompile Include="MoveUpElem.cpp" />
+    <ClCompile Include="NewRuleDlg.cpp" />
+    <ClCompile Include="OptionsDlg.cpp" />
+    <ClCompile Include="RemoveDlg.cpp" />
+    <ClCompile Include="RemoveLocAttrDlg.cpp" />
+    <ClCompile Include="Rule.cpp" />
+    <ClCompile Include="RuleEditorDlg.cpp" />
+    <ClCompile Include="RuleListCtrl.cpp" />
+    <ClCompile Include="Script.cpp" />
+    <ClCompile Include="ScriptAbs.cpp" />
+    <ClCompile Include="ScriptAttrName.cpp" />
+    <ClCompile Include="ScriptAttrType.cpp" />
+    <ClCompile Include="ScriptCmplx.cpp" />
+    <ClCompile Include="ScriptEnumAttrValue.cpp" />
+    <ClCompile Include="ScriptListCtrl.cpp" />
+    <ClCompile Include="ScriptMoveDown.cpp" />
+    <ClCompile Include="ScriptMoveUp.cpp" />
+    <ClCompile Include="SimpleRepl.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="StereotypeCastDlg.cpp" />
+    <ClCompile Include="Validator.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="AboutDlg.h" />
+    <ClInclude Include="AttrGlobalDlg.h" />
+    <ClInclude Include="AttrNameDlg.h" />
+    <ClInclude Include="AttrTypeChangeDlg.h" />
+    <ClInclude Include="CMgaXslt.h" />
+    <ClInclude Include="EnumAttrValueDlg.h" />
+    <ClInclude Include="Extractor.h" />
+    <ClInclude Include="FileListCtrl.h" />
+    <ClInclude Include="FileTransDlg.h" />
+    <ClInclude Include="Log.h" />
+    <ClInclude Include="ModelMigrate.h" />
+    <ClInclude Include="MoveDownElem.h" />
+    <ClInclude Include="MoveUpElem.h" />
+    <ClInclude Include="NewRuleDlg.h" />
+    <ClInclude Include="OptionsDlg.h" />
+    <ClInclude Include="RemoveDlg.h" />
+    <ClInclude Include="RemoveLocAttrDlg.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="Rule.h" />
+    <ClInclude Include="RuleEditorDlg.h" />
+    <ClInclude Include="RuleListCtrl.h" />
+    <ClInclude Include="Script.h" />
+    <ClInclude Include="ScriptAbs.h" />
+    <ClInclude Include="ScriptAttrName.h" />
+    <ClInclude Include="ScriptAttrType.h" />
+    <ClInclude Include="ScriptCmplx.h" />
+    <ClInclude Include="ScriptEnumAttrValue.h" />
+    <ClInclude Include="ScriptListCtrl.h" />
+    <ClInclude Include="ScriptMoveDown.h" />
+    <ClInclude Include="ScriptMoveUp.h" />
+    <ClInclude Include="SimpleRepl.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="StereotypeCastDlg.h" />
+    <ClInclude Include="Validator.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="res\FrontEnd.ico" />
+    <None Include="res\FrontEnd.rc2" />
+    <None Include="res\toolbar1.bmp" />
+    <None Include="res\header.xsl" />
+    <None Include="res\tail.xsl" />
+    <None Include="res\TAtom2Model.xsl" />
+    <None Include="res\TAttrNameChange.xsl" />
+    <None Include="res\TAttrTypeChange.xsl" />
+    <None Include="res\TAttrTypeCheck2Text.xsl" />
+    <None Include="res\TEnumAttrValueChange.xsl" />
+    <None Include="res\TKindNameChange.xsl" />
+    <None Include="res\TModel2Atom.xsl" />
+    <None Include="res\TParadigmGUIDChange.xsl" />
+    <None Include="res\TParadigmNameChange.xsl" />
+    <None Include="res\TParadigmVersionChange.xsl" />
+    <None Include="res\TRemoveGlobalAttr.xsl" />
+    <None Include="res\TRemoveKind.xsl" />
+    <None Include="res\TRemoveLocalAttr.xsl" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="FrontEnd.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="res\FrontEnd.manifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\IDLComp\IDLComp.vcxproj">
+      <Project>{0ed4c2ea-5ea6-4bac-a152-489bc3420043}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <Private>true</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RESOURCE_FILE="FrontEnd.rc" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file

Added: trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.vcxproj.filters
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/Tools/ModelMigrate/FrontEnd/FrontEnd.vcxproj.filters	Wed Apr 16 13:12:39 2014	(r2465)
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="AboutDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AttrGlobalDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AttrNameDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AttrTypeChangeDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CMgaXslt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="EnumAttrValueDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Extractor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FileListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FileTransDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Log.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ModelMigrate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MoveDownElem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MoveUpElem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="NewRuleDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OptionsDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RemoveDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RemoveLocAttrDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Rule.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RuleEditorDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RuleListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Script.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ScriptAbs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ScriptAttrName.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ScriptAttrType.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ScriptCmplx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ScriptEnumAttrValue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ScriptListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ScriptMoveDown.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ScriptMoveUp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SimpleRepl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StereotypeCastDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Validator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="AboutDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AttrGlobalDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AttrNameDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AttrTypeChangeDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CMgaXslt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EnumAttrValueDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Extractor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FileListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="FileTransDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Log.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ModelMigrate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MoveDownElem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MoveUpElem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="NewRuleDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OptionsDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RemoveDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RemoveLocAttrDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Rule.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RuleEditorDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RuleListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Script.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ScriptAbs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ScriptAttrName.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ScriptAttrType.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ScriptCmplx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ScriptEnumAttrValue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ScriptListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ScriptMoveDown.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ScriptMoveUp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SimpleRepl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="StereotypeCastDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Validator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="res\FrontEnd.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\FrontEnd.rc2">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\toolbar1.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\header.xsl" />
+    <None Include="res\tail.xsl" />
+    <None Include="res\TAtom2Model.xsl" />
+    <None Include="res\TAttrNameChange.xsl" />
+    <None Include="res\TAttrTypeChange.xsl" />
+    <None Include="res\TAttrTypeCheck2Text.xsl" />
+    <None Include="res\TEnumAttrValueChange.xsl" />
+    <None Include="res\TKindNameChange.xsl" />
+    <None Include="res\TModel2Atom.xsl" />
+    <None Include="res\TParadigmGUIDChange.xsl" />
+    <None Include="res\TParadigmNameChange.xsl" />
+    <None Include="res\TParadigmVersionChange.xsl" />
+    <None Include="res\TRemoveGlobalAttr.xsl" />
+    <None Include="res\TRemoveKind.xsl" />
+    <None Include="res\TRemoveLocalAttr.xsl" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="FrontEnd.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="res\FrontEnd.manifest" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: trunk/Tools/ModelMigrate/FrontEnd/stdafx.h
==============================================================================
--- trunk/Tools/ModelMigrate/FrontEnd/stdafx.h	Wed Apr 16 13:12:21 2014	(r2464)
+++ trunk/Tools/ModelMigrate/FrontEnd/stdafx.h	Wed Apr 16 13:12:39 2014	(r2465)
@@ -11,19 +11,19 @@
 // Modify the following defines if you have to target a platform prior to the ones specified below.
 // Refer to MSDN for the latest info on corresponding values for different platforms.
 #ifndef WINVER				// Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0400		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#define WINVER 0x0501		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
 #endif
 
 #ifndef _WIN32_WINNT		// Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0400		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#define _WIN32_WINNT 0x0501		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
 #endif						
 
 #ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#define _WIN32_WINDOWS 0x0500 // Change this to the appropriate value to target Windows Me or later.
 #endif
 
 #ifndef _WIN32_IE			// Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400	// Change this to the appropriate value to target IE 5.0 or later.
+#define _WIN32_IE 0x0550	// Change this to the appropriate value to target IE 5.0 or later.
 #endif
 
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit

Added: trunk/Tools/ModelMigrate/IDLComp/IDLComp.vcxproj
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/Tools/ModelMigrate/IDLComp/IDLComp.vcxproj	Wed Apr 16 13:12:39 2014	(r2465)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{0ED4C2EA-5EA6-4BAC-A152-489BC3420043}</ProjectGuid>
+    <RootNamespace>IDLComp</RootNamespace>
+    <Keyword>ManagedCProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <CLRSupport>OldSyntax</CLRSupport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <CLRSupport>OldSyntax</CLRSupport>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Midl Include="GMEIDLs.idl">
+      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </TypeLibraryName>
+      <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </InterfaceIdentifierFileName>
+      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </TypeLibraryName>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GME_ROOT)\Interfaces;$(GME_ROOT)\Gme\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GME_ROOT)\Interfaces;$(GME_ROOT)\Gme\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </Midl>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

Added: trunk/Tools/ModelMigrate/IDLComp/IDLComp.vcxproj.filters
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/Tools/ModelMigrate/IDLComp/IDLComp.vcxproj.filters	Wed Apr 16 13:12:39 2014	(r2465)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="GMEIDLs.idl">
+      <Filter>Source Files</Filter>
+    </Midl>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Modified: trunk/Tools/ModelMigrate/IDLComp/gmeidls.idl
==============================================================================
--- trunk/Tools/ModelMigrate/IDLComp/gmeidls.idl	Wed Apr 16 13:12:21 2014	(r2464)
+++ trunk/Tools/ModelMigrate/IDLComp/gmeidls.idl	Wed Apr 16 13:12:39 2014	(r2465)
@@ -1,22 +1,10 @@
 
 // This file will be processed by the MIDL compiler to produce the necessary header file
 
-#define GME_BASE ../../../gme
-
-#define MAKE_STR(PAR) #PAR
-#define PATH3(X,Y) MAKE_STR(X##Y)
-#define PATH2(X,Y) PATH3(X,Y)
-#define PATH(NAME) PATH2(GME_BASE,NAME)
-
-
-#include PATH(/Interfaces/InterfaceColl.h)
-#include PATH(/Interfaces/meta.idl)
-#include PATH(/Interfaces/mga.idl)
-#include PATH(/Interfaces/mgautil.idl)
-#include PATH(/Interfaces/gme.idl)
-#include PATH(/Interfaces/parser.idl)
-
-
-
-
-
+#include "InterfaceColl.h"
+import "Core.idl";
+import "Meta.idl";
+import "Mga.idl";
+import "MgaUtil.idl";
+import "GME.idl";
+import "Parser.idl";

Modified: trunk/Tools/ModelMigrate/ModelMigrate.sln
==============================================================================
--- trunk/Tools/ModelMigrate/ModelMigrate.sln	Wed Apr 16 13:12:21 2014	(r2464)
+++ trunk/Tools/ModelMigrate/ModelMigrate.sln	Wed Apr 16 13:12:39 2014	(r2465)
@@ -1,11 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModelMigrate", "FrontEnd\FrontEnd.vcproj", "{73E065E0-27FD-4D46-A483-EFB75438F74E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0ED4C2EA-5EA6-4BAC-A152-489BC3420043} = {0ED4C2EA-5EA6-4BAC-A152-489BC3420043}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModelMigrate", "FrontEnd\FrontEnd.vcxproj", "{73E065E0-27FD-4D46-A483-EFB75438F74E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IDLComp", "IDLComp\IDLComp.vcproj", "{0ED4C2EA-5EA6-4BAC-A152-489BC3420043}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IDLComp", "IDLComp\IDLComp.vcxproj", "{0ED4C2EA-5EA6-4BAC-A152-489BC3420043}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution


More information about the gme-commit mailing list