From: Erik B. <eb...@us...> - 2007-03-18 17:42:36
|
Update of /cvsroot/gexperts/gexperts/unstable/Src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26620/Src Modified Files: GX_CleanDirectories.pas GX_CondDefine.inc GX_GetIdeVersion.pas GX_VerDepConst.pas Log Message: Minor Delphi 2007 changes Index: GX_CleanDirectories.pas =================================================================== RCS file: /cvsroot/gexperts/gexperts/unstable/Src/GX_CleanDirectories.pas,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- GX_CleanDirectories.pas 21 Jan 2006 21:05:58 -0000 1.40 +++ GX_CleanDirectories.pas 17 Mar 2007 07:55:39 -0000 1.41 @@ -411,7 +411,7 @@ '.tds' + sLineBreak + '.tmp' + sLineBreak + '.$*' + sLineBreak + '.~*' + sLineBreak + '.#??' + sLineBreak + '.ddp' + sLineBreak + '.rsm' + sLineBreak + '.map' + sLineBreak + '.pdb' + sLineBreak + '.gex' + sLineBreak +'.~xfm' + sLineBreak + '.~nfm'+ sLineBreak + - '.~bdsproj'+ sLineBreak + '.~bdsgroup' + sLineBreak + '.identcache' + sLineBreak + + '.~bdsproj'+ sLineBreak + '.~dproj'+ sLineBreak + '.~bdsgroup' + sLineBreak + '.identcache' + sLineBreak + '.dcuil' + sLineBreak + '.dcpil'; var i, j: Integer; Index: GX_GetIdeVersion.pas =================================================================== RCS file: /cvsroot/gexperts/gexperts/unstable/Src/GX_GetIdeVersion.pas,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- GX_GetIdeVersion.pas 14 Jul 2006 01:31:14 -0000 1.38 +++ GX_GetIdeVersion.pas 17 Mar 2007 07:55:39 -0000 1.39 @@ -12,6 +12,7 @@ ideD800, ideD801, ideD802, ideD900, ideD901, ideD902, ideD903, ideBDS2006, + ideDelphi2007, ideBDS2007, ideCSB100, ideBCB600, ideBCB601, ideBCB602, ideBCB604, @@ -378,6 +379,22 @@ end; end; +function GetDelphi2007Version: TBorlandIdeVersion; +const + CoreIde1000: TVersionNumber = + (Minor: 0; Major: 0; Build: 0; Release: 0); +var + CoreIdeFileVersion: TVersionNumber; + VersionNumber: Integer; +begin + Result := ideDelphi2007; + CoreIdeFileVersion := GetFileVersionNumber(GetIdeRootDirectory + 'Bin\coreide100.bpl'); + VersionNumber := CompareVersionNumber(CoreIdeFileVersion, CoreIde1000); + if VersionNumber > 0 then begin + //Result := ideD1001; + end; +end; + function GetBDS2007Version: TBorlandIdeVersion; const CoreIde1100: TVersionNumber = @@ -445,9 +462,14 @@ Assert(Result in [ideD900, ideD901, ideD902, ideD903]); {$ENDIF VER170} - {$IFDEF VER180} // BDS 2006 - Result := GetBDS2006Version; - Assert(Result in [ideBDS2006]); + {$IFDEF VER180} + {$IFNDEF VER185} // BDS 2006 + Result := GetBDS2006Version; + Assert(Result in [ideBDS2006]); + {$ELSE} // Delphi 2007 + Result := GetDelphi2007Version; + Assert(Result in [ideDelphi2007]); + {$ENDIF} {$ENDIF VER180} {$IFDEF VER190} // BDS 2007 Index: GX_CondDefine.inc =================================================================== RCS file: /cvsroot/gexperts/gexperts/unstable/Src/GX_CondDefine.inc,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- GX_CondDefine.inc 14 Jul 2006 01:31:14 -0000 1.44 +++ GX_CondDefine.inc 17 Mar 2007 07:55:39 -0000 1.45 @@ -52,6 +52,9 @@ {$DEFINE GX_VER170_up} // Delphi 9/2005 {$IF CompilerVersion >= 18} {$DEFINE GX_VER180_up} // BDS 2006 + {$IFDEF VER185} + {$DEFINE GX_VER185_up} // Delphi 2007 + {$ENDIF} {$IF CompilerVersion >= 19} {$DEFINE GX_VER190_up} // BDS 2007 {$IFEND} Index: GX_VerDepConst.pas =================================================================== RCS file: /cvsroot/gexperts/gexperts/unstable/Src/GX_VerDepConst.pas,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- GX_VerDepConst.pas 14 Jul 2006 01:31:14 -0000 1.31 +++ GX_VerDepConst.pas 17 Mar 2007 07:55:39 -0000 1.32 @@ -54,7 +54,11 @@ {$ENDIF VER170} {$IFDEF VER180} + {$IFDEF VER185} + GExpertsDll = 'GExpertsDelphi2007.dll'; + {$ELSE} GExpertsDll = 'GExpertsBDS2006.dll'; + {$ENDIF} {$DEFINE GExpertsDllNameDefined} {$ENDIF VER180} @@ -117,7 +121,7 @@ {$DEFINE TTabDockHostFormClassContainerDefined} {$ENDIF VER170} - {$IFDEF VER180} + {$IFDEF VER180} // BDS 2006 and Delphi 2007 TTabDockHostFormClassContainer = 'designide100.bpl'; {$DEFINE TTabDockHostFormClassContainerDefined} {$ENDIF VER180} @@ -191,12 +195,16 @@ {$ENDIF VER170} {$IFDEF VER180} + {$IFDEF VER185} MajorVersionNumberChar = '10'; // BDS 2006 + {$ELSE} + MajorVersionNumberChar = '11'; // Delphi 2007 + {$ENDIF} {$DEFINE MajorVersionNumber} {$ENDIF VER180} {$IFDEF VER190} - MajorVersionNumberChar = '11'; // BDS 2007 + MajorVersionNumberChar = '12'; // BDS 2007 {$DEFINE MajorVersionNumber} {$ENDIF VER190} @@ -255,16 +263,19 @@ CompilerDefinedProductRegistryKey = 'BDS\3.0'; {$DEFINE IdeBaseKey} {$ENDIF VER170} - + {$IFDEF VER180} - // BDS 2006 - CompilerDefinedProductRegistryKey = 'BDS\4.0'; + {$IFDEF VER185} + CompilerDefinedProductRegistryKey = 'BDS\5.0'; // Delphi 2007 + {$ELSE} + CompilerDefinedProductRegistryKey = 'BDS\4.0'; // BDS 2006 + {$ENDIF} {$DEFINE IdeBaseKey} {$ENDIF VER180} {$IFDEF VER190} // BDS 2007 - CompilerDefinedProductRegistryKey = 'BDS\5.0'; + CompilerDefinedProductRegistryKey = 'BDS\6.0'; {$DEFINE IdeBaseKey} {$ENDIF VER190} @@ -310,7 +321,11 @@ {$ENDIF VER170} {$IFDEF VER180} + {$IFDEF VER185} + ClassBrowserStorageFolder = 'Classes.Delphi2007'; + {$ELSE} ClassBrowserStorageFolder = 'Classes.BDS2006'; + {$ENDIF} {$DEFINE ClassBrowserStorageDefined} {$ENDIF VER180} |