rpm script now uses cvsexportlocal.pas, increased rpm version to 0.9.4.1

git-svn-id: trunk@6465 -

lcl/include/toolbar.inc

@@ -360,8 +360,6 @@ begin
 end;
 
 procedure TToolBar.Loaded;
-var
-  I: Integer;
 begin
   // dock controls after streaming
   // TODO: activate when docking finished
@@ -619,6 +617,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.36  2005/01/03 11:22:18  mattias
+  rpm script now uses cvsexportlocal.pas, increased rpm version to 0.9.4.1
+
   Revision 1.35  2005/01/03 01:07:08  mattias
   fixed registering TProgressBar, disabled docking in TToolBar, return key for codeexplorer, updated finnish translation
 

tools/install/create_lazarus_export_tgz.sh

@@ -4,20 +4,39 @@
 set -e
 
 OutputFile=$1
-Usage="$0 outputfilename"
+Usage="$0 [download] outputfilename"
+
+Download=no
+if [ "x$1" = "xdownload" ]; then
+  Download=yes
+  shift
+fi
 
 if [ "x$OutputFile" = "x" ]; then
   echo $Usage
   exit
 fi
 
-echo "downloading lazarus cvs ..."
-cd /tmp
-rm -rf /tmp/lazarus
-export CVSROOT=:pserver:cvs@cvs.freepascal.org:/FPC/CVS
-cvs login
-cvs -z3 export -r HEAD lazarus
+if [ "x$Download" = "xyes" ]; then
+  echo "downloading lazarus cvs ..."
+  cd /tmp
+  rm -rf /tmp/lazarus
+  export CVSROOT=:pserver:cvs@cvs.freepascal.org:/FPC/CVS
+  cvs login
+  cvs -z3 export -r HEAD lazarus
+  cd -
+else
+  echo "building cvsexportlocal ..."
+  ppc386 -Fu../../lcl/units/i386/linux cvsexportlocal.pas
+  echo "extracting lazarus from local cvs ..."
+  cd ../..
+  SourceDir=`pwd`
+  cd -
+  rm -rf /tmp/lazarus
+  ./cvsexportlocal $SourceDir /tmp/lazarus
+fi
 
+cd /tmp
 echo "packing ..."
 tar cvzf lazarus.tgz lazarus
 cd -

tools/install/create_lazarus_rpm.sh

@@ -17,7 +17,7 @@ fi
 FPCRPMVersion=`echo $FPCRPM | sed -e 's/fpc-//g'`
 
 Date=$Year$Month$Day
-LazVersion=0.9.4
+LazVersion=0.9.4.1
 LazRelease=`echo $FPCRPM | sed -e 's/-/_/g'`
 SrcTGZ=lazarus-$Date.tgz
 TmpDir=/tmp/lazarus$LazVersion