modules: add pva2pva, example

.ci/travis-prepare.sh

@@ -38,3 +38,9 @@ then
 fi
 
 cd "$CURDIR"
+
+cat <<EOF >> epics-base/configure/CONFIG_SITE
+USR_CPPFLAGS += $USR_CPPFLAGS
+USR_CFLAGS += $USR_CFLAGS
+USR_CXXFLAGS += $USR_CXXFLAGS
+EOF

.gitmodules

@@ -30,3 +30,11 @@
     path = modules/pvDatabase
     url = https://github.com/epics-base/pvDatabaseCPP
     branch = master
+[submodule "modules/pva2pva"]
+    path = modules/pva2pva
+    url = https://github.com/epics-base/pva2pva
+    branch = master
+[submodule "modules/example"]
+    path = modules/example
+    url = https://github.com/epics-base/exampleCPP
+    branch = master

.travis.yml

@@ -3,16 +3,6 @@ dist: trusty
 language: c
 compiler:
   - gcc
-env:
-  - CMPLR=gcc
-  - CMPLR=gcc EXTRA=CMD_CXXFLAGS=-std=c++11
-  - CMPLR=gcc STATIC=YES
-  - CMPLR=clang
-  - CMPLR=clang STATIC=YES
-  - WINE=32 TEST=NO STATIC=YES
-  - WINE=32 TEST=NO STATIC=NO
-  - RTEMS=4.10 TEST=NO
-  - RTEMS=4.9 TEST=NO
 addons:
   apt:
     packages:
@@ -28,5 +18,16 @@ addons:
 cache:
   directories:
    - $HOME/.cache
-install: sh .ci/travis-prepare.sh </dev/null
-script: sh .ci/travis-build.sh </dev/null
+install:
+ - ./.ci/travis-prepare.sh
+script:
+ - ./.ci/travis-build.sh
+env:
+ - BRCORE=master BRLIBCOM=master BRCA=master
+ - CMPLR=clang
+ - USR_CXXFLAGS=-std=c++11
+ - CMPLR=clang USR_CXXFLAGS=-std=c++11
+ - WINE=32 TEST=NO STATIC=YES
+ - WINE=32 TEST=NO STATIC=NO
+ - RTEMS=4.10 TEST=NO
+ - RTEMS=4.9 TEST=NO

modules/Makefile

@@ -36,6 +36,12 @@ pvaClient_DEPEND_DIRS = pvAccess normativeTypes
 SUBMODULES += pvDatabase
 pvDatabase_DEPEND_DIRS = pvAccess
 
+SUBMODULES += pva2pva
+pva2pva_DEPEND_DIRS = pvAccess
+
+SUBMODULES += example
+example_DEPEND_DIRS = pva2pva pvaClient
+
 # Add any checked-out submodules to DIRS
 DIRS += $(subst /,,$(dir $(wildcard $(addsuffix /Makefile, $(SUBMODULES)))))