svn2revisioninc: making it a TCustomApplication and adding command line switches from Darius

git-svn-id: trunk@10235 -

ide/Makefile.fpc

@@ -128,7 +128,7 @@ ifneq ($(USESVN2REVISIONINC),0)
 ifeq ($(wildcard ../tools/svn2revisioninc$(SRCEXEEXT)),)
         $(MAKE) -C ../tools svn2revisioninc$(SRCEXEEXT) OS_TARGET=$(OS_SOURCE) OPT=''
 endif
-	../tools/svn2revisioninc$(SRCEXEEXT) .. revision.inc
+	../tools/svn2revisioninc$(SRCEXEEXT) -D.. -Orevision.inc
 endif
 ifeq ($(OS_TARGET), win32)
         $(MAKE) lazarus.res

tools/install/create_lazarus_snapshot_rpm.sh

@@ -65,7 +65,7 @@ svn export $LazSrcDir $TmpDir
 if [ ! -e ../svn2revisioninc ]; then
   make -C ../.. tools OPT="-n @$FPCCfg"
 fi
-../svn2revisioninc $LazSrcDir $TmpDir/ide/revision.inc
+../svn2revisioninc -D$LazSrcDir -O$TmpDir/ide/revision.inc
 
 # create a source tar.gz
 cd $TmpDir/..

tools/install/macosx/makelazsnapshot.sh

@@ -68,7 +68,7 @@ $SVN export $LAZSOURCEDIR $LAZBUILDDIR
 if [ ! -e tools/svn2revisioninc ]; then
   make tools PP=$COMPILER
 fi
-tools/svn2revisioninc $LAZSOURCEDIR $LAZBUILDDIR/ide/revision.inc
+tools/svn2revisioninc -D$LAZSOURCEDIR -O$LAZBUILDDIR/ide/revision.inc
 
 cd $LAZBUILDDIR
 

tools/install/win32/create_installer.bat

@@ -56,7 +56,7 @@ SET PATH=%FPCBINDIR%
 :: copy lazarus dir
 rmdir /s /q %BUILDDIR%
 %SVN% export %LAZSVNDIR% %BUILDDIR% >> %LOGFILE%
-..\..\svn2revisioninc %LAZSVNDIR% %BUILDDIR%\ide\revision.inc
+..\..\svn2revisioninc -D%LAZSVNDIR% -O%BUILDDIR%\ide\revision.inc
 
 call build-fpc.bat
 
@@ -115,4 +115,4 @@ echo FPCSVNDIR: directory that contains a svn version of the fpcbuild repository
 echo LAZSVNDIR: directory that contains a svn version of the lazarus repository
 echo RELEASECOMPILER: bootstrapping compiler for building fpc
 
-:STOP
+:STOP

tools/svn2revisioninc.pas

@@ -46,19 +46,43 @@ program Svn2RevisionInc;
 {$mode objfpc}{$H+}
 
 uses
-  Classes, SysUtils, Process, FileUtil, Dom, XmlRead;
+  Classes, CustApp, SysUtils, Process, FileUtil, Dom, XmlRead, GetOpts;
-  
+
+type
+
+  { TSvn2RevisionApplication }
+
+  TSvn2RevisionApplication = class(TCustomApplication)
+  private
+    SourceDirectory,
+    RevisionIncFileName: string;
+    RevisionIncDirName: string;
+    RevisionStr: string;
+    ConstName: string;
+    Verbose: boolean;
+
+    function FindRevision: boolean;
+    function IsValidRevisionInc: boolean;
+    procedure WriteRevisionInc;
+    function ParamsValid: boolean;
+    procedure ShowHelp;
+    function CanCreateRevisionInc: boolean;
+    function ConstStart: string;
+    procedure Show(msg: string);
+  public
+    constructor Create(TheOwner: TComponent); override;
+    destructor Destroy; override;
+
+    procedure Run;
+  end;
+
 var
-  SourceDirectory,
+  Application: TSvn2RevisionApplication = nil;
-  RevisionIncFileName: string;
+
-  RevisionIncDirName: string;
-  RevisionStr: string = 'Unknown';
-  
 const
   RevisionIncComment = '// Created by Svn2RevisionInc';
-  ConstStart = 'const RevisionStr = ''';
+
-  
+function TSvn2RevisionApplication.FindRevision: boolean;
-function FindRevision: boolean;
 var
   SvnDir: string;
   function GetRevisionFromSvnVersion : boolean;
@@ -71,15 +95,23 @@ var
     SvnVersionProcess := TProcess.Create(nil);
     try
       with SvnVersionProcess do begin
-        CommandLine := 'svnversion -n "'+SourceDirectory+'"';
+        CommandLine := 'svnversion -n "' + SourceDirectory + '"';
         Options := [poUsePipes, poWaitOnExit];
         try
           Execute;
           SetLength(Buffer, 80);
           n:=OutPut.Read(Buffer[1], 80);
           RevisionStr := Copy(Buffer, 1, n);
+          
+          SetLength(Buffer, 1024);
+          n:=Stderr.Read(Buffer[1], 1024);
+
           Result:=true;
-          writeln('Retrieved revision with svnversion.');
+          Show('Retrieved revision with svnversion.');
+          Show('');
+          Show('svnversion output:');
+          Show(Copy(Buffer, 1, n));
+          Show('');
         except
         // ignore error, default result is false
         end;
@@ -156,7 +188,19 @@ begin
       or GetRevisionFromEntriesXml;
 end;
 
-function IsValidRevisionInc: boolean;
+constructor TSvn2RevisionApplication.Create(TheOwner: TComponent);
+begin
+  inherited Create(TheOwner);
+  
+  RevisionStr := 'Unknown';
+end;
+
+destructor TSvn2RevisionApplication.Destroy;
+begin
+  inherited Destroy;
+end;
+
+function TSvn2RevisionApplication.IsValidRevisionInc: boolean;
 var
   Lines: TStringList;
 begin
@@ -171,7 +215,7 @@ begin
   end;
 end;
 
-procedure WriteRevisionInc;
+procedure TSvn2RevisionApplication.WriteRevisionInc;
 var
   RevisionIncText: Text;
 begin
@@ -184,25 +228,75 @@ begin
     [RevisionIncFileName, RevisionStr]));
 end;
 
-function ParamsValid: boolean;
+procedure TSvn2RevisionApplication.ShowHelp;
 begin
-  Result := false;
+  writeln(ParamStr(0), ' [Options]');
-  if ParamCount<>2 then exit;
+  writeln;
-  SourceDirectory:=ExpandFileName(ParamStr(1));
+  writeln('Options:');
-  if not DirectoryExists(SourceDirectory) then begin
+  writeln(' -D<path>      Directory to get SVN version from (default current dir)');
+  writeln(' -O<file>      Output file (default revision.inc)');
+  writeln(' -C<name>      Name of constant (default RevisionStr)');
+  writeln(' -v            Be more verbose');
+  writeln(' -h            This help screen');
+  halt(1);
+end;
+
+function TSvn2RevisionApplication.ParamsValid: boolean;
+var
+  ch: char;
+begin
+  Result := False;
+
+  //reset
+  SourceDirectory:=ExtractFilePath(ParamStr(0));
+  Verbose := False;
+  RevisionIncFileName := ExpandFileName('revision.inc');
+  ConstName := 'RevisionStr';
+
+  //parse options
+  repeat
+    ch:=Getopt('D:O:C:vh?');
+    Case ch of
+      'D' : SourceDirectory := OptArg;
+      'O' : RevisionIncFileName := ExpandFileName(OptArg);
+      'C' : ConstName := OptArg;
+      'v' : Verbose := True;
+      'h' : ShowHelp;
+      '?' : ShowHelp;
+
+      EndOfOptions : break;
+    end;
+  until False;
+
+  //show options
+  Show('SourceDirectory:     ' + SourceDirectory);
+  Show('RevisionIncFileName: ' + RevisionIncFileName);
+  Show('ConstName:           ' + ConstName);
+  Show('');
+
+  //checks
+  if not DirectoryExists(SourceDirectory) then
+  begin
     writeln('Error: Source directory "', SourceDirectory, '" doesn''t exist.');
     exit;
   end;
-  RevisionIncFileName:=ExpandFileName(ParamStr(2));
+  
   RevisionIncDirName:=ExtractFilePath(RevisionIncFileName);
   if not DirectoryExists(RevisionIncDirName) then begin
     writeln('Error: Target Directory "', RevisionIncDirName, '" doesn''t exist.');
     exit;
   end;
-  Result := true;
+  
+  if ConstName[1] in ['0'..'9'] then
+  begin
+    writeln('Error: Invalid constant name ', ConstName, '.');
+    exit;
+  end;
+  
+  Result := True;
 end;
 
-function CanCreateRevisionInc: boolean;
+function TSvn2RevisionApplication.CanCreateRevisionInc: boolean;
 begin
   if (FileExists(RevisionIncFileName)) then
     Result:= FileIsWritable(RevisionIncFileName)
@@ -210,13 +304,30 @@ begin
     Result := DirectoryIsWritable(RevisionIncDirName);
 end;
 
+function TSvn2RevisionApplication.ConstStart: string;
 begin
-  if not ParamsValid then begin
+  Result := Format('const %s = ''', [ConstName]);
-    writeln('Usage: ',ExtractFileName(ParamStr(0)),' sourcedir revision.inc');
+end;
-    halt(1);
+
-  end;
+procedure TSvn2RevisionApplication.Show(msg: string);
+begin
+  if Verbose then
+    Writeln(msg);
+end;
+
+procedure TSvn2RevisionApplication.Run;
+begin
+  if not ParamsValid then
+    ShowHelp;
+
   if not CanCreateRevisionInc then exit;
+  
   if FindRevision or not IsValidRevisionInc then
     WriteRevisionInc;
-end.
+end;
 
+begin
+  Application := TSvn2RevisionApplication.Create(nil);
+  Application.Run;
+  Application.Free;
+end.