updated build scripts

git-svn-id: trunk@4394 -

.gitattributes

@@ -935,6 +935,7 @@ tools/apiwizz/apiwizard.pp svneol=native#text/pascal
 tools/apiwizz/apiwizz.pp svneol=native#text/pascal
 tools/check_ide_libs.sh -text svneol=native#application/x-sh
 tools/install/build_fpc_rpm.sh -text svneol=native#application/x-sh
+tools/install/build_fpcsrc_rpm.sh -text svneol=native#application/x-sh
 tools/install/create_fpc_deb.sh -text svneol=native#application/x-sh
 tools/install/create_fpc_export_tgz.sh -text svneol=native#application/x-sh
 tools/install/create_fpc_rpm.sh -text svneol=native#application/x-sh

ide/main.pp

@@ -8519,10 +8519,6 @@ begin
 
   if AComponent=ADesigner.LookupRoot then begin
     // rename owner component (e.g. the form)
-    // ToDo:
-    //   rename form in source
-    //   rename formclass
-    //   replace createform statement
 
     // check if component name already exists
     i:=Project1.IndexOfUnitWithComponentName(NewName,true,ActiveUnitInfo);
@@ -9355,6 +9351,9 @@ end.
 
 { =============================================================================
   $Log$
+  Revision 1.623  2003/07/12 09:11:28  mattias
+  updated build scripts
+
   Revision 1.622  2003/07/11 11:56:44  mattias
   fixed renaming a TDataModule
 

tools/install/build_fpcsrc_rpm.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+set -x
+set -e
+
+
+#------------------------------------------------------------------------------
+# parse parameters
+#------------------------------------------------------------------------------
+Usage="Usage: $0 <FPCSrcDir> <release>"
+
+FPCSourceDir=$1
+shift
+if [ "x$FPCSourceDir" = "x" ]; then
+  echo $Usage
+  exit -1
+fi
+
+LazRelease=$1
+shift
+if [ "x$LazRelease" = "x" ]; then
+  echo $Usage
+  exit -1
+fi
+
+
+#------------------------------------------------------------------------------
+# patching
+#------------------------------------------------------------------------------
+
+# retrieve the version information
+VersionFile="$FPCSourceDir/compiler/version.pas"
+CompilerVersion=`cat $VersionFile | grep ' *version_nr *=.*;' | sed -e 's/[^0-9]//g'`
+CompilerRelease=`cat $VersionFile | grep ' *release_nr *=.*;' | sed -e 's/[^0-9]//g'`
+CompilerPatch=`cat $VersionFile | grep ' *patch_nr *=.*;' | sed -e 's/[^0-9]//g'`
+LazVersion="$CompilerVersion.$CompilerRelease"
+if [ "$CompilerPatch" != "0" ]; then
+  LazVersion="$LazVersion.$CompilerPatch"
+fi
+
+FPCTGZ=fpcsrc-$LazVersion-$LazRelease.tgz
+
+# pack the directory
+./create_fpc_tgz_from_local_dir.sh $FPCSourceDir $FPCTGZ
+
+# copy src tgz into rpm building directory
+cp $FPCTGZ /usr/src/redhat/SOURCES/
+
+# create spec file
+SpecFile=fpcsrc-$LazVersion-$LazRelease.spec
+cat fpcsrc.spec | \
+  sed -e "s/LAZVERSION/$LazVersion/g" -e "s/LAZRELEASE/$LazRelease/" \
+  > $SpecFile
+
+# build rpm
+rpmbuild -ba $SpecFile || rpm -ba $SpecFile
+
+# end.
+

tools/install/create_fpc_rpm.sh

@@ -48,9 +48,9 @@ if [ "x$FPCVersion" = "xdevel" ]; then
 fi
 if [ "x$FPCVersion" = "xstable" ]; then
   Year=03
-  Month=06
+  Month=07
-  Day=24
+  Day=11
-  LazVersion=1.0.8
+  LazVersion=1.0.10
 fi
 
 Date=20$Year$Month$Day

tools/install/create_fpc_tgz_from_local_dir.sh

@@ -1,13 +1,11 @@
 #!/bin/bash
 
 set -e
-#set -x
+set -x
 
 FPCSrcDir=$1
 OutputFile=$2
 
-fpcsrc-1.0.7-1.tgz
-
 Usage="Usage: $0 <fpc_source_directory> <outputfile>"
 
 if [ "x$FPCSrcDir" = "x" ]; then
@@ -25,36 +23,40 @@ if [ ! -d $FPCSrcDir/compiler ]; then
   exit
 fi
 
+TmpBaseDir=/tmp
+TmpDir=$TmpBaseDir/fpc
+
 echo "copy $FPCSrcDir to /tmp/fpc ..."
-cd /tmp
+cd $TmpBaseDir
-rm -rf /tmp/fpc
+rm -rf $TmpDir
 cd -
-cp -a $FPCSrcDir /tmp/fpc
+cp -a $FPCSrcDir $TmpDir
 
 echo "cleaning up (CVS, ppu, o) ..."
-cd /tmp/fpc
+cd $TmpDir
 make distclean
-find . -name '*.ppu' -exec rm -rf {} \;
+
-find . -name '*.rst' -exec rm -rf {} \;
+for Ext in ppu ppw ppl o ow rst; do
+  find . -name "*.$Ext" -exec rm -f {} \;
+done
 rm -f *.tar.gz
 if [ -d CVS ]; then
+  # use xargs to remove directories (otherwise find returns strange things)
   find . -name 'CVS' | xargs rm -r
 fi
 cd -
-cd /tmp/fpc/docs
+# clean up docs
+cd $TmpDir/docs
 make clean
 cd -
 
 # pack
 echo "creating tgz ..."
-cd /tmp
+cd $TmpBaseDir
 tar czf fpc_src.tgz fpc
 cd -
-mv /tmp/fpc_src.tgz $OutputFile
+mv $TmpBaseDir/fpc_src.tgz $OutputFile
-rm -rf /tmp/fpc
+rm -rf $TmpDir
-
-echo ""
-echo "NOTE: DON'T FORGET TO PUT THE $OutputFile INTO /usr/src/redhat/SOURCES/"
 
 
 # end.

tools/install/lazarus.spec

@@ -8,8 +8,8 @@ Summary: Lazarus Component Library and IDE
 Packager: Mattias Gaertner (mattias@freepascal.org)
 URL: http://www.lazarus.freepascal.org/
 BuildRoot: %{_tmppath}/lazarus-build
-BuildRequires: fpc >= 1.0.8
+BuildRequires: fpc >= 1.0.10
-Requires: fpcsrc >= 1.0.8
+Requires: fpcsrc >= 1.0.10
 Requires: gdk-pixbuf-devel >= 0.18.0
 
 %define lazdir %{_datadir}/lazarus