X-Git-Url: http://git.annexia.org/?p=fedora-mingw.git;a=blobdiff_plain;f=build-everything-in-mock.sh;h=782bea26f72a147074593cc16da03523cba63d6a;hp=bdc81e32d4c8cf3f495d5745afd223643521e547;hb=966f55f8692da3f842da077e57c22ff501e380e1;hpb=9e1892e7ea3a0a2abfd2a3d221b74c6454dca85a

diff --git a/build-everything-in-mock.sh b/build-everything-in-mock.sh
index bdc81e3..782bea2 100755
--- a/build-everything-in-mock.sh
+++ b/build-everything-in-mock.sh
@@ -1,9 +1,11 @@
 #!/bin/bash -
 
+set -e
+
 # These are the packages we don't want to build yet:
 nobuild=$(grep -v '^#' IGNORE)
 
-# Keep going (not safe).  Comment out for a safe build.
+# Keep going - don't stop when smock hits an error.
 keepgoing=--keepgoing
 
 rm -f */*.src.rpm
@@ -26,10 +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