Merge remote-tracking branch 'origin/master'

* origin/master: p2p: fix dllexport for ChannelCacheEntry::CRequester qsrv: add missing Base libs to qsrv_LIBS Fix dll decorations in moncache, gwmain, pdbsingle Add LICENSE file Add .local mechanism to CONFIG_SITE qsrv: build libqsrv also for target travis-ci: update/streamline configuration for EPICS 7 # Conflicts: # .travis.yml # build-deps.sh # pdbApp/Makefile
2017-09-30 22:28:26 -05:00
parent 8fb9358588 4942c3c07c
commit 271ec3241f
11 changed files with 287 additions and 71 deletions
--- a/.ci/travis-build.sh
+++ b/.ci/travis-build.sh
@ -0,0 +1,21 @@
+#!/bin/sh
+set -e -x
+
+# set RTEMS to eg. "4.9" or "4.10"
+# requires qemu, bison, flex, texinfo, install-info
+if [ -n "$RTEMS" ]
+then
+  # find local qemu-system-i386
+  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
+  echo -n "Using QEMU: "
+  type qemu-system-i386 || echo "Missing qemu"
+  EXTRA=RTEMS_QEMU_FIXUPS=YES
+fi
+
+make -j2 $EXTRA
+
+if [ "$TEST" != "NO" ]
+then
+  make tapfiles
+  find . -name '*.tap' -print0 | xargs -0 -n1 prove -e cat -f
+fi
--- a/.ci/travis-prepare.sh
+++ b/.ci/travis-prepare.sh
@ -0,0 +1,177 @@
+#!/bin/sh
+set -e -x
+
+CURDIR="$PWD"
+
+QDIR="$HOME/.cache/qemu"
+
+if [ -n "$RTEMS" -a "$TEST" = "YES" ]
+then
+  git clone --quiet --branch vme --depth 10 https://github.com/mdavidsaver/qemu.git "$HOME/.build/qemu"
+  cd "$HOME/.build/qemu"
+
+  HEAD=`git log -n1 --pretty=format:%H`
+  echo "HEAD revision $HEAD"
+
+  [ -e "$HOME/.cache/qemu/built" ] && BUILT=`cat "$HOME/.cache/qemu/built"`
+  echo "Cached revision $BUILT"
+
+  if [ "$HEAD" != "$BUILT" ]
+  then
+    echo "Building QEMU"
+    git submodule --quiet update --init
+
+    install -d "$HOME/.build/qemu/build"
+    cd         "$HOME/.build/qemu/build"
+
+    "$HOME/.build/qemu/configure" --prefix="$HOME/.cache/qemu/usr" --target-list=i386-softmmu --disable-werror
+    make -j2
+    make install
+
+    echo "$HEAD" > "$HOME/.cache/qemu/built"
+  fi
+fi
+
+cat << EOF > $CURDIR/configure/RELEASE.local
+EPICS_BASE=$HOME/.source/epics-base
+EOF
+
+install -d "$HOME/.source"
+cd "$HOME/.source"
+
+add_base_module() {
+  MODULE=$1
+  BRANCH=$2
+  ( cd epics-base/modules && \
+  git clone --quiet --depth 5 --branch $MODULE/$BRANCH https://github.com/${REPOBASE:-epics-base}/epics-base.git $MODULE && \
+  cd $MODULE && git log -n1 )
+}
+
+add_gh_module() {
+  MODULE=$1
+  REPOOWNER=$2
+  REPONAME=$3
+  BRANCH=$4
+  ( cd epics-base/modules && \
+  git clone --quiet --depth 5 --branch $BRANCH https://github.com/$REPOOWNER/$REPONAME.git $MODULE && \
+  cd $MODULE && git log -n1 )
+}
+
+add_gh_flat() {
+  MODULE=$1
+  REPOOWNER=$2
+  REPONAME=$3
+  BRANCH=$4
+  MODULE_UC=$(echo $MODULE | tr 'a-z' 'A-Z')
+  ( git clone --quiet --depth 5 --branch $BRANCH https://github.com/$REPOOWNER/$REPONAME.git $MODULE && \
+  cd $MODULE && git log -n1 )
+  cat < $CURDIR/configure/RELEASE.local > $MODULE/configure/RELEASE.local
+  cat << EOF >> $CURDIR/configure/RELEASE.local
+${MODULE_UC}=$HOME/.source/$MODULE
+EOF
+}
+
+if [ "$BRBASE" ]
+then
+  git clone --quiet --depth 5 --branch "$BRBASE" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
+  (cd epics-base && git log -n1 )
+  add_gh_flat pvData ${REPOPVD:-epics-base} pvDataCPP ${BRPVD:-master}
+  add_gh_flat pvAccess ${REPOPVA:-epics-base} pvAccessCPP ${BRPVA:-master}
+else
+  git clone --quiet --depth 5 --branch core/"${BRCORE:-master}" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
+  ( cd epics-base && git log -n1 )
+  add_base_module libcom "${BRLIBCOM:-master}"
+  add_base_module ca "${BRCA:-master}"
+  add_base_module database "${BRDATABASE:-master}"
+  add_gh_module pvData ${REPOPVD:-epics-base} pvDataCPP ${BRPVD:-master}
+  add_gh_module pvAccess ${REPOPVA:-epics-base} pvAccessCPP ${BRPVA:-master}
+fi
+
+if [ -e $CURDIR/configure/RELEASE.local ]
+then
+  cat $CURDIR/configure/RELEASE.local
+fi
+
+EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch`
+
+# requires wine and g++-mingw-w64-i686
+if [ "$WINE" = "32" ]
+then
+  echo "Cross mingw32"
+  sed -i -e '/CMPLR_PREFIX/d' epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
+  cat << EOF >> epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
+CMPLR_PREFIX=i686-w64-mingw32-
+EOF
+  cat << EOF >> epics-base/configure/CONFIG_SITE
+CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
+EOF
+fi
+
+if [ "$STATIC" = "YES" ]
+then
+  echo "Build static libraries/executables"
+  cat << EOF >> epics-base/configure/CONFIG_SITE
+SHARED_LIBRARIES=NO
+STATIC_BUILD=YES
+EOF
+fi
+
+case "$CMPLR" in
+clang)
+  echo "Host compiler is clang"
+  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++
+EOF
+
+  # hack
+  sed -i -e 's/CMPLR_CLASS = gcc/CMPLR_CLASS = clang/' epics-base/configure/CONFIG.gnuCommon
+
+  clang --version
+  ;;
+*)
+  echo "Host compiler is default"
+  gcc --version
+  ;;
+esac
+
+cat <<EOF >> epics-base/configure/CONFIG_SITE
+USR_CPPFLAGS += $USR_CPPFLAGS
+USR_CFLAGS += $USR_CFLAGS
+USR_CXXFLAGS += $USR_CXXFLAGS
+EOF
+
+# set RTEMS to eg. "4.9" or "4.10"
+# requires qemu, bison, flex, texinfo, install-info
+if [ -n "$RTEMS" ]
+then
+  echo "Cross RTEMS${RTEMS} for pc386"
+  install -d /home/travis/.cache
+  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
+  | tar -C /home/travis/.cache -xj
+
+  sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' epics-base/configure/os/CONFIG_SITE.Common.RTEMS
+  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.RTEMS
+RTEMS_VERSION=$RTEMS
+RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
+EOF
+  cat << EOF >> epics-base/configure/CONFIG_SITE
+CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
+EOF
+
+  # find local qemu-system-i386
+  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
+  echo -n "Using QEMU: "
+  type qemu-system-i386 || echo "Missing qemu"
+  EXTRA=RTEMS_QEMU_FIXUPS=YES
+fi
+
+make -j2 -C epics-base $EXTRA
+
+if [ "$BRBASE" ]
+then
+  make -j2 -C pvData $EXTRA
+  make -j2 -C pvAccess $EXTRAfi
+fi
--- a/.travis.yml
+++ b/.travis.yml
@ -9,15 +9,20 @@ addons:
    - libreadline6-dev
    - libncurses5-dev
    - perl
-env:
- - BRBASE=3.16 BRPVD=master BRPVA=master
- - BRBASE=3.16 BRPVD=master BRPVA=master CMPLR=clang
- - BRBASE=3.16 BRPVD=master BRPVA=master EXTRA="CMD_CXXFLAGS=-std=c++11"
- - BRBASE=3.16 BRPVD=master BRPVA=master EXTRA="CMD_CXXFLAGS=-std=c++11" CMPLR=clang
- - BRBASE=3.15 BRPVD=master BRPVA=master
+    - clang
+    - g++-mingw-w64-i686
 install:
- - ./build-deps.sh $EXTRA
+ - ./.ci/travis-prepare.sh
 script:
- - make -j2 $EXTRA
- - make tapfiles
- - find . -name '*.tap' -print0 | xargs -0 -n1 prove -e cat -f
+ - ./.ci/travis-build.sh
+env:
+ - BRCORE=master BRLIBCOM=master BRPVD=master BRPVA=master
+ - CMPLR=clang
+ - EXTRA="CMD_CXXFLAGS=-std=c++11"
+ - CMPLR=clang EXTRA="CMD_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
+ - BRBASE=3.16
+ - BRBASE=3.15
--- a/65
+++ b/65
@ -0,0 +1,65 @@
+Copyright and License Terms
+---------------------------
+
+Copyright (c) 2006-2016 Martin R. Kraimer
+Copyright (c) 2006-2016 UChicago Argonne LLC, as Operator of Argonne
+     National Laboratory.
+Copyright (c) 2006 Deutsches Elektronen-Synchrotron,
+     Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY.
+Copyright (c) 2007-2016 Control System Laboratory,
+    (COSYLAB) Ljubljana Slovenia
+Copyright (c) 2010-2016 Brookhaven Science Associates, as Operator
+    of Brookhaven National Laboratory
+Copyright (c) 2011-2016 Diamond Light Source Limited,
+    (DLS) Didcot, United Kingdom
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+________________________________________________________________________
+
+Additional Disclaimers
+----------------------
+
+This software is copyright in part by these institutions:
+
+  * Brookhaven Science Associates, as Operator of Brookhaven
+    National Laboratory, New York, USA
+  * Control System Laboratory, Ljubljana, Slovenia
+  * Deutsches Elektronen-Synchroton, Member of the Helmholtz
+    Association, Hamburg, Germany
+  * Diamond Light Source Limited, Didcot, United Kingdom
+  * Helmholtz-Zentrum Berlin fuer Materialien und Energie m.b.H.,
+    Berlin, Germany.
+  * UChicage Argonne LLC, as Operator of Argonne National Laboratory,
+    Illinois, USA
+
+In no event shall these institutions be liable to any party for direct,
+indirect, special, incidental, or consequential damages arising out of
+the use of this software, its documentation, or any derivatives thereof,
+even if advised of the possibility of such damage.
+
+These institutions specifically disclaim any warranties, including, but
+not limited to, the implied warranties of merchantability, fitness for a
+particular purpose, and non-infringement. This software is provided on
+an "as is" basis, and these institutions have no obligation to provide
+maintenance, support, updates, enhancements, or modifications.
+
--- a/build-deps.sh
+++ b/build-deps.sh
@ -1,58 +0,0 @@
-#!/bin/sh
-set -e -x
-
-CURDIR="$PWD"
-
-cat << EOF > configure/RELEASE.local
-EPICS_BASE=$HOME/.source/epics-base
-PVDATA=$HOME/.source/pvDataCPP
-PVACCESS=$HOME/.source/pvAccessCPP
-EOF
-cat configure/RELEASE.local
-
-install -d "$HOME/.source"
-cd "$HOME/.source"
-
-git clone --quiet --depth 5 --branch "$BRBASE" https://github.com/epics-base/epics-base.git epics-base
-git clone --quiet --depth 5 --branch "$BRPVD" https://github.com/mdavidsaver/pvDataCPP.git pvDataCPP
-git clone --quiet --depth 5 --branch "$BRPVA" https://github.com/mdavidsaver/pvAccessCPP.git pvAccessCPP
-
-(cd epics-base && git log -n1 )
-(cd pvDataCPP && git log -n1 )
-(cd pvAccessCPP && git log -n1 )
-
-EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch`
-
-case "$CMPLR" in
-clang)
-  echo "Host compiler is clang"
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
-GNU         = NO
-CMPLR_CLASS = clang
-CC          = clang
-CCC         = clang++
-EOF
-
-  # hack
-  sed -i -e 's/CMPLR_CLASS = gcc/CMPLR_CLASS = clang/' epics-base/configure/CONFIG.gnuCommon
-
-  clang --version
-  ;;
-*)
-  echo "Host compiler is default"
-  gcc --version
-  ;;
-esac
-
-cat << EOF > pvDataCPP/configure/RELEASE.local
-EPICS_BASE=$HOME/.source/epics-base
-EOF
-
-cat << EOF > pvAccessCPP/configure/RELEASE.local
-PVDATA=$HOME/.source/pvDataCPP
-EPICS_BASE=$HOME/.source/epics-base
-EOF
-
-make -j2 -C epics-base "$@"
-make -j2 -C pvDataCPP "$@"
-make -j2 -C pvAccessCPP "$@"
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@ -37,3 +37,6 @@ CHECK_RELEASE = YES

 # we don't actually use 'rset' explicitly, but quiet some warnings
 USR_CPPFLAGS += -DUSE_TYPED_RSET
+
+-include $(TOP)/../CONFIG_SITE.local
+-include $(TOP)/configure/CONFIG_SITE.local
--- a/p2pApp/chancache.h
+++ b/p2pApp/chancache.h
@ -133,7 +133,7 @@ struct epicsShareClass ChannelCacheEntry

    // this exists as a seperate object to prevent a reference loop
    // ChannelCacheEntry -> pva::Channel -> CRequester
-    struct CRequester : public epics::pvAccess::ChannelRequester
+    struct epicsShareClass CRequester : public epics::pvAccess::ChannelRequester
    {
        static size_t num_instances;

--- a/p2pApp/gwmain.cpp
+++ b/p2pApp/gwmain.cpp
@ -20,6 +20,7 @@
 #include <pv/configuration.h>
 #include <pv/serverContext.h>

+#define epicsExportSharedSymbols
 #include "server.h"

 namespace pvd = epics::pvData;
--- a/p2pApp/moncache.cpp
+++ b/p2pApp/moncache.cpp
@ -1,6 +1,7 @@

 #include <epicsAtomic.h>

+#define epicsExportSharedSymbols
 #include "helper.h"
 #include "pva2pva.h"
 #include "chancache.h"
--- a/pdbApp/Makefile
+++ b/pdbApp/Makefile
@ -5,7 +5,7 @@ include $(TOP)/configure/CONFIG
 #  ADD MACRO DEFINITIONS AFTER THIS LINE
 #=============================

-LIBRARY_HOST += qsrv
+LIBRARY += qsrv

 USR_CPPFLAGS += -I$(TOP)/common -I$(TOP)/p2pApp

@ -22,7 +22,7 @@ qsrv_SRCS += pdbgroup.cpp
 qsrv_SRCS += configparse.cpp
 endif

-qsrv_LIBS += pvAccessIOC pvAccess pvData $(MBLIB)
+qsrv_LIBS += pvAccess pvData
 qsrv_LIBS += $(EPICS_BASE_IOC_LIBS)

 FINAL_LOCATION ?= $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION))
--- a/pdbApp/pdbsingle.cpp
+++ b/pdbApp/pdbsingle.cpp
@ -8,6 +8,7 @@

 #include <pv/epicsException.h>

+#define epicsExportSharedSymbols
 #include "errlogstream.h"
 #include "helper.h"
 #include "pdbsingle.h"