fix problem with extra spaces after protocol name in link

Link streamApp against seq and pv libs when SNCSEQ is defined

.VERSION

@@ -0,0 +1,3 @@
+COMMIT: $Format:%H$
+REFS:   $Format:%D$
+DATE:   $Format:%ci$

.gitattributes

@@ -0,0 +1,2 @@
+GNUmakefile export-ignore
+.VERSION export-subst

.gitignore

@@ -6,3 +6,5 @@ dbd
 include
 *.pdf
 *.*log
+StreamVersion.h
+*.local

GNUmakefile

@@ -19,18 +19,23 @@ SOURCES += $(FORMATS:%=src/%Converter.cc)
 SOURCES += $(BUSSES:%=src/%Interface.cc)
 SOURCES += $(STREAM_SRCS:%=src/%)
 
-HEADERS += devStream.h
+HEADERS += src/devStream.h
-HEADERS += StreamFormat.h
+HEADERS += src/StreamFormat.h
-HEADERS += StreamFormatConverter.h
+HEADERS += src/StreamFormatConverter.h
-HEADERS += StreamBuffer.h
+HEADERS += src/StreamBuffer.h
-HEADERS += StreamError.h
+HEADERS += src/StreamError.h
+HEADERS += src/StreamVersion.h
 
-StreamCore.o StreamCore.d: streamReferences
+CPPFLAGS += -DSTREAM_INTERNAL -I$(COMMON_DIR)
 
-# Update version string (contains __DATE__ and __TIME__)
+# Update version string each time anything changes
-# each time anything changes.
+StreamVersion$(OBJ) StreamVersion$(DEP): $(COMMON_DIR)/StreamVersion.h $(filter-out StreamVersion$(OBJ) stream_exportAddress$(OBJ),$(LIBOBJS) $(LIBRARY_OBJS))
-StreamVersion.o: $(filter-out StreamVersion.o stream_exportAddress.o,$(LIBOBJS))
 
+$(COMMON_DIR)/StreamVersion.h: $(filter-out StreamVersion.h,$(notdir $(SOURCES) $(HEADERS)))
+	@echo Creating $@
+	$(PERL) ../src/makeStreamVersion.pl $@
+
+StreamCore$(OBJ) StreamCore$(DEP): streamReferences
 streamReferences:
 	$(PERL) ../src/makeref.pl Interface $(BUSSES) > $@
 	$(PERL) ../src/makeref.pl Converter $(FORMATS) >> $@

Makefile

@@ -21,21 +21,10 @@
 # along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 #########################################################################/
 
-TOP = ..
+TOP = .
-ifneq ($(wildcard ../configure),)
+DIRS = configure
-  # We are in an EPICS R3.14+ <TOP> location
+src_DEPEND_DIRS := $(DIRS)
-  include $(TOP)/configure/CONFIG
+include $(TOP)/configure/CONFIG
-else ifneq ($(wildcard ../config),)
-  # We are in an EPICS R3.13 <TOP> location
-  CONFIG = $(TOP)/config
-  include $(TOP)/config/CONFIG_APP
-else
-  # Using our own local configuration
-  TOP = .
-  DIRS = configure
-  src_DEPEND_DIRS := $(DIRS)
-  include $(TOP)/configure/CONFIG
-endif
 
 DIRS += src
 DIRS += streamApp

configure/CONFIG_APP

@@ -24,4 +24,3 @@ endif
 
 # dbst based database optimization (default: NO)
 DB_OPT = NO
-HOST_OPT=NO

docs/setup.html

@@ -54,15 +54,17 @@ git clone https://github.com/paulscherrerinstitute/StreamDevice.git
 <p class="new">
 <em>StreamDevice</em> now comes with a standard
 <kbd>configure</kbd> directory.
-But it can still be built in an external <em>&lt;top&gt;</em>
+<del>But it can still be built in an external <em>&lt;top&gt;</em>
 directory as in previous versions.
 It will automatically detect <em>&lt;top&gt;</em> locations
 from the presence of <kbd>../configure</kbd> or <kbd>../config</kbd>
-directories.
+directories.</del> Using an upper level <kbd>../configure</kbd> is
+no longer supported due to compatibility issues with <em>SynApps</em>.
 </p>
 <p class="new">
 Edit the <kbd>configure/RELEASE</kbd> file to specify the install location
-of EPICS base and of additional software modules, for example:
+of EPICS base and of additional software modules or add a
+<kbd>configure/RELEASE.local</kbd> file to overwrite, for example:
 <pre>
 EPICS_BASE=/home/epics/base-3.16.1
 </pre>

src/Makefile

@@ -21,16 +21,8 @@
 # along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 #########################################################################/
 
-TOP = ../..
+TOP= ..
-ifneq ($(wildcard ../../configure),)
+include $(TOP)/configure/CONFIG
-  include $(TOP)/configure/CONFIG
-else ifneq ($(wildcard ../../config),)
-  include $(TOP)/config/CONFIG_APP
-  include $(TOP)/config/RULES_ARCHS
-else
-  TOP= ..
-  include $(TOP)/configure/CONFIG
-endif
 
 -include CONFIG_STREAM
 -include ../CONFIG_STREAM
@@ -51,7 +43,7 @@ endif
 
 ifeq ($(LOADABLE_MODULE),YES)
 SRCS += $(LIBRARY_DEFAULT)_registerRecordDeviceDriver.cpp
-endif 
+endif
 SRCS += $(BUSSES:%=%Interface.cc)
 SRCS += $(FORMATS:%=%Converter.cc)
 SRCS += $(RECORDTYPES:%=dev%Stream.c)
@@ -74,14 +66,24 @@ endif
 LIB_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 INC += devStream.h
+INC += StreamFormat.h
+INC += StreamFormatConverter.h
+INC += StreamBuffer.h
+INC += StreamError.h
+INC += StreamVersion.h
 
 # switch off annoying rset warnings in 3.16+
 CPPFLAGS += -DUSE_TYPED_RSET
 
+CPPFLAGS += -DSTREAM_INTERNAL
+
 -include $(TOP)/configure/RULES
 
-# Update version string whenever something changes
+# Update version string whenever something changed.
-StreamVersion$(OBJ): $(filter-out StreamVersion.o,$(LIBOBJS)$(LIBRARY_OBJS))
+StreamVersion$(OBJ): $(COMMON_DIR)/StreamVersion.h $(filter-out StreamVersion$(OBJ),$(LIBOBJS) $(LIBRARY_OBJS)) ../CONFIG_STREAM
+$(COMMON_DIR)/StreamVersion.h: ../../.VERSION $(SRCS) $(filter-out StreamVersion.h, $(INC))
+	@echo Creating $@
+	$(PERL) ../makeStreamVersion.pl $@
 
 # Add references to all registrars to main file to avoid
 # missing initialization.

src/Makefile.Host

@@ -29,11 +29,4 @@ endif
 include $(TOP)/config/CONFIG_APP
 include ../CONFIG_STREAM
 
-DBDNAME = stream.dbd
-INC += devStream.h
-
 include $(EPICS_BASE)/config/RULES.Host
-
-# create stream.dbd from all RECORDTYPES
-stream.dbd: ../CONFIG_STREAM
-	$(PERL) ../makedbd.pl -3.13 $(RECORDTYPES) > $@

src/Makefile.Vx

@@ -42,17 +42,37 @@ SRCS.c += $(filter %.c,$(STREAM_SRCS:%=%../%))
 
 LIBOBJS = $(patsubst ../%,%.o,$(basename $(SRCS.cc) $(SRCS.c)))
 
+DBDNAME = stream.dbd
+
+INC += devStream.h
+INC += StreamFormat.h
+INC += StreamFormatConverter.h
+INC += StreamBuffer.h
+INC += StreamError.h
+INC += StreamVersion.h
+
 include $(EPICS_BASE)/config/RULES.Vx
 include ../../config/RULES.munch
 
 DEPENDS: depends
 -include DEPENDS
 
+CPPFLAGS += -DSTREAM_INTERNAL
+
 # Update version string whenever something changes
-StreamVersion.o: ../*.c ../*.h ../*.cc ../CONFIG_STREAM
 $(LIBNAME): StreamVersion.o
 
+StreamVersion.o: StreamVersion.h $(filter-out StreamVersion.o,$(LIBOBJS)) ../CONFIG_STREAM
+StreamVersion.h: $(SRCS.cc) $(SRCS.c) $(add-prefix ../,$(filter-out StreamVersion.h, $(INC)))
+	@echo Creating $@ from git tag
+	$(PERL) ../makeStreamVersion.pl > $@
+
 StreamCore.o: streamReferences
 
 streamReferences:
 	touch $@
+
+# create stream.dbd from all RECORDTYPES
+stream.dbd: ../CONFIG_STREAM
+	$(PERL) ../makedbd.pl -3.13 $(RECORDTYPES) > $@
+

src/RawFloatConverter.cc

@@ -79,15 +79,15 @@ printDouble(const StreamFormat& format, StreamBuffer& output, double value)
     if (!(format.flags & alt_flag) ^ (endian == 4321))
     {
         // swap if byte orders differ
-    	for (n = nbOfBytes-1; n >= 0; n--)
+        for (n = nbOfBytes-1; n >= 0; n--)
-    	{
+        {
             output.append(buffer.bytes[n]);
-    	}
+        }
     } else {
-    	for (n = 0; n < nbOfBytes; n++)
+        for (n = 0; n < nbOfBytes; n++)
-    	{
+        {
             output.append(buffer.bytes[n]);
-    	}
+        }
     }
     return true;
 }
@@ -116,15 +116,15 @@ scanDouble(const StreamFormat& format, const char* input, double& value)
     if (!(format.flags & alt_flag) ^ (endian == 4321))
     {
         // swap if byte orders differ
-    	for (n = nbOfBytes-1, i = 0; n >= 0; n--, i++)
+        for (n = nbOfBytes-1, i = 0; n >= 0; n--, i++)
-    	{
+        {
             buffer.bytes[n] = input[i];
-    	}
+        }
     } else {
-    	for (n = 0; n < nbOfBytes; n++)
+        for (n = 0; n < nbOfBytes; n++)
-    	{
+        {
             buffer.bytes[n] = input[n];
-    	}
+        }
     }
 
     if (nbOfBytes == 4)

src/StreamCore.cc

@@ -187,9 +187,12 @@ bool StreamCore::
 parse(const char* filename, const char* _protocolname)
 {
     protocolname = _protocolname;
-    // extract substitutions from protocolname "name(sub1,sub2)"
+    // extract substitutions from protocolname "name ( sub1, sub2 ) "
     ssize_t i = protocolname.find('(');
-    if (i >= 0)
+    if (i < 0) i = 0;
+    while (protocolname[i-1] == ' ')
+        protocolname.remove(--i, 1);
+    if (protocolname[i] == '(')
     {
         while (i < (ssize_t)protocolname.length())
         {

src/StreamEpics.cc

@@ -1115,11 +1115,7 @@ getFieldAddress(const char* fieldname, StreamBuffer& address)
 }
 
 static const unsigned char dbfMapping[] =
-#ifdef DBR_INT64
-    {0, DBF_UINT64, DBF_INT64, DBF_ENUM, DBF_DOUBLE, DBF_STRING};
-#else
     {0, DBF_ULONG, DBF_LONG, DBF_ENUM, DBF_DOUBLE, DBF_STRING};
-#endif
 
 bool Stream::
 formatValue(const StreamFormat& format, const void* fieldaddress)

src/StreamError.cc

@@ -48,12 +48,12 @@ FILE *StreamDebugFile = NULL;
 
 /* Enable ANSI colors in Windows console */
 static int win_console_init() {
-	DWORD dwMode = 0;
+    DWORD dwMode = 0;
     HANDLE hCons = GetStdHandle(STD_ERROR_HANDLE);
-	GetConsoleMode(hCons, &dwMode);
+    GetConsoleMode(hCons, &dwMode);
-	dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+    dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
-	SetConsoleMode(hCons, dwMode);
+    SetConsoleMode(hCons, dwMode);
-	return 0;
+    return 0;
 }
 static int s = win_console_init();
 

src/StreamProtocol.cc

@@ -157,7 +157,7 @@ StreamProtocolParser* StreamProtocolParser::
 readFile(const char* filename)
 {
     FILE* file;
-#ifdef windows
+#ifdef _WIN32
     const char pathseparator = ';';
     const char dirseparator = '\\';
 #else

src/StreamVersion.c

@@ -20,12 +20,22 @@
 * along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 *************************************************************************/
 
-#include "devStream.h"
+#include "StreamVersion.h"
 
 #define STR2(x) #x
 #define STR(x) STR2(x)
 const char StreamVersion [] =
-    "StreamDevice " STR(STREAM_MAJOR)
+    "StreamDevice"
+#ifdef STREAM_MAJOR
+    " " STR(STREAM_MAJOR)
     "." STR(STREAM_MINOR)
     "." STR(STREAM_PATCHLEVEL)
-    " built " __DATE__ " " __TIME__;
+    STREAM_DEV
+#endif
+#ifdef STREAM_COMMIT_DATE
+    " " STREAM_COMMIT_DATE
+#endif
+#ifdef STREAM_COMMIT_HASH
+    "\n  commit: " STREAM_COMMIT_HASH
+#endif
+;

src/TimestampConverter.cc

@@ -42,7 +42,7 @@ value can also be gained from tm_gmtoff of the tm-structure.
     defined(__DragonFly__)
 static int timezone_bsd=0;
 #define timezone timezone_bsd
-#define tzset() { struct tm tm; time_t timet; tzset(); time(&timet);	\
+#define tzset() { struct tm tm; time_t timet; tzset(); time(&timet);    \
                   localtime_r(&timet, &tm); timezone=tm.tm_gmtoff; }
 #endif
 

src/devStream.h

@@ -28,9 +28,9 @@
 #include <string.h>
 #include <sys/types.h>
 
-#define STREAM_MAJOR 2
+#ifndef STREAM_INTERNAL
-#define STREAM_MINOR 8
+#include "StreamVersion.h"
-#define STREAM_PATCHLEVEL 12
+#endif
 
 #ifndef OK
 #define OK 0

src/devaaiStream.c

@@ -126,7 +126,7 @@ static long readData(dbCommon *record, format_t *format)
                         }
                         aai->nord = (long)length;
                         return OK;
-				    }
+                    }
                     default:
                         errlogSevPrintf(errlogFatal,
                             "readData %s: can't convert from string to %s\n",

src/devaoStream.c

@@ -52,16 +52,16 @@ static long readData(dbCommon *record, format_t *format)
             break;
             val += ao->roff;
             if (ao->linr == menuConvertNO_CONVERSION) {
-	        ; /*do nothing*/
+                ; /*do nothing*/
             } else if ((ao->linr == menuConvertLINEAR)
 #ifndef EPICS_3_13
-		    || (ao->linr == menuConvertSLOPE)
+                    || (ao->linr == menuConvertSLOPE)
 #endif
                     ) {
                 val = val * ao->eslo + ao->eoff;
             } else {
                 if (cvtRawToEngBpt(&val, ao->linr, 0,
-		        (void *)&ao->pbrk, &ao->lbrk) == ERROR) return ERROR;
+                    (void *)&ao->pbrk, &ao->lbrk) == ERROR) return ERROR;
             }
         }
         default:

src/makeStreamVersion.pl

@@ -0,0 +1,77 @@
+##########################################################################
+# This is a helper script for StreamDevice.
+# It generates a version file from git tags.
+#
+# (C) 2020 Dirk Zimoch (dirk.zimoch@psi.ch)
+#
+# This file is part of StreamDevice.
+#
+# StreamDevice is free software: You can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# StreamDevice is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with StreamDevice. If not, see https://www.gnu.org/licenses/.
+#########################################################################/
+
+use strict;
+
+
+my ( $major, $minor, $patch, $dev, $date, $hash );
+
+if (my $version = `git describe --tags --abbrev=0 --dirty --match "[0-9]*" 2>/dev/null`) {
+    if ($version =~ m/(\d+)\.(\d+)\.(\d+)?(.*)?/) {
+        $major = $1; $minor = $2; $patch = $3; $dev = $4;
+    }
+    if (`git log -1 --format="%H %ci"`=~ m/([[:xdigit:]]+) (.+)/) {
+        $hash = $1; $date = $2;
+    }
+}
+if (!$major) {
+    if (open(my $fh, '<', '../../.VERSION')) {
+        while (my $line = <$fh>) {
+            if ($line =~ m/COMMIT: *([[:xdigit:]]+)/) {
+                $hash = $1;
+            }
+            if ($line =~ m/REFS: .*tag: *(\d+)\.(\d+)\.?(\d+)?/) {
+                $major = $1; $minor = $2; $patch = $3 or $patch = 0;
+            }
+            if ($line =~ m/DATE: *([-0-9:+ ]*)/) {  
+                $date = $1;
+            }
+        }
+    } else {
+        print "neither git repo nor .VERSION file found\n";
+    }
+}
+
+open my $out, '>', @ARGV or die $!;
+print $out <<EOF;
+/* Generated file */
+
+#ifndef StreamVersion_h
+#define StreamVersion_h
+
+EOF
+if ($major) {
+    print $out <<EOF;
+#define STREAM_MAJOR $major
+#define STREAM_MINOR $minor
+#define STREAM_PATCHLEVEL $patch
+#define STREAM_DEV "$dev"
+EOF
+}
+if ($hash) {
+    print $out "#define STREAM_COMMIT_HASH \"$hash\"\n";
+}
+if ($date) {
+    print $out "#define STREAM_COMMIT_DATE \"$date\"\n";
+}
+print $out "#endif /* StreamVersion_h */\n";
+close $out

streamApp/Makefile

@@ -21,16 +21,8 @@
 # along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 #########################################################################/
 
-TOP = ../..
+TOP= ..
-ifneq ($(wildcard ../../configure),)
+include $(TOP)/configure/CONFIG
-  include $(TOP)/configure/CONFIG
-else ifneq ($(wildcard ../../config),)
-  include $(TOP)/config/CONFIG_APP
-  include $(TOP)/config/RULES_ARCHS
-else
-  TOP= ..
-  include $(TOP)/configure/CONFIG
-endif
 
 PROD = streamApp
 DBD  = streamApp.dbd
@@ -68,6 +60,10 @@ PROD_LIBS += sscan
 endif
 endif
 
+ifneq ($(words $(SNCSEQ) $(SYNAPPS)), 0)
+PROD_LIBS += seq pv
+endif
+
 streamApp_DBD += stream.dbd
 
 ifdef PCRE

streamApp/test.db

@@ -22,20 +22,20 @@
 record (stringout, "$(P):cmd")
 {
     field (DTYP, "stream")
-    field (OUT,  "@test.proto command terminal")
+    field (OUT,  "@test.proto command  terminal")
     field (PRIO, "HIGH")
     field (VAL, "")
 }
 record (stringout, "$(P):info")
 {
     field (DTYP, "stream")
-    field (OUT,  "@test.proto info terminal")
+    field (OUT,  "@test.proto info terminal   ")
     field (PRIO, "HIGH")
 }
 record (stringout, "$(P):request")
 {
     field (DTYP, "stream")
-    field (OUT,  "@test.proto request($(P):reply.VAL) terminal")
+    field (OUT,  "@test.proto request ($(P):reply.VAL) terminal")
     field (PRIO, "HIGH")
 }
 record (stringin, "$(P):reply")
@@ -44,7 +44,7 @@ record (stringin, "$(P):reply")
 record (stringout, "$(P):checksum")
 {
     field (DTYP, "stream")
-    field (OUT,  "@test.proto checksum($(CHKSUM=sum)) terminal")
+    field (OUT,  "@test.proto checksum     ($(CHKSUM=sum))   terminal")
 }
 record (stringin, "$(P):spy")
 {