Added support for optional library names for debug builds

Author: neslib

Bin/Chet.exe

@@ -101,12 +101,13 @@
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <Debugger_RunParams>..\Sample\usp10.chet</Debugger_RunParams>
+        <Debugger_RunParams>..\Sample\Sample.chet </Debugger_RunParams>
         <VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
-        <VerInfo_Build>67</VerInfo_Build>
+        <VerInfo_Build>73</VerInfo_Build>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.3.0.67;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.1.0.42;Comments=</VerInfo_Keys>
-        <VerInfo_MinorVer>3</VerInfo_MinorVer>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.4.0.73;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.4.0;Comments=</VerInfo_Keys>
+        <VerInfo_MinorVer>4</VerInfo_MinorVer>
+        <Icon_MainIcon>Chet_Icon.ico</Icon_MainIcon>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -154,7 +155,10 @@
                 <Source>
                     <Source Name="MainSource">Chet.dpr</Source>
                 </Source>
-                <Excluded_Packages/>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>
                 <Platform value="Win32">False</Platform>

Chet.dproj

@@ -2275,7 +2275,12 @@ procedure THeaderTranslator.WritePlatforms;
   First: Boolean;
   PT: TPlatformType;
   P: TPlatform;
+  DebugDefine: String;
 begin
+  DebugDefine := FProject.DebugDefine.Trim;
+  if (DebugDefine = '') then
+    DebugDefine := 'DEBUG';
+
   First := True;
   FWriter.StartSection('const');
 
@@ -2300,7 +2305,16 @@ procedure THeaderTranslator.WritePlatforms;
 
       FWriter.WriteLn(')}');
 
-      FWriter.WriteLn('%s%s = ''%s'';', [FSymbolPrefix, FProject.LibraryConstant, P.LibraryName]);
+      if (P.DebugLibraryName = '') then
+      begin
+        FWriter.WriteLn('%s%s = ''%s'';',
+          [FSymbolPrefix, FProject.LibraryConstant, P.LibraryName])
+      end
+      else
+      begin
+        FWriter.WriteLn('%s%s = {$IFDEF %s}''%s''{$ELSE}''%s''{$ENDIF};',
+          [FSymbolPrefix, FProject.LibraryConstant, DebugDefine, P.DebugLibraryName, P.LibraryName]);
+      end;
       FWriter.WriteLn('_PU = ''%s'';', [P.Prefix]);
     end;
   end;

Chet.res

@@ -118,9 +118,11 @@   TPlatform = class
     FPlatformType: TPlatformType;
     FEnabled: Boolean;
     FLibraryName: String;
+    FDebugLibraryName: String;
     FPrefix: String;
     procedure SetEnabled(const AValue: Boolean);
     procedure SetLibraryName(const AValue: String);
+    procedure SetDebugLibraryName(const AValue: String);
     procedure SetPrefix(const AValue: String);
   public
     constructor Create(const AProject: TProject;
@@ -149,6 +151,11 @@   TPlatform = class
     { The name of the (dynamic or static) library for this platform. }
     property LibraryName: String read FLibraryName write SetLibraryName;
 
+    { Optional name of the (dynamic or static) library containing a DEBUG build
+      for this platform. This version of the library will be used if the
+      application is built with a define that is set in TProject.DebugDefine. }
+    property DebugLibraryName: String read FDebugLibraryName write SetDebugLibraryName;
+
     { The function name prefix to use for this platform. Usually an empty
       string, but on some platforms, each function will have a '_' prefix. }
     property Prefix: String read FPrefix write SetPrefix;
@@ -167,6 +174,7 @@   TProject = class
     FUseUnits: String;
 
     FLibraryConstant: String;
+    FDebugDefine: String;
     FPlatforms: array [TPlatformType] of TPlatform;
 
     FIgnoreParseErrors: Boolean;
@@ -210,6 +218,7 @@   TProject = class
     procedure SetUnconvertibleHandling(const Value: TUnconvertibleHandling);
     function GetPlatform(const AIndex: TPlatformType): TPlatform;
     procedure SetLibraryConstant(const Value: String);
+    procedure SetDebugDefine(const Value: String);
     procedure SetEnumHandling(const Value: TEnumHandling);
     procedure SetUseUnits(const Value: String);
     procedure SetSymbolsToIgnore(const Value: TStrings);
@@ -299,6 +308,15 @@   TProject = class
         LIB_MYLIB = 'mylib.dll' }
     property LibraryConstant: String read FLibraryConstant write SetLibraryConstant;
 
+    (*The name of the define that is used to link to Debug versions of the
+      library. For example, if there are is a debug version of the 'mylib.dll'
+      library called 'mylib_debug.dll', and DebugDefine is set to 'DEBUG_LIBS',
+      then the following code will be generated:
+
+      const
+        LIB_MYLIB = {$IFDEF DEBUG_LIBS}'mylib_debug.dll'{ELSE}'mylib.dll'{$ENDIF} *)
+    property DebugDefine: String read FDebugDefine write SetDebugDefine;
+
     { Information about each of the supported platforms }
     property Platforms[const AIndex: TPlatformType]: TPlatform read GetPlatform;
 
@@ -403,10 +421,12 @@ implementation
   ID_UNCONVERTIBLE_HANDLING = 'UnconvertibleHandling';
   ID_ENABLED = 'Enabled';
   ID_LIBRARY_NAME = 'LibraryName';
+  ID_DEBUG_LIBRARY_NAME = 'DebugLibraryName';
   ID_PREFIX = 'Prefix';
   ID_LIBRARY_CONSTANT = 'LibraryConstant';
   ID_EXCLUDED_HEADERS = 'ExcludedHeaders';
   ID_CUSTOM_CTYPES_MAP = 'CTypesToDelphiMap';
+  ID_DEBUG_DEFINE = 'DebugDefine';
   ID_COUNT = 'Count';
   ID_ITEM = 'Item';
   ID_SCRIPT = 'Script';
@@ -577,6 +597,7 @@ procedure TProject.Load(const AFilename: String);
     FTargetPasFile := IniFile.ReadString(IS_PROJECT, ID_TARGET_PAS_FILE, '');
     FUseUnits := IniFile.ReadString(IS_PROJECT, ID_USE_UNITS, '');
     FLibraryConstant := IniFile.ReadString(IS_PROJECT, ID_LIBRARY_CONSTANT, '');
+    FDebugDefine := IniFile.ReadString(IS_PROJECT, ID_DEBUG_DEFINE, '');
     FIgnoredFiles := IniFile.ReadString(IS_PROJECT, ID_EXCLUDED_HEADERS, '');
     FCustomCTypesMap := IniFile.ReadString(IS_PROJECT, ID_CUSTOM_CTYPES_MAP, '');
     for P := Low(TPlatformType) to High(TPlatformType) do
@@ -639,6 +660,7 @@ procedure TProject.Reset;
   FTargetPasFile := '';
   FUseUnits := '';
   FLibraryConstant := '';
+  FDebugDefine := '';
   FIgnoredFiles := '';
 
   for P := Low(TPlatformType) to High(TPlatformType) do
@@ -675,6 +697,7 @@ procedure TProject.Save(const AFilename: String);
     IniFile.WriteString(IS_PROJECT, ID_TARGET_PAS_FILE, FTargetPasFile);
     IniFile.WriteString(IS_PROJECT, ID_USE_UNITS, FUseUnits);
     IniFile.WriteString(IS_PROJECT, ID_LIBRARY_CONSTANT, FLibraryConstant);
+    IniFile.WriteString(IS_PROJECT, ID_DEBUG_DEFINE, FDebugDefine);
     IniFile.WriteString(IS_PROJECT, ID_EXCLUDED_HEADERS, FIgnoredFiles);
     IniFile.WriteString(IS_PROJECT, ID_CUSTOM_CTYPES_MAP, FCustomCTypesMap);
 
@@ -756,6 +779,15 @@ procedure TProject.SetCustomCTypesMap(const AValue: String);
   end;
 end;
 
+procedure TProject.SetDebugDefine(const Value: String);
+begin
+  if (Value <> FDebugDefine) then
+  begin
+    FDebugDefine := Value;
+    Modified := True;
+  end;
+end;
+
 procedure TProject.SetDelayedLoading(const Value: Boolean);
 begin
   if (Value <> FDelayedLoading) then
@@ -921,13 +953,15 @@ procedure TPlatform.Load(const AIniFile: TMemIniFile);
 
   FEnabled := AIniFile.ReadBool(Section, ID_ENABLED, False);
   FLibraryName := AIniFile.ReadString(Section, ID_LIBRARY_NAME, '');
+  FDebugLibraryName := AIniFile.ReadString(Section, ID_DEBUG_LIBRARY_NAME, '');
   FPrefix := AIniFile.ReadString(Section, ID_PREFIX, '');
 end;
 
 procedure TPlatform.Reset;
 begin
   FEnabled := (FPlatformType = TPlatformType.Win32);
   FLibraryName := '';
+  FDebugLibraryName := '';
   FPrefix := '';
 end;
 
@@ -938,9 +972,19 @@ procedure TPlatform.Save(const AIniFile: TMemIniFile);
   Section := IS_PLATFORM_PREFIX + GetEnumName(TypeInfo(TPlatformType), Ord(FPlatformType));
   AIniFile.WriteBool(Section, ID_ENABLED, FEnabled);
   AIniFile.WriteString(Section, ID_LIBRARY_NAME, FLibraryName);
+  AIniFile.WriteString(Section, ID_DEBUG_LIBRARY_NAME, FDebugLibraryName);
   AIniFile.WriteString(Section, ID_PREFIX, FPrefix);
 end;
 
+procedure TPlatform.SetDebugLibraryName(const AValue: String);
+begin
+  if (AValue <> FDebugLibraryName) then
+  begin
+    FDebugLibraryName := AValue;
+    FProject.Modified := True;
+  end;
+end;
+
 procedure TPlatform.SetEnabled(const AValue: Boolean);
 begin
   if (AValue <> FEnabled) then