remi-php74 helpers

3 files changed, 81 insertions, 4 deletions

diff --git a/buildfct b/buildfct
index 2b07e3a..f48c21a 100644
--- a/buildfct
+++ b/buildfct
@@ -8,9 +8,11 @@ mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock
 alias mockfc29i="  setarch i686  mock --configdir=$mocketc -r fc29i   --arch i686 rebuild "
 alias mockfc29ir=" setarch i686  mock --configdir=$mocketc -r fc29ir  --arch i686 rebuild "
 alias mockfc29i73="setarch i686  mock --configdir=$mocketc -r fc29i73 --arch i686 rebuild "
+alias mockfc29i74="setarch i686  mock --configdir=$mocketc -r fc29i74 --arch i686 rebuild "
 alias mockfc29x="                mock --configdir=$mocketc -r fc29x               rebuild "
 alias mockfc29xr="               mock --configdir=$mocketc -r fc29xr              rebuild "
 alias mockfc29x73="              mock --configdir=$mocketc -r fc29x73             rebuild "
+alias mockfc29x74="              mock --configdir=$mocketc -r fc29x74             rebuild "
 alias mockfc29xscl56="           mock --configdir=$mocketc -r fc29xscl56          rebuild "
 alias mockfc29xscl70="           mock --configdir=$mocketc -r fc29xscl70          rebuild "
 alias mockfc29xscl71="           mock --configdir=$mocketc -r fc29xscl71          rebuild "
@@ -20,8 +22,10 @@ alias mockfc29xscl74="           mock --configdir=$mocketc -r fc29xscl74
 
 alias mockfc30i="  setarch i686  mock --configdir=$mocketc -r fc30i   --arch i686 rebuild "
 alias mockfc30ir=" setarch i686  mock --configdir=$mocketc -r fc30ir  --arch i686 rebuild "
+alias mockfc30i74="setarch i686  mock --configdir=$mocketc -r fc30i74 --arch i686 rebuild "
 alias mockfc30x="                mock --configdir=$mocketc -r fc30x               rebuild "
 alias mockfc30xr="               mock --configdir=$mocketc -r fc30xr              rebuild "
+alias mockfc30x74="              mock --configdir=$mocketc -r fc30x74             rebuild "
 alias mockfc30xscl56="           mock --configdir=$mocketc -r fc30xscl56          rebuild "
 alias mockfc30xscl70="           mock --configdir=$mocketc -r fc30xscl70          rebuild "
 alias mockfc30xscl71="           mock --configdir=$mocketc -r fc30xscl71          rebuild "
@@ -31,8 +35,10 @@ alias mockfc30xscl74="           mock --configdir=$mocketc -r fc30xscl74
 
 alias mockfc31i="  setarch i686  mock --configdir=$mocketc -r fc31i   --arch i686 rebuild "
 alias mockfc31ir=" setarch i686  mock --configdir=$mocketc -r fc31ir  --arch i686 rebuild "
+alias mockfc31i74="setarch i686  mock --configdir=$mocketc -r fc31i74 --arch i686 rebuild "
 alias mockfc31x="                mock --configdir=$mocketc -r fc31x               rebuild "
 alias mockfc31xr="               mock --configdir=$mocketc -r fc31xr              rebuild "
+alias mockfc31x74="              mock --configdir=$mocketc -r fc31x74             rebuild "
 alias mockfc31xscl56="           mock --configdir=$mocketc -r fc31xscl56          rebuild "
 alias mockfc31xscl70="           mock --configdir=$mocketc -r fc31xscl70          rebuild "
 alias mockfc31xscl71="           mock --configdir=$mocketc -r fc31xscl71          rebuild "
@@ -75,6 +81,7 @@ alias mockel7x70="             mock --configdir=$mocketc -r el7x70             r
 alias mockel7x71="             mock --configdir=$mocketc -r el7x71             rebuild "
 alias mockel7x72="             mock --configdir=$mocketc -r el7x72             rebuild "
 alias mockel7x73="             mock --configdir=$mocketc -r el7x73             rebuild "
+alias mockel7x74="             mock --configdir=$mocketc -r el7x74             rebuild "
 alias mockel7xscl54="          mock --configdir=$mocketc -r el7xscl54          rebuild "
 alias mockel7xscl55="          mock --configdir=$mocketc -r el7xscl55          rebuild "
 alias mockel7xscl56="          mock --configdir=$mocketc -r el7xscl56          rebuild "
@@ -88,6 +95,7 @@ alias mockel8x="               mock --configdir=$mocketc -r el8x               r
 alias mockel8xr="              mock --configdir=$mocketc -r el8xr              rebuild "
 alias mockel8x72="             mock --configdir=$mocketc -r el8x72             rebuild "
 alias mockel8x73="             mock --configdir=$mocketc -r el8x73             rebuild "
+alias mockel8x74="             mock --configdir=$mocketc -r el8x74             rebuild "
 alias mockel8xscl56="          mock --configdir=$mocketc -r el8xscl56          rebuild "
 alias mockel8xscl70="          mock --configdir=$mocketc -r el8xscl70          rebuild "
 alias mockel8xscl71="          mock --configdir=$mocketc -r el8xscl71          rebuild "
@@ -151,7 +159,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 30 29
+  for i in 31 30 29
   do
     echo -n "$(date +%X) fc$i "
     setarch i686  mock $quiet --configdir=$mocketc -r fc${i}i --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
@@ -307,6 +315,28 @@ else
 fi
 }
 
+# Build All distribution / version / 32bits for remi/remi-php74
+mock74i()
+{
+quiet=""
+if [ "$1" = "-q" ]; then
+    quiet="--quiet"
+    shift
+fi
+
+if [ -f "$1" ]; then
+  echo -n "$(date +%X) 74 fc29 "
+  setarch i686    mock $quiet --configdir=$mocketc -r fc29i74 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
+  echo -n "$(date +%X) 74 fc30 "
+  setarch i686    mock $quiet --configdir=$mocketc -r fc30i74 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
+  echo -n "$(date +%X) 74 fc31 "
+  setarch i686    mock $quiet --configdir=$mocketc -r fc31i74 --arch i686 rebuild $1 && echo " Ok." || echo " Error !"
+  date +%X
+else
+  echo "file not found '$1'"
+fi
+}
+
 # Build all distribution / version / 32bits for remi-test
 mockallit()
 {
@@ -387,7 +417,7 @@ if [ "$1" = "-q" ]; then
 fi
 
 if [ -f "$1" ]; then
-  for i in 29 30
+  for i in 29 30 31
   do
     echo -n "$(date +%X) fc$i "
     mock $quiet --configdir=$mocketc -r fc${i}x rebuild $1 && echo " Ok." || echo " Error !"
@@ -726,6 +756,32 @@ else
 fi
 }
 
+# Build All distribution / version / 64bits for remi/remi-php74
+mock74x()
+{
+quiet=""
+if [ "$1" = "-q" ]; then
+    quiet="--quiet"
+    shift
+fi
+
+if [ -f "$1" ]; then
+  for i in 29 30 31
+  do
+    echo -n "$(date +%X) 74 fc$i "
+    mock $quiet --configdir=$mocketc -r fc${i}x74 rebuild $1 && echo " Ok." || echo " Error !"
+  done
+  for i in 8 7
+  do
+    echo -n "$(date +%X) 74 el$i  "
+    mock $quiet --configdir=$mocketc -r el${i}x74 rebuild $1 && echo " Ok." || echo " Error !"
+  done
+  date +%X
+else
+  echo "file not found '$1'"
+fi
+}
+
 # Build All distribution / version / 64bits for remi/scl-php73
 mockscl74x()
 {
diff --git a/getmock b/getmock
index 63cabde..ebd3515 100755
--- a/getmock
+++ b/getmock
@@ -59,6 +59,16 @@ el8x73)
 	fi
 	type=enterprise
 	;;
+el8x74)
+	dep=8
+    if [ "$2" == "php74" -o "$2" == "test74" ]
+    then	rep=$rep
+	elif [ "$2" == "remi" ]
+	then	rep=php74
+	else	rep=${2}74
+	fi
+	type=enterprise
+	;;
 el*)	dep=${dep#el}
 	type=enterprise
 	;;
@@ -327,6 +337,17 @@ elif [ $1 = all73 ]; then
 		getOneMock el7x    $opt '*7.3*'
 		getOneMock el8x73  $opt '*7.3*'
 
+elif [ $1 = all74 ]; then
+	[ $opt = remi ] && opt=php74
+	[ $opt = test ] && opt=test74
+	for n in 29 30 31
+	do
+		getOneMock fc${n}i $opt '*7.4*'
+		getOneMock fc${n}x $opt '*7.4*'
+	done
+		getOneMock el7x    $opt '*7.4*'
+		getOneMock el8x74  $opt '*7.4*'
+
 elif [ $1 = all54 ]; then
 	for n in 6
 	do
diff --git a/mkrepo b/mkrepo
index 3ff1263..68a788d 100755
--- a/mkrepo
+++ b/mkrepo
@@ -6,8 +6,8 @@ nom=${PWD#/home/rpmbuild/site/rpms/}
 if [ "$nom" = "SRPMS" ]
 then
   dis=fedora
-  ver=30
-  old=5
+  ver=31
+  old=6
 else
   dis=${nom%%/*}
   ver=${nom#$dis/}