From 7a1c1663269272a4d8c7ce427920c1eac6900acf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Jun 2023 17:48:01 +0200 Subject: php83 SCL helpers --- buildfct | 31 +++++++++++++++++++++++++++++++ getmock | 12 ++++++++++++ 2 files changed, 43 insertions(+) diff --git a/buildfct b/buildfct index ecaba2a..8720d1f 100644 --- a/buildfct +++ b/buildfct @@ -68,6 +68,7 @@ alias mockfc37xscl74=" mock --configdir=$mocketc -r fc37xscl74 alias mockfc37xscl80=" mock --configdir=$mocketc -r fc37xscl80 rebuild " alias mockfc37xscl81=" mock --configdir=$mocketc -r fc37xscl81 rebuild " alias mockfc37xscl82=" mock --configdir=$mocketc -r fc37xscl82 rebuild " +alias mockfc37xscl83=" mock --configdir=$mocketc -r fc37xscl83 rebuild " alias mockfc37xr60=" mock --configdir=$mocketc -r fc37xr60 rebuild " alias mockfc37xr62=" mock --configdir=$mocketc -r fc37xr62 rebuild " alias mockfc37xr70=" mock --configdir=$mocketc -r fc37xr70 rebuild " @@ -86,6 +87,7 @@ alias mockfc38xscl74=" mock --configdir=$mocketc -r fc38xscl74 alias mockfc38xscl80=" mock --configdir=$mocketc -r fc38xscl80 rebuild " alias mockfc38xscl81=" mock --configdir=$mocketc -r fc38xscl81 rebuild " alias mockfc38xscl82=" mock --configdir=$mocketc -r fc38xscl82 rebuild " +alias mockfc38xscl83=" mock --configdir=$mocketc -r fc38xscl83 rebuild " alias mockfc38xr60=" mock --configdir=$mocketc -r fc38xr60 rebuild " alias mockfc38xr62=" mock --configdir=$mocketc -r fc38xr62 rebuild " alias mockfc38xr70=" mock --configdir=$mocketc -r fc38xr70 rebuild " @@ -142,6 +144,7 @@ alias mockel7xscl74=" mock --configdir=$mocketc -r el7xscl74 r alias mockel7xscl80=" mock --configdir=$mocketc -r el7xscl80 rebuild " alias mockel7xscl81=" mock --configdir=$mocketc -r el7xscl81 rebuild " alias mockel7xscl82=" mock --configdir=$mocketc -r el7xscl82 rebuild " +alias mockel7xscl83=" mock --configdir=$mocketc -r el7xscl83 rebuild " alias mockel8x=" mock --configdir=$mocketc -r el8x rebuild " alias mockel8xr=" mock --configdir=$mocketc -r el8xr rebuild " @@ -162,6 +165,7 @@ alias mockel8xscl74=" mock --configdir=$mocketc -r el8xscl74 r alias mockel8xscl80=" mock --configdir=$mocketc -r el8xscl80 rebuild " alias mockel8xscl81=" mock --configdir=$mocketc -r el8xscl81 rebuild " alias mockel8xscl82=" mock --configdir=$mocketc -r el8xscl82 rebuild " +alias mockel8xscl83=" mock --configdir=$mocketc -r el8xscl83 rebuild " alias mockel8xr60=" mock --configdir=$mocketc -r el8xr60 rebuild " alias mockel8xr62=" mock --configdir=$mocketc -r el8xr62 rebuild " alias mockel8xr70=" mock --configdir=$mocketc -r el8xr70 rebuild " @@ -180,6 +184,7 @@ alias mockel9xscl74=" mock --configdir=$mocketc -r el9xscl74 r alias mockel9xscl80=" mock --configdir=$mocketc -r el9xscl80 rebuild " alias mockel9xscl81=" mock --configdir=$mocketc -r el9xscl81 rebuild " alias mockel9xscl82=" mock --configdir=$mocketc -r el9xscl82 rebuild " +alias mockel9xscl83=" mock --configdir=$mocketc -r el9xscl83 rebuild " alias mockel9xr60=" mock --configdir=$mocketc -r el9xr60 rebuild " alias mockel9xr62=" mock --configdir=$mocketc -r el9xr62 rebuild " alias mockel9xr70=" mock --configdir=$mocketc -r el9xr70 rebuild " @@ -519,6 +524,32 @@ else fi } +# Build All distribution / version / 64bits for remi/scl-php82 +mockscl83x() +{ +quiet="" +if [ "$1" = "-q" ]; then + quiet="--quiet" + shift +fi + +if [ -f "$1" ]; then + for i in 37 38 + do + echo -n "$(date +%X) scl83 fc$i " + mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !" + done + for i in 7 8 9 + do + echo -n "$(date +%X) scl83 el$i " + mock $quiet --configdir=$mocketc -r el${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !" + done + date +%X +else + echo "file not found '$1'" +fi +} + # Build All distribution / version / 64bits for remi/scl-php82 mockscl82x() { diff --git a/getmock b/getmock index 0085cd7..1acc002 100755 --- a/getmock +++ b/getmock @@ -17,6 +17,9 @@ esac rep=${2-remi} case $dep in +scl83el*) dep=${dep#scl83el} + type=enterprise + ;; scl82el*) dep=${dep#scl82el} type=enterprise ;; @@ -196,6 +199,9 @@ el*) dep=${dep#el} fc*) dep=${dep#fc} type=fedora ;; +scl83fc*) dep=${dep#scl83fc} + type=fedora + ;; scl82fc*) dep=${dep#scl82fc} type=fedora ;; @@ -603,6 +609,12 @@ elif [ $1 = scl82 ]; then getOneMock scl82el${i}x $opt done +elif [ $1 = scl83 ]; then + for i in fc37 fc38 el7 el8 el9 + do + getOneMock scl83${i}x $opt + done + elif [ $1 = scl81 ]; then for i in 36 37 38 do -- cgit