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

deb: fixed export tgz, fixed RC version number turning RC into .0

Browse Source
This commit is contained in:
mattias 2023-06-25 19:39:07 +02:00
parent ac12e6b763
commit 1002929c77
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/install/create_lazarus_deb.sh
View File

@ -112,7 +112,7 @@ fi
FPCVersion=$($ppcbin -v | grep version| sed 's/.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/') FPCVersion=$($ppcbin -v | grep version| sed 's/.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/')
# get Lazarus version # get Lazarus version
LazVersion=$(./get_lazarus_version.sh) LazVersion=$(./get_lazarus_version.sh | sed -e 's/RC[0-9]/.0/')
# get consistent major.minor.release version, to avoid dpkg install an older version # get consistent major.minor.release version, to avoid dpkg install an older version
if [ $(echo $LazVersion | egrep '^[^.]*\.[^.]*$') ]; then if [ $(echo $LazVersion | egrep '^[^.]*\.[^.]*$') ]; then
LazVersion=${LazVersion}.0 LazVersion=${LazVersion}.0
@ -159,6 +159,7 @@ cd -
if [ "$UseCHMHelp" = "1" ]; then if [ "$UseCHMHelp" = "1" ]; then
echo echo
echo "Copying chm files" echo "Copying chm files"
mkdir -p $LazDestDir/docs/chm
cd $LazSrcDir/docs/chm cd $LazSrcDir/docs/chm
cp -v *.kwd *.chm $LazDestDir/docs/chm/ cp -v *.kwd *.chm $LazDestDir/docs/chm/
cd - cd -

1
tools/install/create_lazarus_export_tgz.sh
View File

@ -81,7 +81,6 @@ else
LazSrcDir=$(pwd | sed -e 's#/tools/install.*$##') LazSrcDir=$(pwd | sed -e 's#/tools/install.*$##')
# old-svn: Revision=$(svnversion $LazSrcDir) - comment this out as svn no longer works # old-svn: Revision=$(svnversion $LazSrcDir) - comment this out as svn no longer works
Revision=$(git -C $LazSrcDir describe --always --first-parent) Revision=$(git -C $LazSrcDir describe --always --first-parent)
cd $TmpDir
# old-svn: cp -a $LazSrcDir $TmpLazDir # old-svn: cp -a $LazSrcDir $TmpLazDir
mkdir $TmpLazDir mkdir $TmpLazDir
cd $TmpLazDir cd $TmpLazDir