소스 검색

DEL: Don't read Lazarus revision

Alexander Koblov 4 년 전
부모
커밋
9e286862e8
5개의 변경된 파일4개의 추가작업 그리고 21개의 파일을 삭제
  1. 1 1
      src/doublecmd.lpr
  2. 2 2
      src/fAbout.pas
  3. 1 1
      src/fstartingsplash.pas
  4. 0 15
      src/platform/udcversion.pas
  5. 0 2
      units/revision.inc

+ 1 - 1
src/doublecmd.lpr

@@ -160,7 +160,7 @@ begin
   DCDebug('Revision: ' + dcRevision);
   DCDebug('Commit: ' + dcCommit);
   DCDebug('Build: ' + dcBuildDate);
-  DCDebug('Lazarus: ' + GetLazarusVersion);
+  DCDebug('Lazarus: ' + lazVersion);
   DCDebug('Free Pascal: ' + fpcVersion);
   DCDebug('Platform: ' + TargetCPU + '-' + TargetOS + '-' + TargetWS);
   DCDebug('System: ' + OSVersion);

+ 2 - 2
src/fAbout.pas

@@ -162,7 +162,7 @@ begin
                     'Platform: %s' + LineEnding +
                     'OS version: %s' + LineEnding,
                     [dcVersion, dcRevision, dcCommit, dcBuildDate,
-                    GetLazarusVersion, fpcVersion,
+                    lazVersion, fpcVersion,
                     TargetCPU + '-' + TargetOS + '-' + TargetWS,
                     OSVersion]);
   if WSVersion <> EmptyStr then
@@ -186,7 +186,7 @@ begin
   lblRevision.Caption        := lblRevision.Caption + #32 + dcRevision;
   lblCommit.Caption          := lblCommit.Caption + #32 + dcCommit;
   lblBuild.Caption           := lblBuild.Caption + #32 + dcBuildDate;
-  lblLazarusVer.Caption      := lblLazarusVer.Caption + #32 + GetLazarusVersion;
+  lblLazarusVer.Caption      := lblLazarusVer.Caption + #32 + lazVersion;
   lblFreePascalVer.Caption   := lblFreePascalVer.Caption + #32 + fpcVersion;
   lblPlatform.Caption        := TargetCPU + '-' + TargetOS + '-' + TargetWS;
   lblOperatingSystem.Caption := OSVersion;

+ 1 - 1
src/fstartingsplash.pas

@@ -51,7 +51,7 @@ begin
   lblRevision.Caption        := lblRevision.Caption + #32 + dcRevision;
   lblCommit.Caption          := lblCommit.Caption + #32 + dcCommit;
   lblBuild.Caption           := lblBuild.Caption + #32 + dcBuildDate;
-  lblLazarusVer.Caption      := lblLazarusVer.Caption + #32 + GetLazarusVersion;
+  lblLazarusVer.Caption      := lblLazarusVer.Caption + #32 + lazVersion;
   lblFreePascalVer.Caption   := lblFreePascalVer.Caption + #32 + fpcVersion;
   lblPlatform.Caption        := TargetCPU + '-' + TargetOS + '-' + TargetWS;
   lblOperatingSystem.Caption := OSVersion;

+ 0 - 15
src/platform/udcversion.pas

@@ -31,13 +31,11 @@ uses
   Classes, SysUtils, LCLVersion;
 
 {$I dcrevision.inc} // Double Commander revision number
-{$I revision.inc} // Lazarus revision number
 
 const
   dcVersion   = '1.0.0 alpha';
   dcBuildDate = {$I %DATE%};
   lazVersion  = lcl_version;         // Lazarus version (major.minor.micro)
-  lazRevision = RevisionStr;         // Lazarus SVN revision
   fpcVersion  = {$I %FPCVERSION%};   // FPC version (major.minor.micro)
   TargetCPU   = {$I %FPCTARGETCPU%}; // Target CPU of FPC
   TargetOS    = {$I %FPCTARGETOS%};  // Target Operating System of FPC
@@ -49,7 +47,6 @@ var
   : String;
 
 procedure InitializeVersionInfo;
-function GetLazarusVersion: String;
 
 implementation
 
@@ -454,18 +451,6 @@ begin
   {$ENDIF}
 end;
 
-function GetLazarusVersion: String;
-var
-  I: Integer = 1;
-begin
-  Result:= lazVersion;
-  while (I <= Length(lazRevision)) and (lazRevision[I] in ['0'..'9']) do
-    Inc(I);
-  if (I > 1) then begin
-    Result += '-' + Copy(lazRevision, 1, I - 1);
-  end;
-end;
-
 procedure Initialize;
 begin
   LCLPlatformDirNames[lpQT]:= 'qt4';

+ 0 - 2
units/revision.inc

@@ -1,2 +0,0 @@
-// Created by Svn2RevisionInc
-const RevisionStr = '';