mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-06 09:00:33 +02:00
made start compiler configurable, fixes for use of svn2revisioninc
git-svn-id: trunk@7943 -
This commit is contained in:
parent
eb89b838b9
commit
8016e61c54
@ -6,7 +6,7 @@ set -e
|
||||
#------------------------------------------------------------------------------
|
||||
# parse parameters
|
||||
#------------------------------------------------------------------------------
|
||||
Usage="Usage: $0 [nodocs] [deb] <FPCSrcDir>"
|
||||
Usage="Usage: $0 [nodocs] [deb] <FPCSrcDir> [Starting Compiler]"
|
||||
|
||||
WithDOCS=yes
|
||||
if [ "x$1" = "xnodocs" ]; then
|
||||
@ -27,6 +27,11 @@ if [ "x$FPCSrcDir" = "x" ]; then
|
||||
exit -1
|
||||
fi
|
||||
|
||||
STARTPP=$1
|
||||
if [ -n "$STARTPP" ]; then
|
||||
export STARTPP
|
||||
fi
|
||||
|
||||
LazRelease=`date +%Y%m%d`
|
||||
|
||||
if [ ! -d $FPCSrcDir/compiler ]; then
|
||||
@ -65,7 +70,7 @@ fi
|
||||
perl replace_in_files.pl -sR -f '=\d.\d.\d' -r =$CompilerVersionStr -m 'Makefile(.fpc)?' $TmpDir/*
|
||||
|
||||
# create a source tar.gz
|
||||
cd $TmpDir
|
||||
cd $TmpDir/..
|
||||
tar -czf ~/rpmbuild/SOURCES/fpc-2.1.1-$LazRelease.source.tar.gz fpc
|
||||
|
||||
# remove the tempdir
|
||||
|
@ -25,8 +25,6 @@ if [ ! -d $LazSrcDir/.svn ]; then
|
||||
exit -1
|
||||
fi
|
||||
|
||||
|
||||
|
||||
Date=`date +%Y%m%d`
|
||||
# get fpc snapshot rpm
|
||||
FPCRPM=~/rpmbuild/RPMS/i586/fpc-2.1.1-$Date.i586.rpm
|
||||
@ -54,11 +52,15 @@ cd -
|
||||
# create a temporary copy of the lazarus sources for packaging
|
||||
LazVersion=0.9.11
|
||||
LazRelease=`echo $FPCRPM | sed -e 's/-/_/g'`
|
||||
TmpDir=/tmp/lazarus
|
||||
TmpDir=/tmp/`whoami`/lazarus
|
||||
|
||||
rm -rf $TmpDir
|
||||
echo "extracting Lazarus source from local svn ..."
|
||||
svn export $LazSrcDir $TmpDir
|
||||
if [ ! -e ../svn2revisioninc ]; then
|
||||
make -C ../.. tools OPT="-n @$FPCCfg"
|
||||
fi
|
||||
../svn2revisioninc $LazSrcDir $TmpDir/ide/revision.inc
|
||||
|
||||
# create a source tar.gz
|
||||
cd $TmpDir/..
|
||||
|
@ -66,8 +66,10 @@ cp -a packages fpcsrc
|
||||
rm -rf packages/extra/amunits
|
||||
rm -rf packages/extra/winunits
|
||||
|
||||
STARTPP=`which %{ppcname}`
|
||||
if [ -z "$STARTPP" ]; then
|
||||
STARTPP=`which %{ppcname}`
|
||||
# STARTPP=/usr/local/bin/ppc386
|
||||
fi
|
||||
NEWPP=`pwd`/compiler/%{ppcname}
|
||||
NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
|
||||
DATA2INC=`pwd`/utils/data2inc
|
||||
|
@ -28,8 +28,8 @@ MAKEOPTS="-Fl/opt/gnome/lib"
|
||||
if [ -n "$FPCCfg" ]; then
|
||||
MAKEOPTS="$MAKEOPTS -n @$FPCCfg"
|
||||
fi
|
||||
make all OPT="$MAKEOPTS"
|
||||
make tools
|
||||
make all OPT="$MAKEOPTS" USESVN2REVISIONINC=0
|
||||
make tools OPT="$MAKEOPTS"
|
||||
strip lazarus
|
||||
strip startlazarus
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user