[commit] r1732 - in trunk/SDK/DecoratorWizard: Scripts/1033 Templates/1033
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed Dec 7 12:34:05 CST 2011
Author: ksmyth
Date: Wed Dec 7 12:34:05 2011
New Revision: 1732
Log:
Fix DecoratorWizard-generated files under VS2010
Modified:
trunk/SDK/DecoratorWizard/Scripts/1033/default.js
trunk/SDK/DecoratorWizard/Templates/1033/Decorator.sln
trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.def
trunk/SDK/DecoratorWizard/Templates/1033/DecoratorImpl.cpp
trunk/SDK/DecoratorWizard/Templates/1033/DecoratorImpl.h
trunk/SDK/DecoratorWizard/Templates/1033/DecoratorLib.idl
trunk/SDK/DecoratorWizard/Templates/1033/StdAfx.cpp
trunk/SDK/DecoratorWizard/Templates/1033/StdAfx.h
trunk/SDK/DecoratorWizard/Templates/1033/Templates.inf
Modified: trunk/SDK/DecoratorWizard/Scripts/1033/default.js
==============================================================================
--- trunk/SDK/DecoratorWizard/Scripts/1033/default.js Mon Dec 5 13:24:58 2011 (r1731)
+++ trunk/SDK/DecoratorWizard/Scripts/1033/default.js Wed Dec 7 12:34:05 2011 (r1732)
@@ -1,14 +1,61 @@
-
function OnFinish(selProj, selObj)
{
+ try
+ {
+ if (dte.Version == '10.0') {
+ OnFinish100(selProj, selObj);
+ }
+ else {
+ OnFinish90(selProj, selObj);
+ }
+ }
+ catch(e)
+ {
+ if (e.description.length != 0)
+ SetErrorInfo(e);
+ return e.number
+ }
+}
+
+function OnFinish100(selProj, selObj)
+{
+ try
+ {
+ var strProjectPath = wizard.FindSymbol("PROJECT_PATH");
+ var strProjectName = wizard.FindSymbol("PROJECT_NAME");
+
+ selProj = CreateProject(strProjectName, strProjectPath);
+
+ AddCommonConfig(selProj, strProjectName);
+ AddConfig(selProj, strProjectName);
+
+ SetupFilters(selProj);
+
+ var InfFile = CreateCustomInfFile();
+ AddFilesToCustomProj(selProj, strProjectName, strProjectPath, InfFile);
+ PchSettings(selProj);
+ InfFile.Delete();
+
+ selProj.Object.Save();
+ }
+ catch(e)
+ {
+ if (e.description.length != 0)
+ SetErrorInfo(e);
+ return e.number
+ }
+}
+
+function OnFinish90(selProj, selObj)
+{
try
{
var strProjectPath = wizard.FindSymbol('PROJECT_PATH');
var strProjectName = wizard.FindSymbol('PROJECT_NAME');
- selProj = CreateCustomProject(strProjectName, strProjectPath);
+ selProj = CreateCustomProject90(strProjectName, strProjectPath);
AddConfig(selProj, strProjectName);
- AddFilters(selProj);
+ AddFilters90(selProj);
var InfFile = CreateCustomInfFile();
AddFilesToCustomProj(selProj, strProjectName, strProjectPath, InfFile);
@@ -25,7 +72,7 @@
}
}
-function CreateCustomProject(strProjectName, strProjectPath)
+function CreateCustomProject90(strProjectName, strProjectPath)
{
try
{
@@ -97,7 +144,7 @@
}
}
-function AddFilters(proj)
+function AddFilters90(proj)
{
try
{
@@ -125,18 +172,16 @@
// DEBUG GENERAL SETTINGS
var config = proj.Object.Configurations('Debug');
- config.IntermediateDirectory = '$(ConfigurationName)';
- config.OutputDirectory = '$(ConfigurationName)';
config.ConfigurationType = ConfigurationTypes.typeDynamicLibrary;
config.useOfMfc = useOfMfc.useMfcDynamic;
config.useOfATL = useOfATL.useATLDynamic;
config.CharacterSet = charSet.charSetMBCS;
-
- // DEBUG CUSTOM BUILD SETTINGS
- var CBTool = config.Tools('VCCustomBuildTool');
- CBTool.Description = "Performing registration (requires elevated priviledges on Windows Vista)...";
- CBTool.CommandLine = "regsvr32 /s /c \"$(TargetPath)\"\necho regsvr32 exec. time > \"$(IntDir)\\regsvr32.trg\"\n";
- CBTool.Outputs = "$(IntDir)\\regsvr32.trg";
+ if (dte.Version == '10.0') {
+ var rule = config.Rules.Item("ConfigurationGeneral");
+ rule.SetPropertyValue("TargetName", "$(ProjectName)D");
+ var PreBuild = config.Tools('VCPreBuildEventTool');
+ PreBuild.CommandLine = "msbuild \"$(GME_ROOT)\\SDK\\DecoratorLib\\DecoratorLib.vcxproj\" /p:Configuration=$(Configuration) \"/p:SolutionDir=$(SolutionDir)\\\" /p:Platform=$(Platform)"
+ }
// DEBUG MIDL SETTINGS
var MIDLTool = config.Tools('VCMIDLTool');
@@ -144,13 +189,16 @@
MIDLTool.MkTypLibCompatible="false";
MIDLTool.ValidateParameters="true";
MIDLTool.TypeLibraryName = ".\\DecoratorLib.tlb";
- MIDLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/SDK/DecoratorLib;$(GME_ROOT)/Gme/Interfaces;$(GME_ROOT)/Interfaces";
- MIDLTool.HeaderFileName = "";
+ MIDLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)\\SDK\\DecoratorLib;$(GME_ROOT)\\bin;$(GME_ROOT)\\Gme\\Release;$(GME_ROOT)\\Gme\\Debug;$(GME_ROOT)\\Gme\\Interfaces;$(GME_ROOT)\\Interfaces";
+ if (dte.Version == '10.0')
+ MIDLTool.HeaderFileName = "%(Filename).h";
+ else
+ MIDLTool.HeaderFileName = "$(InputName).h";
// DEBUG COMPILER SETTINGS
var CLTool = config.Tools('VCCLCompilerTool');
CLTool.Optimization = optimizeOption.optimizeDisabled;
- CLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/Gme/Interfaces;$(GME_ROOT)/Interfaces;$(GME_ROOT)/SDK/DecoratorLib";
+ CLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)\\Gme/Interfaces;$(GME_ROOT)\\Interfaces;$(GME_ROOT)\\SDK\\DecoratorLib";
CLTool.PreprocessorDefinitions = "WIN32;_DEBUG;_WINDOWS;_USRDLL;_ATL_DLL";
CLTool.BasicRuntimeChecks = basicRuntimeCheckOption.runtimeBasicCheckAll;
CLTool.RuntimeLibrary = runtimeLibraryOption.rtMultiThreadedDebugDLL;
@@ -167,29 +215,28 @@
// DEBUG LINKER SETTINGS
var LinkTool = config.Tools('VCLinkerTool');
LinkTool.AdditionalDependencies = "gdiplus.lib DecoratorLibD.lib";
- LinkTool.AdditionalLibraryDirectories = "$(GME_ROOT)/GME/Lib;$(GME_ROOT)/Lib";
+ LinkTool.AdditionalLibraryDirectories = "$(Configuration)";
LinkTool.LinkIncremental = linkIncrementalType.linkIncrementalYes;
LinkTool.GenerateDebugInformation = "true";
+ LinkTool.RegisterOutput = true;
LinkTool.SubSystem = subSystemOption.subSystemWindows;
LinkTool.TargetMachine = machineTypeOption.machineX86;
LinkTool.ModuleDefinitionFile = 'DecoratorApp.def';
+ if (dte.Version != '10.0')
+ LinkTool.OutputFile = "$(OutDir)\\$(ProjectName)D.dll"
// --------------------------- RELEASE SETTINGS --------------------------- //
// RELEASE GENERAL SETTINGS
config = proj.Object.Configurations('Release');
- config.IntermediateDirectory = '$(ConfigurationName)';
- config.OutputDirectory = '$(ConfigurationName)';
config.ConfigurationType = ConfigurationTypes.typeDynamicLibrary;
config.useOfMfc = useOfMfc.useMfcDynamic;
config.useOfATL = useOfATL.useATLDynamic;
config.CharacterSet = charSet.charSetMBCS;
-
- // RELEASE CUSTOM BUILD SETTINGS
- var CBTool = config.Tools('VCCustomBuildTool');
- CBTool.Description = "Performing registration (requires elevated priviledges on Windows Vista)...";
- CBTool.CommandLine = "regsvr32 /s /c \"$(TargetPath)\"\necho regsvr32 exec. time > \"$(IntDir)\\regsvr32.trg\"\n";
- CBTool.Outputs = "$(IntDir)\\regsvr32.trg";
+ if (dte.Version == '10.0') {
+ var PreBuild = config.Tools('VCPreBuildEventTool');
+ PreBuild.CommandLine = "msbuild \"$(GME_ROOT)\\SDK\\DecoratorLib\\DecoratorLib.vcxproj\" /p:Configuration=$(Configuration) \"/p:SolutionDir=$(SolutionDir)\\\" /p:Platform=$(Platform)"
+ }
// RELEASE MIDL SETTINGS
var MIDLTool = config.Tools('VCMIDLTool');
@@ -197,8 +244,11 @@
MIDLTool.MkTypLibCompatible = "false";
MIDLTool.ValidateParameters = "true";
MIDLTool.TypeLibraryName = ".\\DecoratorLib.tlb";
- MIDLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/SDK/DecoratorLib;$(GME_ROOT)/Gme/Interfaces;$(GME_ROOT)/Interfaces";
- MIDLTool.HeaderFileName = "";
+ MIDLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)\\SDK\\DecoratorLib;$(GME_ROOT)\\bin;$(GME_ROOT)\\Gme\\Release;$(GME_ROOT)\\Gme\\Debug;$(GME_ROOT)\\Gme\\Interfaces;$(GME_ROOT)\\Interfaces";
+ if (dte.Version == '10.0')
+ MIDLTool.HeaderFileName = "%(Filename).h";
+ else
+ MIDLTool.HeaderFileName = "$(InputName).h";
// RELEASE COMPILER SETTINGS
var CLTool = config.Tools('VCCLCompilerTool');
@@ -206,7 +256,7 @@
CLTool.InlineFunctionExpansion = inlineExpansionOption.expandAnySuitable;
CLTool.EnableIntrinsicFunctions = true;
CLTool.FavorSizeOrSpeed = favorSizeOrSpeedOption.favorSpeed;
- CLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)/Gme/Interfaces;$(GME_ROOT)/Interfaces;$(GME_ROOT)/SDK/DecoratorLib";
+ CLTool.AdditionalIncludeDirectories = ".;$(GME_ROOT)\\Gme\\Interfaces;$(GME_ROOT)\\Interfaces;$(GME_ROOT)\\SDK\\DecoratorLib";
CLTool.PreprocessorDefinitions = "WIN32;NDEBUG;_WINDOWS;_USRDLL;_ATL_DLL";
CLTool.RuntimeLibrary = runtimeLibraryOption.rtMultiThreadedDLL;
CLTool.RuntimeTypeInfo = "true";
@@ -222,12 +272,15 @@
// RELASE LINKER SETTINGS
var LinkTool = config.Tools('VCLinkerTool');
LinkTool.AdditionalDependencies = "gdiplus.lib DecoratorLib.lib";
- LinkTool.AdditionalLibraryDirectories = "$(GME_ROOT)/GME/Lib;$(GME_ROOT)/Lib";
+ LinkTool.AdditionalLibraryDirectories = "$(Configuration)";
LinkTool.LinkIncremental = linkIncrementalType.linkIncrementalNo;
LinkTool.GenerateDebugInformation = "false";
LinkTool.SubSystem = subSystemOption.subSystemWindows;
LinkTool.TargetMachine = machineTypeOption.machineX86;
LinkTool.ModuleDefinitionFile = 'DecoratorApp.def';
+ LinkTool.RegisterOutput = true;
+ if (dte.Version != '10.0')
+ LinkTool.OutputFile = "$(OutDir)\\$(ProjectName).dll"
}
catch(e)
{
Modified: trunk/SDK/DecoratorWizard/Templates/1033/Decorator.sln
==============================================================================
--- trunk/SDK/DecoratorWizard/Templates/1033/Decorator.sln Mon Dec 5 13:24:58 2011 (r1731)
+++ trunk/SDK/DecoratorWizard/Templates/1033/Decorator.sln Wed Dec 7 12:34:05 2011 (r1732)
@@ -1,11 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Decorator", "Decorator.vcproj", "{EDD829D2-B202-49AD-8F2B-AF0D5323F1D3}"
- ProjectSection(ProjectDependencies) = postProject
- {77FEBD41-CD6C-4D55-B561-3957F7151CC2} = {77FEBD41-CD6C-4D55-B561-3957F7151CC2}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DecoratorLib", "..\DecoratorLib\DecoratorLib.vcproj", "{77FEBD41-CD6C-4D55-B561-3957F7151CC2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +12,6 @@
{EDD829D2-B202-49AD-8F2B-AF0D5323F1D3}.Debug|Win32.Build.0 = Debug|Win32
{EDD829D2-B202-49AD-8F2B-AF0D5323F1D3}.Release|Win32.ActiveCfg = Release|Win32
{EDD829D2-B202-49AD-8F2B-AF0D5323F1D3}.Release|Win32.Build.0 = Release|Win32
- {77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Debug|Win32.ActiveCfg = Debug|Win32
- {77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Debug|Win32.Build.0 = Debug|Win32
- {77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Release|Win32.ActiveCfg = Release|Win32
- {77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.def
==============================================================================
--- trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.def Mon Dec 5 13:24:58 2011 (r1731)
+++ trunk/SDK/DecoratorWizard/Templates/1033/DecoratorApp.def Wed Dec 7 12:34:05 2011 (r1732)
@@ -1,7 +1,5 @@
; DecoratorApp.def : Declares the module parameters.
-LIBRARY "Decorator.DLL"
-
EXPORTS
DllCanUnloadNow PRIVATE
DllGetClassObject PRIVATE
Modified: trunk/SDK/DecoratorWizard/Templates/1033/DecoratorImpl.cpp
==============================================================================
--- trunk/SDK/DecoratorWizard/Templates/1033/DecoratorImpl.cpp Mon Dec 5 13:24:58 2011 (r1731)
+++ trunk/SDK/DecoratorWizard/Templates/1033/DecoratorImpl.cpp Wed Dec 7 12:34:05 2011 (r1732)
@@ -304,7 +304,7 @@
return retVal;
}
-STDMETHODIMP CDecoratorImpl::Draw(HDC hdc)
+STDMETHODIMP CDecoratorImpl::Draw(ULONG hdc)
{
AFX_MANAGE_STATE(AfxGetStaticModuleState());
@@ -360,7 +360,7 @@
return retVal;
}
-STDMETHODIMP CDecoratorImpl::DrawEx(HDC hdc, ULONGLONG gdipGraphics)
+STDMETHODIMP CDecoratorImpl::DrawEx(ULONG hdc, ULONGLONG gdipGraphics)
{
AFX_MANAGE_STATE(AfxGetStaticModuleState());
@@ -373,7 +373,7 @@
HRESULT retVal = S_OK;
CDC dc;
- dc.Attach(hdc);
+ dc.Attach((HDC)hdc);
{
try {
m_pElementDecorator->Draw(&dc, (Gdiplus::Graphics*)gdipGraphics);
Modified: trunk/SDK/DecoratorWizard/Templates/1033/DecoratorImpl.h
==============================================================================
--- trunk/SDK/DecoratorWizard/Templates/1033/DecoratorImpl.h Mon Dec 5 13:24:58 2011 (r1731)
+++ trunk/SDK/DecoratorWizard/Templates/1033/DecoratorImpl.h Wed Dec 7 12:34:05 2011 (r1732)
@@ -65,12 +65,12 @@
STDMETHOD( GetLabelLocation ) ( /*[out]*/ LONG* sx, /*[out]*/ LONG* sy, /*[out]*/ LONG* ex, /*[out]*/ LONG* ey );
STDMETHOD( GetPortLocation ) ( /*[in]*/ IMgaFCO* fco, /*[out]*/ LONG* sx, /*[out]*/ LONG* sy, /*[out]*/ LONG* ex, /*[out]*/ LONG* ey );
STDMETHOD( GetPorts ) ( /*[out, retval]*/ IMgaFCOs** portFCOs );
- STDMETHOD( Draw ) ( /*[in]*/ HDC hdc );
+ STDMETHOD( Draw ) ( /*[in]*/ ULONG hdc );
STDMETHOD( SaveState ) ( void );
// =============== inherited from IMgaElementDecorator
STDMETHOD( InitializeEx ) ( /*[in]*/ IMgaProject* pProject, /*[in]*/ IMgaMetaPart* pPart, /*[in]*/ IMgaFCO* pFCO, /*[in]*/ IMgaCommonDecoratorEvents* eventSink, /*[in]*/ ULONGLONG parentWnd );
- STDMETHOD( DrawEx ) ( /*[in]*/ HDC hdc, /*[in]*/ ULONGLONG gdipGraphics );
+ STDMETHOD( DrawEx ) ( /*[in]*/ ULONG hdc, /*[in]*/ ULONGLONG gdipGraphics );
STDMETHOD( SetSelected ) ( /*[in]*/ VARIANT_BOOL bIsSelected );
STDMETHOD( MouseMoved ) ( /*[in]*/ ULONG nFlags, /*[in]*/ LONG pointx, /*[in]*/ LONG pointy, /*[in]*/ ULONGLONG transformHDC );
STDMETHOD( MouseLeftButtonDown ) ( /*[in]*/ ULONG nFlags, /*[in]*/ LONG pointx, /*[in]*/ LONG pointy, /*[in]*/ ULONGLONG transformHDC );
Modified: trunk/SDK/DecoratorWizard/Templates/1033/DecoratorLib.idl
==============================================================================
--- trunk/SDK/DecoratorWizard/Templates/1033/DecoratorLib.idl Mon Dec 5 13:24:58 2011 (r1731)
+++ trunk/SDK/DecoratorWizard/Templates/1033/DecoratorLib.idl Wed Dec 7 12:34:05 2011 (r1732)
@@ -27,7 +27,7 @@
coclass Decorator
{
[default] interface IMgaElementDecorator;
- interface IMgaVersionInfo;
+ interface IGMEVersionInfo;
};
};
Modified: trunk/SDK/DecoratorWizard/Templates/1033/StdAfx.cpp
==============================================================================
--- trunk/SDK/DecoratorWizard/Templates/1033/StdAfx.cpp Mon Dec 5 13:24:58 2011 (r1731)
+++ trunk/SDK/DecoratorWizard/Templates/1033/StdAfx.cpp Wed Dec 7 12:34:05 2011 (r1732)
@@ -3,6 +3,7 @@
// stdafx.obj will contain the pre-compiled type information
#include "stdafx.h"
+#include "Gme_i.c"
#ifdef _ATL_STATIC_REGISTRY
#include <statreg.h>
Modified: trunk/SDK/DecoratorWizard/Templates/1033/StdAfx.h
==============================================================================
--- trunk/SDK/DecoratorWizard/Templates/1033/StdAfx.h Mon Dec 5 13:24:58 2011 (r1731)
+++ trunk/SDK/DecoratorWizard/Templates/1033/StdAfx.h Wed Dec 7 12:34:05 2011 (r1732)
@@ -30,6 +30,11 @@
#include "DecoratorError.h"
+#include "Core.h"
+#include "Mga.h"
+#include "Parser.h"
+#include "Gme.h"
+
#include <stdio.h>
#define GENERATEDLIBHEADER "DecoratorLib.h"
Modified: trunk/SDK/DecoratorWizard/Templates/1033/Templates.inf
==============================================================================
--- trunk/SDK/DecoratorWizard/Templates/1033/Templates.inf Mon Dec 5 13:24:58 2011 (r1731)
+++ trunk/SDK/DecoratorWizard/Templates/1033/Templates.inf Wed Dec 7 12:34:05 2011 (r1732)
@@ -2,8 +2,6 @@
Decorator.h
Decorator.rc
Decorator.rgs
-Decorator.sln
-Decorator.vcproj
DecoratorApp.cpp
DecoratorApp.def
DecoratorCompositePart.cpp
More information about the gme-commit
mailing list