OCC21135 The BinPlugin.vcproj is generated incorrectly for vc8_64.

diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl
index 28b66440b7ec85988597bae6d9c73b74ba540f3d..c1f046f823e152b6391fffd7eaf23b167463b018 100755 (executable)
--- a/src/WOKTclLib/osutils.tcl
+++ b/src/WOKTclLib/osutils.tcl
@@ -1232,10 +1232,15 @@ proc osutils:vc8x_64 { dir tkloc {tmplat {} } {fmtcpp {} } } {
     #puts "$temp3 $files"
     regsub -all -- {__FILES__} $temp3 $files temp4
     regsub -all -- {__CONF__} $temp4 $binext temp5
+    if { $binext == 2 } {
+       regsub -all -- {__XQTEXT__} $temp5 "dll" temp6
+    } else {
+       regsub -all -- {__XQTEXT__} $temp5 "exe" temp6
+    }
     set fp [open [set fdsp [file join $dir ${tf}.vcproj]] w]
     fconfigure $fp -translation crlf
  
-    puts $fp $temp5
+    puts $fp $temp6
     set fout [lappend fout $fdsp]
     close $fp
    }

diff --git a/src/WOKTclLib/template.vc8x_64 b/src/WOKTclLib/template.vc8x_64
index 7626871b6ed45cd59c5700a6f26706647b332a2a..ea25fa614664d4926d380c7a67104b4a3bbe7429 100755 (executable)
--- a/src/WOKTclLib/template.vc8x_64
+++ b/src/WOKTclLib/template.vc8x_64
@@ -1,213 +1,215 @@
-<?xml version="1.0" encoding="windows-1251"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="__XQTNAM__"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="x64"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory=".\..\..\..\win64\bind"\r
-                       IntermediateDirectory=".\..\..\..\win64\objd\__XQTNAM__"\r
-                       ConfigurationType="__CONF__"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                               MkTypLibCompatible="true"\r
-                               SuppressStartupBanner="true"\r
-                               TargetEnvironment="1"\r
-                               TypeLibraryName=".\..\..\..\win64\bind/__XQTNAM__.tlb"\r
-                               HeaderFileName=""\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/favor:blend /DWNT"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;_OCC64"\r
-                               ExceptionHandling="2"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               AssemblerListingLocation=".\..\..\..\win64\objd\__XQTNAM__/"\r
-                               ObjectFile=".\..\..\..\win64\objd\__XQTNAM__/"\r
-                               ProgramDataBaseFileName=".\..\..\..\win64\objd\__XQTNAM__/"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4996"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                               Culture="1033"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="/DLL __TKDEP__"\r
-                               LinkIncremental="1"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\..\win64\libd"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile=".\..\..\..\win64\bind/__XQTNAM__.pdb"\r
-                               SubSystem="1"\r
-                               ImportLibrary="..\..\..\win64\libd\__XQTNAM__.lib"\r
-                               TargetMachine="X64"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory=".\..\..\..\win64\bin"\r
-                       IntermediateDirectory=".\..\..\..\win64\obj\__XQTNAM__"\r
-                       ConfigurationType="__CONF__"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
-                               MkTypLibCompatible="true"\r
-                               SuppressStartupBanner="true"\r
-                               TargetEnvironment="1"\r
-                               TypeLibraryName=".\..\..\..\win64\bin/__XQTNAM__.tlb"\r
-                               HeaderFileName=""\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/favor:blend /DWNT"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;_OCC64"\r
-                               StringPooling="true"\r
-                               ExceptionHandling="2"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               AssemblerListingLocation=".\..\..\..\win64\obj\__XQTNAM__/"\r
-                               ObjectFile=".\..\..\..\win64\obj\__XQTNAM__/"\r
-                               ProgramDataBaseFileName=".\..\..\..\win64\obj\__XQTNAM__/"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="true"\r
-                               DisableSpecificWarnings="4996"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
-                               Culture="1033"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="/DLL __TKDEP__"\r
-                               LinkIncremental="1"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\..\win64\lib"\r
-                               ProgramDatabaseFile=".\..\..\..\win64\bin/__XQTNAM__.pdb"\r
-                               SubSystem="1"\r
-                               ImportLibrary="..\..\..\win64\lib\__XQTNAM__.lib"\r
-                               TargetMachine="X64"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       >\r
-__FILES__\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="__XQTNAM__"
+       >
+       <Platforms>
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory=".\..\..\..\win64\bind"
+                       IntermediateDirectory=".\..\..\..\win64\objd\__XQTNAM__"
+                       ConfigurationType="__CONF__"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               PreprocessorDefinitions="_DEBUG"
+                               MkTypLibCompatible="true"
+                               SuppressStartupBanner="true"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\..\..\..\win64\bind/__XQTNAM__.tlb"
+                               HeaderFileName=""
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions="/favor:blend /DWNT"
+                               Optimization="0"
+                               PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;_OCC64"
+                               ExceptionHandling="2"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               AssemblerListingLocation=".\..\..\..\win64\objd\__XQTNAM__/"
+                               ObjectFile=".\..\..\..\win64\objd\__XQTNAM__/"
+                               ProgramDataBaseFileName=".\..\..\..\win64\objd\__XQTNAM__/"
+                               WarningLevel="3"
+                               SuppressStartupBanner="true"
+                               DebugInformationFormat="3"
+                               DisableSpecificWarnings="4996"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="_DEBUG"
+                               Culture="1033"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="__TKDEP__"
+                               OutputFile=".\..\..\..\win64\bind\__XQTNAM__.__XQTEXT__"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="true"
+                               AdditionalLibraryDirectories="..\..\..\win64\libd"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=".\..\..\..\win64\bind/__XQTNAM__.pdb"
+                               SubSystem="1"
+                               ImportLibrary="..\..\..\win64\libd\__XQTNAM__.lib"
+                               TargetMachine="X64"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory=".\..\..\..\win64\bin"
+                       IntermediateDirectory=".\..\..\..\win64\obj\__XQTNAM__"
+                       ConfigurationType="__CONF__"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               MkTypLibCompatible="true"
+                               SuppressStartupBanner="true"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\..\..\..\win64\bin/__XQTNAM__.tlb"
+                               HeaderFileName=""
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions="/favor:blend /DWNT"
+                               Optimization="2"
+                               InlineFunctionExpansion="1"
+                               PreprocessorDefinitions="WIN64;NDEBUG;No_Exception;_WINDOWS;WNT;CSFDB;_OCC64"
+                               StringPooling="true"
+                               ExceptionHandling="2"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
+                               AssemblerListingLocation=".\..\..\..\win64\obj\__XQTNAM__/"
+                               ObjectFile=".\..\..\..\win64\obj\__XQTNAM__/"
+                               ProgramDataBaseFileName=".\..\..\..\win64\obj\__XQTNAM__/"
+                               WarningLevel="3"
+                               SuppressStartupBanner="true"
+                               DisableSpecificWarnings="4996"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="__TKDEP__"
+                               OutputFile=".\..\..\..\win64\bin\__XQTNAM__.__XQTEXT__"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="true"
+                               AdditionalLibraryDirectories="..\..\..\win64\lib"
+                               ProgramDatabaseFile=".\..\..\..\win64\bin/__XQTNAM__.pdb"
+                               SubSystem="1"
+                               ImportLibrary="..\..\..\win64\lib\__XQTNAM__.lib"
+                               TargetMachine="X64"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCWebDeploymentTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       >
+__FILES__
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>