Merge pull request #143 from kmpeters/issue142

Fixes for example IOC travis build problems:

1. Added modbus to the travis config
2. Updated motorOms, motorOmsAsyn, and motorHytec to ignore non-VME architectures for example IOCs

.ci/travis-prepare.sh

@@ -19,6 +19,7 @@ cat << EOF > $RELEASE_PATH
 IPAC=$IPAC_PATH
 SNCSEQ=$SUPPORT/seq
 ASYN=$SUPPORT/asyn
+MODBUS=$SUPPORT/modbus
 EPICS_BASE=$SUPPORT/epics-base
 EOF
 
@@ -162,3 +163,15 @@ if [ ! -e "$SUPPORT/asyn/built" ]; then
 else
     echo "Using cached asyn"
 fi
+
+# modbus
+if [ ! -e "$SUPPORT/modbus/built" ]; then
+    echo "Build modbus"
+    install -d $SUPPORT/modbus
+    git clone --depth 10 --branch $MODBUS https://github.com/epics-modules/modbus.git $SUPPORT/modbus
+    cp $RELEASE_PATH $SUPPORT/modbus/configure/RELEASE
+    make -C "$SUPPORT/modbus" -j2
+    touch $SUPPORT/modbus/built
+else
+    echo "Using cached modbus"
+fi

.travis.yml

@@ -16,13 +16,13 @@ addons:
     - g++-mingw-w64-i686
     - re2c
 env:
- - BASE=3.14 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=3.14 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=R3.15.6 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=R3.15.6 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=7.0 STATIC=shared RTEMS=4.10 SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=7.0 STATIC=shared CMPLR=clang WINE=32 SEQ=2.2.4 ASYN=R4-35 IPAC=
- - BASE=7.0 STATIC=static WINE=32 SEQ=2.2.6 ASYN=R4-35 IPAC=
+ - BASE=3.14 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=3.14 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=R3.15.6 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=R3.15.6 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=7.0 STATIC=shared RTEMS=4.10 SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=7.0 STATIC=shared CMPLR=clang WINE=32 SEQ=2.2.4 ASYN=R4-35 IPAC=  MODBUS=R2-11
+ - BASE=7.0 STATIC=static WINE=32 SEQ=2.2.6 ASYN=R4-35 IPAC=  MODBUS=R2-11
 install: ./.ci/travis-prepare.sh
 before_script:
   - cp ./configure/EXAMPLE_CONFIG_SITE.local ./configure/CONFIG_SITE.local