Przeglądaj źródła

* Fixed getting svn revision on Windows host.

git-svn-id: trunk@26700 -
yury 11 lat temu
rodzic
commit
5ebfb2710d
2 zmienionych plików z 4 dodań i 2 usunięć
  1. 3 1
      utils/fpcm/fpmake.pp
  2. 1 1
      utils/fpcm/revision.inc

+ 3 - 1
utils/fpcm/fpmake.pp

@@ -43,6 +43,8 @@ procedure fpcm_update_revision_info(Sender: TObject);
     i := AProcess.Output.Read(b,1);
     if i > 0 then
       begin
+        if b = 13 then
+          continue;
         if b = 10 then
           exit;
         ALine := ALine + chr(b);
@@ -77,7 +79,7 @@ begin
       // Run svn info, and catch output.
       P := sender as TPackage;
       P.Options.Add('-dREVINC');
-      SVNBin := ExeSearch('svn', GetEnvironmentvariable('PATH'));
+      SVNBin := ExeSearch(AddProgramExtension('svn', Defaults.BuildOS), GetEnvironmentvariable('PATH'));
       if SVNBin<>'' then
         begin
           SVNProcess := TProcess.create(nil);

+ 1 - 1
utils/fpcm/revision.inc

@@ -1 +1 @@
-'2014-01-18 rev 26502'
+'2014-02-06 rev 26692'