paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-23 02:19:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

svn2revisioninc, Installer: use first-parent for git describe

Browse Source 
(cherry picked from commit b26d9aa832)
This commit is contained in:
Martin 2021-10-09 21:38:25 +02:00
parent 9dd05b2dec
commit 3fcf01d0c7
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/install/create_lazarus_export_tgz.sh
View File

@ -78,6 +78,7 @@ else
echo "extracting lazarus from local svn ..." echo "extracting lazarus from local svn ..."
LazSrcDir=$(pwd | sed -e 's#/tools/install.*$##') LazSrcDir=$(pwd | sed -e 's#/tools/install.*$##')
#Revision=$(svnversion $LazSrcDir) - comment this out as svn no longer works #Revision=$(svnversion $LazSrcDir) - comment this out as svn no longer works
Revision=$(git -C $LazSrcDir describe --always --first-parent)
cd $TmpDir cd $TmpDir
cp -a $LazSrcDir $TmpLazDir #can't use svn export anymore cp -a $LazSrcDir $TmpLazDir #can't use svn export anymore
cd - cd -

2
tools/install/win/svn2revisioninc.bat
View File

@ -1,4 +1,4 @@
%GIT% -C %1 describe --always > gitinfo.txt %GIT% -C %1 describe --always --first-parent > gitinfo.txt
set /P SVNINFO=<gitinfo.txt set /P SVNINFO=<gitinfo.txt

2
tools/svn2revisioninc.pas
View File

@ -734,7 +734,7 @@ function TSvn2RevisionApplication.GitDescribeCommit(KeepRevStr: Boolean
var var
s: string; s: string;
begin begin
Result := RunCommand('git', ['describe', '--always'], s); Result := RunCommand('git', ['describe', '--always', '--first-parent'], s);
if not Result then if not Result then
exit; exit;