Update SHRLIB_VERSION

update docs
NTTable::getColumnNames() wrong field
2019-03-20 13:57:00 -05:00 · 2019-03-12 19:45:30 -07:00 · 2019-03-12 17:42:36 -07:00 · 2018-12-17 16:05:45 -06:00 · 2018-12-17 16:04:09 -06:00 · 2018-11-26 11:52:01 -08:00
14 changed files with 61 additions and 352 deletions
--- a/.ci/travis-build.sh
+++ b/.ci/travis-build.sh
@@ -1,21 +1,10 @@
 #!/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
-  make -s test-results
+  make -j2 tapfiles
+  make -j2 -s test-results
 fi
--- a/.ci/travis-prepare.sh
+++ b/.ci/travis-prepare.sh
@@ -3,35 +3,6 @@ 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
@@ -39,24 +10,6 @@ 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
@@ -71,17 +24,10 @@ ${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}
-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_gh_module pvData ${REPOPVD:-epics-base} pvDataCPP ${BRPVD:-master}
-fi
+# not recursive
+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}

 if [ -e $CURDIR/configure/RELEASE.local ]
 then
@@ -144,29 +90,18 @@ EOF
 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
+  curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \
+  | tar -C / -xmj

  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
+RTEMS_BASE=$HOME/.rtems
 EOF
  cat << EOF >> epics-base/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
+CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
 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
-fi
+make -j2 -C pvData $EXTRA
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,19 +11,21 @@ addons:
    - perl
    - clang
    - g++-mingw-w64-i686
+    - qemu-system-x86
 install:
 - ./.ci/travis-prepare.sh
 script:
 - ./.ci/travis-build.sh
 env:
- - BRCORE=master BRLIBCOM=master BRPVD=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
+ - BRBASE=7.0
+ - BRBASE=7.0 CMPLR=clang
+ - BRBASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++98"
+ - BRBASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
+ - BRBASE=7.0 CMPLR=clang EXTRA="CMD_CXXFLAGS=-std=c++11"
+ - BRBASE=7.0 WINE=32 TEST=NO STATIC=YES
+ - BRBASE=7.0 WINE=32 TEST=NO STATIC=NO
+ - BRBASE=7.0 RTEMS=4.10 TEST=NO
+ - BRBASE=7.0 RTEMS=4.9 TEST=NO
 - BRBASE=3.16
 - BRBASE=3.15
 - BRBASE=3.14
--- a/README.md
+++ b/README.md
@@ -1,78 +1,17 @@
-normativeTypesCPP
-=================
+# normativeTypesCPP

-normativeTypesCPP is a C++ module containing helper classes which implement
-and provide support for the EPICS V4 Normative Types.
+The EPICS **Normative Types** are a set of standard high-level data types, designed to aid interoperability between EPICS PVA applications.

-The latter are a set of standard high-level data types to aid interoperability
-of EPICS V4 applications and are specified in the
-[NormativeTypes Specification](http://epics-pvdata.sourceforge.net/alpha/normativeTypes/normativeTypes.html).
+This normativeTypesCPP module is a part of the EPICS software toolkit that provides C++ helper classes which implement the EPICS Normative Types.

+## Links

-Status
------
+- General information about EPICS can be found at the
+  [EPICS Controls website](https://epics-controls.org).
+- API documentation for this module can be found in its
+  documentation directory, in particular the file
+  normativeTypesCPP.html

-The current release (5.0) implements fully the
-[16 Mar 2015 version](http://epics-pvdata.sourceforge.net/alpha/normativeTypes/normativeTypes_20150316.html)
-of the Normative Types Specification.
-
-The module status is alpha and the API and behaviour may change in future
-versions.
-
-The previous release (4.0) supported only 6 types. 
-There is no documentation yet for the new types added in 5.0.
-
-
-Further Info
------------
-
-Consult the documents in the documentation directory, in particular
-
-* normativeTypesCPP.html
-* RELEASE_NOTES.md
-
-Also see the [EPICS Version 4 website](http://epics-pvdata.sourceforge.net)
-
-
-Prerequisites
-------------
-
-normativeTypesCPP requires recent versions of the following software:
-
-1. EPICS Base (v3.14.12.3 or later)
-2. EPICS4 pvCommonCPP (4.1.0 or later)
-2. pvDataCPP (5.0.0 or later)
-
-(pvCommonCPP may not be needed depending on host/compiler.)
-
-
-Building
--------
-
-Building uses the make utility and the EPICS base build system.
-
-The build system needs the location of the prerequisites, e.g. by placing the
-lines of the form
-
-    PVDATA = /home/install/epicsV4/pvDataCPP
-    PVCOMMON = /home/install/epicsV4/pvCommonCPP
-    EPICS_BASE = /home/install/epics/base
-
-pointing to the locations in a file called RELEASE.local
-in the configure directory or the parent directory of normativeTypesCPP.
-
-With this in place, to build type make
-
-    make
-
-To perform a clean build type
-
-    make clean uninstall
-
-To run the unit tests type
-
-    make runtests
-
-For more information on the EPICS build system consult the
-[Application Development guide](http://www.aps.anl.gov/epics/base/R3-14/12-docs/AppDevGuide.pdf).
+## Building

+This module is included as a submodule of a full EPICS 7 release and will be compiled during builds of that software.
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-  <meta http-equiv="Content-Type" content="text/html;" />
-  <meta name="keywords" content="EPICS, EPICSv4" />
-  <title>EPICS V4 Normative Types Release Notes</title>
-  <link rel="stylesheet" type="text/css" href="../../base.css" />
-  <link rel="stylesheet" type="text/css" href="../../epicsv4.css" />
-
-</head>
-
-<body>
-
-<h1>Release 5.2.0</h1>
-
-<p>This release contains bug fixes and minor source updates needed to
-build against the latest version of pvData.</p>
-
-<h1>Release 5.1.2</h1>
-
-<p>The main changes since release 5.1.1 are:</p>
-
-<ul>
-<li>NTUnionBuilder: Add missing value() function</li>
-<li>Updated document: Now document all Normative Types</li>
-</ul>
-
-<h1>Release 5.1.1</h1>
-
-<p>The main changes since release 5.0 are:</p>
-
-<ul>
-<li>Linux shared library version added</li>
-<li>Headers and source locations have changed</li>
-<li>Missing is_a implementations added</li>
-<li>NTAttribute::addTags() is now non-virtual</li>
-<li>New license file replaces LICENSE and COPYRIGHT</li>
-</ul>
-
-<h2>Shared library version added</h2>
-
-<p>Linux shared library version numbers have been added by setting SHRLIB_VERSION
-(to 5.1 in this case). So shared object will be libnt.so.5.1 instead of
-libpvData.so.</p>
-
-<h2>Headers and source locations have changed</h2>
-
-<p>Source has moved out of nt directory directly into src.</p>
-
-<p>Headers have been moved into a pv directory. This facilitates using some IDEs
-such as Qt Creator.</p>
-
-<p>src/nt/ntscalar.cpp -> src/ntscalar.cpp
-src/nt/ntscalar.h   -> src/pv/ntscalar.h</p>
-
-<h2>Missing is_a implementations added</h2>
-
-<p>is_a(PVStructurePtr const &amp;) implementation has been added for each type.</p>
-
-<h1>Release 5.0</h1>
-
-<p>This release adds support through wrapper classes and builders for the
-remaining Normative Types:</p>
-
-<ul>
-<li>NTEnum</li>
-<li>NTMatrix</li>
-<li>NTURI</li>
-<li>NTAttribute</li>
-<li>NTContinuum</li>
-<li>NTHistogram</li>
-<li>NTAggregate</li>
-<li>NTUnion</li>
-<li>NTScalarMultiChannel</li>
-</ul>
-
-<p>Release 5.0 therefore implements fully the
-<a href="http://epics-pvdata.sourceforge.net/alpha/normativeTypes/normativeTypes_20150316.html">16 Mar 2015 version</a>
- of the normativeTypes specification.</p>
-
-<p>Each wrapper class has an extended API:</p>
-
-<ul>
-<li>is_a now has a convenience overload taking a PVStructure.</li>
-<li>isCompatible, reporting introspection type compatibility, now has an overload
-taking a Structure. The PVStructure version is retained as a convenience
-method and for backwards compatibility.</li>
-<li>An isValid function now reports validity of a compatible PVStructure's data
-with respect to the specification.</li>
-</ul>
-
-<p>Other changes are:</p>
-
-<ul>
-<li>Support for NTAttributes extended as required by NTNDArray
-(NTNDArrayAttributes).</li>
-<li>A new class for parsing NT IDs (NTID).</li>
-<li>Resolution of the confusion between column names and labels in NTTable and
-improved API. Function for adding columns is now addColumn rather than add.
-New getColumnNames function provided.</li>
-<li>isConnected is treated as an optional rather than a required field in
-NTMultiChannelArray. isConnected() and addIsConnected() functions added to
-wrapper and builder respectively.</li>
-<li>Unit tests for all new classes.</li>
-</ul>
-
-<h1>Release 4.0</h1>
-
-<p>This is the first release of normativeTypesCPP that is part of an official
-EPICS V4 release.
-It is a major rewrite of the previous versions of normativeTypesCPP.</p>
-
-<p>This release provides support through wrapper classes and builders for the
-following Normative Types:</p>
-
-<ul>
-<li>NTScalar</li>
-<li>NTScalarArray</li>
-<li>NTNameValue</li>
-<li>NTTable</li>
-<li>NTMultiChannel</li>
-<li>NTNDArray</li>
-</ul>
-
-<p>Each type has a wrapper class of the same name which has functions for checking 
-compatibility of existing PVStructures (isCompatible) and the reported types of 
-Structures (is_a), wraps existing PVStructures (wrap, wrapUnsafe) and provides
-a convenient interface to all required and optional fields.</p>
-
-<p>Each type has a builder which can create a Structure, a PVStructure or a
-wrapper around a new PVStructure. In each case optional or extra fields can be
-added and options such as choice of scalar type can be made.</p>
-
-<p>Additional features are:</p>
-
-<ul>
-<li>Utility classes NTField and NTPVField for standard structure fields and
-NTUtils for type IDs.</li>
-<li>Unit tests for the implemented classes.</li>
-</ul>
-
-
-</body>
-</html>
--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -1,11 +1,24 @@
-Release 5.2.0
-=============
+# normativeTypes Module
+
+This document summarizes the changes to the module between releases.
+
+## Release 5.2.2
+
+- Fix NTTable::getColumnNames().
+
+## Release 5.2.1 (EPICS 7.0.2, Dec 2018)
+
+* No functional changes.
+* Removal of declaration for unimplemented PVNTField::createAlarmLimit() and elimination of unused variables.
+
+
+## Release 5.2.0 (EPICS 7.0.1, Dec 2017)

 This release contains bug fixes and minor source updates needed to
 build against the latest version of pvData.

-Release 5.1.2
-=============
+
+## Release 5.1.2 (EPICS V4.6, Aug 2016)

 The main changes since release 5.1.1 are:

@@ -13,8 +26,7 @@ The main changes since release 5.1.1 are:
 * Updated document: Now document all Normative Types


-Release 5.1.1
-=============
+## Release 5.1.1

 The main changes since release 5.0 are:

@@ -24,15 +36,13 @@ The main changes since release 5.0 are:
 * NTAttribute::addTags() is now non-virtual
 * New license file replaces LICENSE and COPYRIGHT

-Shared library version added
----------------------------
+### Shared library version added

 Linux shared library version numbers have been added by setting SHRLIB_VERSION
 (to 5.1 in this case). So shared object will be libnt.so.5.1 instead of
 libpvData.so.

-Headers and source locations have changed
-----------------------------------------
+### Headers and source locations have changed

 Source has moved out of nt directory directly into src.

@@ -42,14 +52,12 @@ such as Qt Creator.
 src/nt/ntscalar.cpp -> src/ntscalar.cpp
 src/nt/ntscalar.h   -> src/pv/ntscalar.h

-Missing is_a implementations added
----------------------------------
+### Missing is_a implementations added

 is_a(PVStructurePtr const &) implementation has been added for each type.


-Release 5.0
-===========
+## Release 5.0 (EPICS V4.5, Oct 2015)

 This release adds support through wrapper classes and builders for the
 remaining Normative Types:
@@ -90,8 +98,7 @@ Other changes are:
  wrapper and builder respectively.
 * Unit tests for all new classes.

-Release 4.0
-===========
+## Release 4.0 (EPICS V4.4, Dec 2014)

 This is the first release of normativeTypesCPP that is part of an official
 EPICS V4 release.
--- a/documentation/ntCPP.html
+++ b/documentation/ntCPP.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-  <title>EPICS ntCPP</title>
+  <title>EPICS normativeTypesCPP</title>
  <link rel="stylesheet" type="text/css"
  href="http://epics-pvdata.sourceforge.net/base.css" />
  <link rel="stylesheet" type="text/css"
@@ -36,7 +36,7 @@
 <div class="head">
 <h1>EPICS normativeTypesCPP</h1>

-<h2 class="nocount">Release 5.2.0 - 2017.12.14</h2>
+<h2 class="nocount">Release 5.2.1 - December 2018</h2>
  <dl>
    <dt>Editors:</dt>
   <dd> Marty Kraimer<br />
--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -72,6 +72,6 @@ make distclean all
 make runtests

 ###########################################
-# Create distribution
+# Create cache

 tar --exclude=test* -czf normativeTypes.CB-dist.tar.gz lib include
--- a/jenkins/cloudbees_doc
+++ b/jenkins/cloudbees_doc
@@ -21,14 +21,7 @@ installE4 () {
    local module=$1
    local branch=$2

-    # If microbench version does not exist, try without
-    if [ "${MB}" = "WITH_MICROBENCH" ]; then
-        if wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=WITH_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz; then
-            wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
-        fi
-    else
-        wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
-    fi
+    wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
    tar -xzf ${module}.CB-dist.tar.gz
 }

@@ -38,7 +31,6 @@ installE4 () {
 BASE=3.15.4
 PUBLISH=${PUBLISH:-NO}
 BRANCH=${BRANCH:-master}
-MB=NO_MICROBENCH

 ###########################################
 # Fetch and unpack dependencies
--- a/src/Makefile
+++ b/src/Makefile
@@ -47,7 +47,7 @@ LIBRARY = nt
 nt_LIBS += pvData Com

 # shared library ABI version.
-SHRLIB_VERSION ?= 5.2
+SHRLIB_VERSION ?= 5.2.2

 include $(TOP)/configure/RULES

--- a/src/nttable.cpp
+++ b/src/nttable.cpp
@@ -270,7 +270,7 @@ PVStringArrayPtr NTTable::getLabels() const

 StringArray const & NTTable::getColumnNames() const
 {
-    return pvNTTable->getStructure()->getFieldNames();
+    return pvValue->getStructure()->getFieldNames();
 }

 PVFieldPtr NTTable::getColumn(std::string const & columnName) const
--- a/src/pv/ntcontinuum.h
+++ b/src/pv/ntcontinuum.h
@@ -93,7 +93,6 @@ namespace detail {

        void reset();

-        bool dim;
        bool descriptor;
        bool alarm;
        bool timeStamp;
--- a/src/pv/ntfield.h
+++ b/src/pv/ntfield.h
@@ -197,12 +197,6 @@ public:
     */
    epics::pvData::PVStructurePtr createDisplay();

-    /**
-     * Creates an alarmLimit PVStructure.
-     * @return an alarmLimit PVStructure.
-     */
-    epics::pvData::PVStructurePtr createAlarmLimit();
-
    /**
     * Creates a control PVStructure.
     * @return a control PVStructure.
--- a/src/pv/nthistogram.h
+++ b/src/pv/nthistogram.h
@@ -103,7 +103,6 @@ namespace detail {
        bool valueTypeSet;
        epics::pvData::ScalarType valueType;

-        bool dim;
        bool descriptor;
        bool alarm;
        bool timeStamp;
Author	SHA1	Message	Date
Andrew Johnson	e803240fbf	Update SHRLIB_VERSION	2019-03-20 13:57:00 -05:00
Michael Davidsaver	54c07f705f	update docs	2019-03-12 19:45:30 -07:00
Michael Davidsaver	fa23ddd370	NTTable::getColumnNames() wrong field	2019-03-12 17:42:36 -07:00
Andrew Johnson	41d56fdf89	Update version numbers and formatting in documentation	2018-12-17 16:05:45 -06:00
Andrew Johnson	a65fc3ef30	Update and unify README.md	2018-12-17 16:04:09 -06:00
Michael Davidsaver	b69bc44974	5.2.1	2018-11-26 11:52:01 -08:00
Michael Davidsaver	a90f0173a7	drop redundant generated html	2018-11-26 11:50:39 -08:00
Michael Davidsaver	83342beb7e	travis-ci dropped 3.14	2018-10-29 19:42:12 -07:00
Michael Davidsaver	f6e6cf037f	update travis-ci	2018-10-29 17:57:18 -07:00
Andrew Johnson	80920ae0b0	Clean up warnings Removed unused member variables 'bool dim'.	2018-01-04 17:16:34 -06:00
Michael Davidsaver	1f7667b22d	drop prototype PVNTField::createAlarmLimit not implemented.	2017-12-19 17:15:37 -06:00
Ralph Lange	e15e84fb14	jenkins-ci: fix/update CloudBees jobs	2017-12-19 09:58:49 +01:00