diff --git a/tools/install/create_fpc-src_rpm.sh b/tools/install/create_fpc-src_rpm.sh index 155d902951..2c43323893 100755 --- a/tools/install/create_fpc-src_rpm.sh +++ b/tools/install/create_fpc-src_rpm.sh @@ -26,7 +26,7 @@ fi Arch=$(rpm --eval "%{_target_cpu}") # retrieve the version information -echo -n "getting FPC version from local svn ..." +echo -n "getting FPC version from local git ..." 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'` @@ -35,15 +35,15 @@ CompilerVersionStr="$CompilerVersion.$CompilerRelease.$CompilerPatch" LazVersion=$CompilerVersionStr echo " $CompilerVersionStr-$LazRelease" -FPCTGZ=$(rpm/get_rpm_source_dir.sh)/SOURCES/fpc-src-$CompilerVersionStr-$LazRelease.source.tar.gz +FPCTGZ=$(rpm/get_rpm_source_dir.sh)/SOURCES/fpc-src-laz-$CompilerVersionStr-$LazRelease.source.tar.gz CurDir=`pwd` # pack the directory sh create_fpc_tgz_from_local_dir.sh $FPCSourceDir $FPCTGZ -# build fpc-src rpm +# build fpc-src-laz rpm -echo "building fpc-src rpm ..." +echo "building fpc-src-laz rpm ..." # copy custom rpm scripts TmpDir=$HOME/tmp @@ -54,14 +54,14 @@ cp do_nothing.sh $TmpDir/do_nothing.sh chmod a+x $TmpDir/do_nothing.sh # create spec file -SpecFile=rpm/fpc-src-$LazVersion-$LazRelease.spec -cat rpm/fpc-src.spec | \ +SpecFile=rpm/fpc-src-laz.spec +cat rpm/fpc-src-laz.spec.template | \ sed -e "s/LAZVERSION/$LazVersion/g" -e "s/LAZRELEASE/$LazRelease/g" -e "s#LAZSCRIPTDIR#$TmpDir#g" \ > $SpecFile # build rpm rpmbuild -ba $SpecFile || rpm -ba $SpecFile -RPMFile=$(./rpm/get_rpm_source_dir.sh)/RPMS/$Arch/fpc-src-$LazVersion-$LazRelease.$Arch.rpm +RPMFile=$(./rpm/get_rpm_source_dir.sh)/RPMS/$Arch/fpc-src-laz-$LazVersion-$LazRelease.$Arch.rpm echo "The new rpm can be found in $RPMFile" diff --git a/tools/install/create_fpc_deb.sh b/tools/install/create_fpc_deb.sh index 6f50a8a75c..156a792bc4 100755 --- a/tools/install/create_fpc_deb.sh +++ b/tools/install/create_fpc_deb.sh @@ -107,6 +107,7 @@ case "$CPU_TARGET" in powerpc) ppcbin=ppc; FPCArch=powerpc;; sparc) ppcbin=sparc; FPCArch=sparc;; arm) ppcbin=arm; FPCArch=arm;; + arm64) ppcbin=a64; FPCArch=aarch64;; *) echo "$CPU_TARGET is not supported." exit -1;; esac diff --git a/tools/install/create_fpc_rpm.sh b/tools/install/create_fpc_rpm.sh index d88d0edfe0..450728e212 100755 --- a/tools/install/create_fpc_rpm.sh +++ b/tools/install/create_fpc_rpm.sh @@ -6,7 +6,9 @@ set -e #------------------------------------------------------------------------------ # parse parameters #------------------------------------------------------------------------------ -Usage="Usage: $0 [nodocs] [notemp] [release]" +Usage="Usage: $0 [nodocs] [notemp] [hasbuildid] [release]" + +PkgName=fpc-laz WithDOCS=yes if [ "x$1" = "xnodocs" ]; then @@ -20,6 +22,13 @@ if [ "x$1" = "xnotemp" ]; then shift fi +HasBuildID=no +if [ "x$1" = "xhasbuildid" ]; then + HasBuildID=yes + shift +fi + + PkgType=rpm FPCSrcDir=$1 @@ -55,17 +64,18 @@ if [ "$WithTempDir" = "yes" ]; then if [ -d $TmpDir ]; then rm -rf $TmpDir fi - mkdir -p $TmpDir/fpc - echo "extracting FPC from local git ..." - git -C $FPCSrcDir --work-tree=$TmpDir/fpc restore . + mkdir -p $TmpDir/$PkgName + cp -a $FPCSrcDir/.git $TmpDir/$PkgName/ + git -C $TmpDir/$PkgName checkout $TmpDir/$PkgName + rm -rf $TmpDir/$PkgName/.git* else TmpDir=$FPCSrcDir fi # retrieve the version information -echo -n "getting FPC version from local svn ..." -VersionFile="$TmpDir/fpc/compiler/version.pas" +echo -n "getting FPC version from local git ..." +VersionFile="$TmpDir/$PkgName/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') @@ -73,8 +83,7 @@ CompilerVersionStr="$CompilerVersion.$CompilerRelease.$CompilerPatch" FPCVersion="$CompilerVersion.$CompilerRelease.$CompilerPatch" echo " $CompilerVersionStr-$FPCRelease" -Arch=$(rpm --eval "%{_arch}") - +Arch=$(rpm --eval "%{_target_cpu}") #------------------------------------------------------------------------------ # patch sources @@ -85,16 +94,16 @@ ReplaceScript=replace_in_files.pl # set version numbers in all Makefiles echo "set version numbers in all Makefiles ..." -perl replace_in_files.pl -sR -f 'version=\d.\d.\d' -r version=$CompilerVersionStr -m 'Makefile(.fpc)?' $TmpDir/fpc/* +perl replace_in_files.pl -sR -f 'version=\d.\d.\d' -r version=$CompilerVersionStr -m 'Makefile(.fpc)?' $TmpDir/$PkgName/* # update smart_strip.sh -#ATM: not needed: cp $SmartStripScript $TmpDir/fpc/install/ +#ATM: not needed: cp $SmartStripScript $TmpDir/$PkgName/install/ -# build fpc rpm +# build fpc-laz rpm echo "creating spec file ..." -SpecFileTemplate=rpm/fpc.spec.template -SpecFile=rpm/fpc.spec +SpecFileTemplate=rpm/$PkgName.spec.template +SpecFile=rpm/$PkgName.spec # change spec file cat $SpecFileTemplate | \ @@ -104,10 +113,14 @@ cat $SpecFileTemplate | \ -e 's/^\%{fpcdir}\/samplecfg .*/%{fpcdir}\/samplecfg %{_libdir}\/fpc\/\\\$version/' \ > $SpecFile # -e 's/\(%define builddocdir.*\)/%define __strip smart_strip.sh\n\n\1/' \ - +if [ "$HasBuildID" = "yes" ]; then + sed -e 's/%undefine _missing_build-ids_terminate_build//' -i $SpecFile +fi + + SrcTGZ=$(rpm/get_rpm_source_dir.sh)/SOURCES/fpc-$CompilerVersionStr-$FPCRelease.source.tar.gz echo "creating $SrcTGZ ..." -tar czf $SrcTGZ -C $TmpDir fpc +tar czf $SrcTGZ -C $TmpDir $PkgName #---------------------------------------------------------------------------- # compile @@ -117,7 +130,7 @@ if [ "$WithDOCS" = "no" ]; then fi rpmbuild --nodeps -ba $SpecFile -echo "The new rpm can be found in $(./rpm/get_rpm_source_dir.sh)/RPMS/$Arch/fpc-$FPCVersion-$FPCRelease.$Arch.rpm" +echo "The new rpm can be found in $(./rpm/get_rpm_source_dir.sh)/RPMS/$Arch/$PkgName-$FPCVersion-$FPCRelease.$Arch.rpm" # end. diff --git a/tools/install/create_fpc_tgz_from_local_dir.sh b/tools/install/create_fpc_tgz_from_local_dir.sh index b62cdc7916..baa3dc3866 100755 --- a/tools/install/create_fpc_tgz_from_local_dir.sh +++ b/tools/install/create_fpc_tgz_from_local_dir.sh @@ -40,7 +40,15 @@ if [ -d $FPCSrcDir/.svn ]; then echo "extracting FPC from local svn ..." svn export $FPCSrcDir $TmpDir else - cp -a $FPCSrcDir $TmpDir + if [ -d $FPCSrcDir/.git ]; then + echo "extracting FPC from local git ..." + mkdir $TmpDir + cp -a $FPCSrcDir/.git $TmpDir/ + git -C $TmpDir checkout $TmpDir + rm -rf $TmpDir/.git* + else + cp -a $FPCSrcDir $TmpDir + fi fi if [ $RenameSmart = "yes" ]; then @@ -57,6 +65,7 @@ cd - mv $TmpBaseDir/fpc_src.tgz $OutputFile rm -rf $TmpDir +exit 0 # end. diff --git a/tools/install/create_lazarus_deb.sh b/tools/install/create_lazarus_deb.sh index 31f676be93..9e6e267a16 100755 --- a/tools/install/create_lazarus_deb.sh +++ b/tools/install/create_lazarus_deb.sh @@ -134,6 +134,11 @@ LazDestDir=$LazBuildDir/usr/share/lazarus/${LazVersion} LazDestDirInstalled=/usr/share/lazarus/${LazVersion} Pas2jsVer= +EnvOpts=$EtcSrcDir/environmentoptions-$Arch.xml +if [ ! -f $EnvOpts ]; then + EnvOpts=$EtcSrcDir/environmentoptions.xml +fi + echo "ppcbin=$ppcbin" echo "LazVersion=$LazVersion" echo "FPCVersion=$FPCVersion" @@ -262,7 +267,7 @@ done # default configs mkdir -p $LazBuildDir/etc/lazarus -cat $EtcSrcDir/environmentoptions.xml | \ +cat $EnvOpts | \ sed -e "s#__LAZARUSDIR__#$LazDestDirInstalled/#" \ -e "s#__FPCSRCDIR__#/usr/share/fpcsrc/\$(FPCVER)/#" \ > $LazBuildDir/etc/lazarus/environmentoptions.xml diff --git a/tools/install/create_lazarus_rpm.sh b/tools/install/create_lazarus_rpm.sh index 62d24e6678..c21251af25 100755 --- a/tools/install/create_lazarus_rpm.sh +++ b/tools/install/create_lazarus_rpm.sh @@ -60,13 +60,13 @@ Day=$(date +%d) # get installed fpc version echo "getting installed fpc version ..." -FPCRPM=$(rpm -qa | egrep '^fpc-[0-9]') +FPCRPM=$(rpm -qa | egrep '^fpc-laz-[0-9]') if [ "x$FPCRPM" = "x" ]; then echo ERROR: fpc rpm not installed exit fi # remove from the fpc version the architecture i386, i686, x86_64 -FPCRPMVersion=$(echo $FPCRPM | sed -e 's/fpc-//g' -e 's/\.[a-z0-9_]\+$//g') +FPCRPMVersion=$(echo $FPCRPM | sed -e 's/fpc-laz-//g' -e 's/\.[a-z0-9_]\+$//g') echo "installed fpc version: $FPCRPMVersion" FPCSRCRPMVersion=$(echo $FPCRPMVersion | cut -d- -f1) @@ -93,7 +93,7 @@ echo "creating lazarus tgz ..." # create spec file echo "creating lazarus spec file ..." CHMCOMMENT="# " -cat rpm/lazarus.spec.template | \ +cat rpm/lazarus-project.spec.template | \ sed -e "s/LAZVERSION/$LazVersion/g" \ -e "s/LAZRELEASE/$LazRelease/g" \ -e "s/LAZSOURCE/$Src/g" \ @@ -106,6 +106,6 @@ cat rpm/lazarus.spec.template | \ echo "building rpm ..." rpm -ba $SpecFile || rpmbuild -ba $SpecFile -echo "The new rpm can be found at $RPMSrcDir/RPMS/$Arch/lazarus-$LazVersion-$LazRelease.$Arch.rpm" +echo "The new rpm can be found at $RPMSrcDir/RPMS/$Arch/lazarus-project-$LazVersion-$LazRelease.$Arch.rpm" # end. diff --git a/tools/install/macosx/environmentoptions.xml b/tools/install/macosx/environmentoptions.xml index aaf01e6008..5f2e5546ea 100644 --- a/tools/install/macosx/environmentoptions.xml +++ b/tools/install/macosx/environmentoptions.xml @@ -1,7 +1,7 @@ - + @@ -14,9 +14,10 @@ - - + + + diff --git a/tools/install/macosx/uninstall.sh b/tools/install/macosx/uninstall.sh index 27327bcfac..ec840e4d6f 100755 --- a/tools/install/macosx/uninstall.sh +++ b/tools/install/macosx/uninstall.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash sudo rm -rf /Developer/lazarus /Applications/Lazarus.app /etc/lazarus /usr/local/bin/lazbuild +sudo pkgutil --forget org.freepascal.lazarus.www # end.