X-Git-Url: http://git.annexia.org/?p=fedora-mingw.git;a=blobdiff_plain;f=build-everything-in-mock.sh;h=782bea26f72a147074593cc16da03523cba63d6a;hp=12275e8ac1955b6e851bbfe22a0b6ac3db7edd11;hb=90e292e971c13ea2ac3d963730c8694dd60e406a;hpb=65f6ca4b7b63df40dc07ba62dae4a175d89bb20c

diff --git a/build-everything-in-mock.sh b/build-everything-in-mock.sh
index 12275e8..782bea2 100755
--- a/build-everything-in-mock.sh
+++ b/build-everything-in-mock.sh
@@ -1,8 +1,13 @@
 #!/bin/bash -
 
+set -e
+
 # These are the packages we don't want to build yet:
 nobuild=$(grep -v '^#' IGNORE)
 
+# Keep going - don't stop when smock hits an error.
+keepgoing=--keepgoing
+
 rm -f */*.src.rpm
 
 # If any extra SRPMS need to be considered, list them here.  Otherwise
@@ -15,7 +20,7 @@ for dir in *; do
 		if ! rpmbuild -bs --define "_sourcedir $(pwd)/$dir" --define "_srcrpmdir $(pwd)/$dir" $dir/*.spec; then
 		  echo "Failed to create a source RPM in directory $dir."
 		  echo "If you want to ignore this directory, you should add"
-		  echo "it to the 'nobuild' list in this script."
+		  echo "it to the IGNORE file in the top level directory."
 		  exit 1
 		fi
 		srpms="$srpms $(pwd)/$dir/*.src.rpm"
@@ -23,9 +28,29 @@ for dir in *; do
     fi
 done
 
+# Rawhide build everything:
+
 smock/smock.pl \
   --arch=i386 \
   --arch=x86_64 \
   --distro=fedora-rawhide \
-  --distro=fedora-10 \
+  $keepgoing \
   $srpms
+
+# In Fedora 10 don't try to build the OCaml RPMs since they
+# require OCaml 3.11 which was not in Fedora 10:
+
+srpms_no_ocaml=""
+for f in $srpms; do
+    case $f in
+    *ocaml* | *virt-top*) ;;
+    *) srpms_no_ocaml="$srpms_no_ocaml $f" ;;
+    esac
+done
+
+smock/smock.pl \
+  --arch=i386 \
+  --arch=x86_64 \
+  --distro=fedora-10 \
+  $keepgoing \
+  $srpms_no_ocaml