Compare commits
29 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a34bb7d2b2 | ||
|
|
94fdfbe802 | ||
|
|
4cad610601 | ||
|
|
25a60b8490 | ||
|
|
953b2960da | ||
|
|
a8bee0552d | ||
|
|
c8b0894cb6 | ||
|
|
47d3f0c0f3 | ||
|
|
1d430e1bfd | ||
|
|
12fca1961f | ||
|
|
ee803fc38d | ||
|
|
0b589770bf | ||
|
|
f92c1e716e | ||
|
|
f5047a9e11 | ||
|
|
eb471d9539 | ||
|
|
e3dace9ee3 | ||
|
|
660c1c6773 | ||
|
|
b0ab3bf333 | ||
|
|
17ce951e99 | ||
|
|
7ae7054196 | ||
|
|
aee11f266b | ||
|
|
94744c9a8f | ||
|
|
741a293029 | ||
|
|
aa8f35f086 | ||
|
|
82685b0280 | ||
|
|
a39346bc78 | ||
|
|
5d76e1ff07 | ||
|
|
c721b7ac32 | ||
|
|
8233b9f81b |
5
.gitignore
vendored
5
.gitignore
vendored
@@ -1,5 +1,10 @@
|
||||
/QtC-*
|
||||
|
||||
*.orig
|
||||
*.log
|
||||
.*.swp
|
||||
*.autosave
|
||||
|
||||
/.idea/
|
||||
*.py[cod]
|
||||
__pycache__/
|
||||
11
.travis.yml
11
.travis.yml
@@ -74,7 +74,8 @@ jobs:
|
||||
|
||||
- env: SET=test01
|
||||
|
||||
- env: SET=test01
|
||||
# On the side: test ADD_MODULES
|
||||
- env: SET=test01 ADD_MODULES=ipac
|
||||
compiler: clang
|
||||
|
||||
- env: VV="" SET=test01
|
||||
@@ -111,9 +112,9 @@ jobs:
|
||||
# Cross-compilation to RTEMS
|
||||
# (needs EPICS Base >= 3.16.2)
|
||||
|
||||
- env: SET=test01 RTEMS=4.10 TEST=NO
|
||||
- env: SET=test01 RTEMS=4.10
|
||||
|
||||
- env: SET=test01 RTEMS=4.9 TEST=NO
|
||||
- env: SET=test01 RTEMS=4.9
|
||||
|
||||
# Other gcc versions (adding as an extra package)
|
||||
|
||||
@@ -149,10 +150,10 @@ jobs:
|
||||
# Cross-compilation to RTEMS
|
||||
# (needs EPICS Base >= 3.16.2)
|
||||
|
||||
- env: BASE=R3.16.2 SET=test01 RTEMS=4.10 TEST=NO
|
||||
- env: BASE=R3.16.2 SET=test01 RTEMS=4.10
|
||||
dist: trusty
|
||||
|
||||
- env: BASE=R3.16.2 SET=test01 RTEMS=4.9 TEST=NO
|
||||
- env: BASE=R3.16.2 SET=test01 RTEMS=4.9
|
||||
dist: trusty
|
||||
|
||||
# SNCSEQ 2.2.7 fails to build on MacOS; currently needs master
|
||||
|
||||
101
README.md
101
README.md
@@ -1,4 +1,5 @@
|
||||
<a target="_blank" href="http://semver.org">![Version][badge.version]</a>
|
||||
<a target="_blank" href="https://travis-ci.org/epics-base/ci-scripts">![Travis status][badge.travis]</a>
|
||||
|
||||
# Continuous Integration Scripts for EPICS Modules
|
||||
|
||||
@@ -8,10 +9,10 @@ software modules, e.g. Device or Driver Support modules.
|
||||
|
||||
By including this repository as a Git Submodule, you will be able to
|
||||
use the same flexible, powerful CI setup that EPICS Bases uses,
|
||||
including a mechanism to specify sets of dependent modules
|
||||
including a way to specify sets of dependent modules
|
||||
(with versions) that you want to compile your module against.
|
||||
|
||||
By using the submodule mechnism, your module will always use an
|
||||
By using the submodule mechanism, your module will always use an
|
||||
explicit commit, i.e. a fixed version of the scripts.
|
||||
This ensures that any further development of the ci-scripts will
|
||||
never break existing use.
|
||||
@@ -54,20 +55,21 @@ example.
|
||||
- Cross-compile for RTEMS 4.9 and 4.10 (Base >= 3.16.2)
|
||||
- Compile on MacOS
|
||||
- Built dependencies are cached (for faster builds)
|
||||
|
||||
### How to Use the CI-Scripts
|
||||
|
||||
## How to Use the CI-Scripts
|
||||
|
||||
1. Get an account on a supported CI service provider platform.
|
||||
(e.g. [Travis-CI](https://travis-ci.org/),
|
||||
Appveyor, Azure Pipelines...)
|
||||
AppVeyor, Azure Pipelines...)
|
||||
|
||||
(More details in the specific README of the subdirectory.)
|
||||
|
||||
2. In your Support Module, add this ci-scripts respository
|
||||
2. In your Support Module, add this ci-scripts repository
|
||||
as a Git Submodule (name suggestion: `.ci`).
|
||||
```bash
|
||||
git submodule add https://github.com/epics-base/ci-scripts .ci
|
||||
```
|
||||
$ git submodule add https://github.com/epics-base/ci-scripts .ci
|
||||
```
|
||||
|
||||
3. Create setup files for different sets of dependencies you
|
||||
want to compile against. (See below.)
|
||||
|
||||
@@ -75,13 +77,14 @@ example.
|
||||
```
|
||||
MODULES=sncseq asyn
|
||||
|
||||
BASE=R3.15.6
|
||||
BASE=3.15
|
||||
ASYN=R4-34
|
||||
SNCSEQ=R2-2-7
|
||||
```
|
||||
will compile against the EPICS Base release 3.15.6, the Sequencer
|
||||
will compile against the EPICS Base 3.15 branch, the Sequencer
|
||||
release 2.2.7 and release 4.34 of asyn.
|
||||
(Any settings can be overridden from `.travis.yml`.)
|
||||
(Any settings can be overridden from the specific job configuration
|
||||
in e.g. `.travis.yml`.)
|
||||
|
||||
4. Create a configuration for the CI service by copying one of
|
||||
the examples provided in the service specific subdirectory
|
||||
@@ -108,7 +111,7 @@ latest released versions and one for the development branches.
|
||||
|
||||
## Setup File Syntax
|
||||
|
||||
Setup files are loaded by the bash scripts. They are found by searching
|
||||
Setup files are loaded by the build scripts. They are found by searching
|
||||
the locations in `SETUP_PATH` (space or colon separated list of directories,
|
||||
relative to your module's root directory).
|
||||
|
||||
@@ -117,7 +120,8 @@ Setup files can include other setup files by calling `include <setup>`
|
||||
`SETUP_PATH` is searched for the include.
|
||||
|
||||
Any `VAR=value` setting of a variable is only executed if `VAR` is unset or
|
||||
empty. That way any settings can be overridden by settings in `.travis.yml`.
|
||||
empty. That way any settings can be overridden by settings in the main
|
||||
configuration (e.g., `.travis.yml`).
|
||||
|
||||
Empty lines or lines starting with `#` are ignored.
|
||||
|
||||
@@ -126,6 +130,9 @@ by using their well-known slugs, separated by spaces.
|
||||
EPICS Base (slug: `base`) will always be a dependency and will be added and
|
||||
compiled first. The other dependencies are added and compiled in the order
|
||||
they are defined in `MODULES`.
|
||||
Modules needed only for specific jobs (e.g., on specific architectures)
|
||||
can be added in the main configuration file by setting `ADD_MODULES`
|
||||
for the specific job(s).
|
||||
|
||||
`REPOOWNER=<name>` sets the default GitHub owner (or organization) for all
|
||||
dependency modules. Useful if you want to compile against a complete set
|
||||
@@ -175,13 +182,64 @@ Feel free to suggest more default settings using a Pull Request.
|
||||
|
||||
## Debugging
|
||||
|
||||
Setting `VV=1` in your `.travis.yml` configuration for a specific job
|
||||
will run the job with high verbosity, printing every command as it is being
|
||||
executed and switching the dependency builds to higher verbosity.
|
||||
Setting `VV=1` in your service configuration (e.g., `.travis.yml`) for a
|
||||
specific job will run the job with high verbosity,
|
||||
printing every command as it is being executed and switching the dependency
|
||||
builds to higher verbosity.
|
||||
|
||||
For local debugging, you may set `CACHEDIR` to change the location for the
|
||||
dependency builds. [default is `$HOME/.cache`]
|
||||
|
||||
## References: EPICS Modules Using ci-scripts
|
||||
|
||||
EPICS Base: [pvData](https://github.com/epics-base/pvDataCPP),
|
||||
[pvAccess](https://github.com/epics-base/pvAccessCPP),
|
||||
[pva2pva](https://github.com/epics-base/pva2pva)
|
||||
|
||||
EPICS Modules: [PCAS](https://github.com/epics-modules/pcas),
|
||||
[ASYN](https://github.com/epics-modules/asyn)
|
||||
|
||||
ESS: [Motor driver (model 3) for EtherCAT Motion Controller][ref.ethercatmc]
|
||||
|
||||
ITER: [OPC UA Device Support](https://github.com/ralphlange/opcua)
|
||||
|
||||
## Frequently Asked Questions
|
||||
|
||||
**How can I see what the dependency building jobs are actually doing?**
|
||||
|
||||
Set `VV=1` in the configuration line of the job you are interested in.
|
||||
This will make all builds (not just for your module) verbose.
|
||||
|
||||
**How do I update my module to use a newer release of ci-scripts?**
|
||||
|
||||
Update the submodule in `.ci` first, then change your CI configuration
|
||||
(if needed) and commit both to your module. E.g., to update your Travis
|
||||
setup to release 2.1.0 of ci-scripts:
|
||||
```bash
|
||||
cd .ci
|
||||
git pull origin v2.1.0
|
||||
cd -
|
||||
git add .ci
|
||||
# if needed:
|
||||
edit .travis.yml
|
||||
git add .travis.yml
|
||||
git commit -m "Update ci-scripts submodule to v2.1.0"
|
||||
```
|
||||
|
||||
Check the example configuration files inside ci-scripts (and their
|
||||
changes) to see what might be needed and/or interesting to change
|
||||
in your configuration.
|
||||
|
||||
**Why does running the scripts locally on my MacOS machine fail?**
|
||||
|
||||
The ci-scripts for Travis-CI require Bash version 4.
|
||||
As Apple ships an older Bash for [political reasons][reddit.bash],
|
||||
you need to install a more recent Bash, e.g. using MacPorts
|
||||
or Homebrew.
|
||||
|
||||
## Release Numbering of this Module
|
||||
|
||||
The module uses [Semantic Versioning](https://semver.org/).
|
||||
The module tries to apply [Semantic Versioning](https://semver.org/).
|
||||
|
||||
Major release numbers refer to the API, which is more or less defined
|
||||
by the full configuration examples in the service specific
|
||||
@@ -195,7 +253,7 @@ require the configuration inside an existing user module to be changed.
|
||||
|
||||
Again: using the git submodule mechanism to include these scripts means
|
||||
that user modules always work with a fixed, frozen version.
|
||||
I.e., developments in the ci-scripts repository will never break an\
|
||||
I.e., developments in the ci-scripts repository will never break an
|
||||
existing application.
|
||||
These release numbering considerations are just a hint to assess the
|
||||
risks when updating the submodule.
|
||||
@@ -206,4 +264,9 @@ This module is distributed subject to a Software License Agreement found
|
||||
in file LICENSE that is included with this distribution.
|
||||
|
||||
<!-- Links -->
|
||||
[badge.version]: https://badge.fury.io/gh/epics-base%2Fci-scripts.png
|
||||
[badge.version]: https://badge.fury.io/gh/epics-base%2Fci-scripts.svg
|
||||
[badge.travis]: https://travis-ci.org/epics-base/ci-scripts.svg?branch=master
|
||||
|
||||
[reddit.bash]: https://www.reddit.com/r/bash/comments/393oqv/why_is_the_version_of_bash_included_in_os_x_so_old/
|
||||
|
||||
[ref.ethercatmc]: https://github.com/EuropeanSpallationSource/m-epics-ethercatmc
|
||||
|
||||
817
add-msi-to-314.patch
Normal file
817
add-msi-to-314.patch
Normal file
@@ -0,0 +1,817 @@
|
||||
diff -ruN ../3.14/src/dbtools/Makefile ./src/dbtools/Makefile
|
||||
--- ../3.14/src/dbtools/Makefile 2017-03-16 21:37:51.278140900 +0100
|
||||
+++ ./src/dbtools/Makefile 2020-04-06 12:40:51.723550846 +0200
|
||||
@@ -11,6 +11,11 @@
|
||||
|
||||
include $(TOP)/configure/CONFIG
|
||||
|
||||
+PROD_HOST += msi
|
||||
+
|
||||
+msi_SRCS = msi.c
|
||||
+msi_LIBS += Com
|
||||
+
|
||||
INC += dbLoadTemplate.h
|
||||
INC += dbtoolsIocRegister.h
|
||||
|
||||
diff -ruN ../3.14/src/dbtools/msi.c ./src/dbtools/msi.c
|
||||
--- ../3.14/src/dbtools/msi.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ ./src/dbtools/msi.c 2013-05-13 19:00:43.000000000 +0200
|
||||
@@ -0,0 +1,798 @@
|
||||
+/*************************************************************************\
|
||||
+* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
|
||||
+* National Laboratory.
|
||||
+* Copyright (c) 2002 The Regents of the University of California, as
|
||||
+* Operator of Los Alamos National Laboratory.
|
||||
+* This file is distributed subject to a Software License Agreement found
|
||||
+* in the file LICENSE that is included with this distribution.
|
||||
+\*************************************************************************/
|
||||
+/*msi - macro sunstitutions and include */
|
||||
+
|
||||
+/*
|
||||
+ * Modification Log:
|
||||
+ * -----------------
|
||||
+ * .01 08DEC97 mrk Original version
|
||||
+ */
|
||||
+
|
||||
+#include <stdlib.h>
|
||||
+#include <stddef.h>
|
||||
+#include <stdio.h>
|
||||
+#include <string.h>
|
||||
+#include <ctype.h>
|
||||
+#include <errno.h>
|
||||
+
|
||||
+#include <epicsVersion.h>
|
||||
+#include <dbDefs.h>
|
||||
+#include <macLib.h>
|
||||
+#include <ellLib.h>
|
||||
+#include <errlog.h>
|
||||
+
|
||||
+#define MAX_BUFFER_SIZE 4096
|
||||
+
|
||||
+#if ((EPICS_VERSION <= 3) && (EPICS_REVISION <= 13))
|
||||
+#define macEnvExpand(x) strdup(x)
|
||||
+#endif
|
||||
+
|
||||
+/*Forward references to local routines*/
|
||||
+static void usageExit(void);
|
||||
+static void addMacroReplacements(MAC_HANDLE *macPvt,char *pval);
|
||||
+static void makeSubstitutions(void *inputPvt,void *macPvt,char *templateName);
|
||||
+
|
||||
+/*Routines that read the template files */
|
||||
+static void inputConstruct(void **inputPvt);
|
||||
+static void inputDestruct(void *inputPvt);
|
||||
+static void inputAddPath(void *inputPvt, char *pval);
|
||||
+static void inputBegin(void *inputPvt,char *fileName);
|
||||
+static char *inputNextLine(void *inputPvt);
|
||||
+static void inputNewIncludeFile(void *inputPvt,char *name);
|
||||
+static void inputErrPrint(void *inputPvt);
|
||||
+
|
||||
+/*Routines that read the substitution file */
|
||||
+static void substituteDestruct(void *substitutePvt);
|
||||
+static void substituteOpen(void **substitutePvt,char *substitutionName);
|
||||
+static int substituteGetNextSet(void *substitutePvt,char **filename);
|
||||
+static char *substituteGetReplacements(void *substitutePvt);
|
||||
+
|
||||
+/*Exit status*/
|
||||
+static int exitStatus = 0;
|
||||
+
|
||||
+int opt_V = 0;
|
||||
+
|
||||
+
|
||||
+int main(int argc,char **argv)
|
||||
+{
|
||||
+ void *inputPvt;
|
||||
+ MAC_HANDLE *macPvt;
|
||||
+ char *pval;
|
||||
+ int narg;
|
||||
+ char *substitutionName=0;
|
||||
+ char *templateName=0;
|
||||
+ int i;
|
||||
+
|
||||
+ inputConstruct(&inputPvt);
|
||||
+ macCreateHandle(&macPvt,0);
|
||||
+ macSuppressWarning(macPvt,1);
|
||||
+ while((argc>1) && (argv[1][0] == '-')) {
|
||||
+ narg = (strlen(argv[1])==2) ? 2 : 1;
|
||||
+ pval = (narg==1) ? (argv[1]+2) : argv[2];
|
||||
+ if(strncmp(argv[1],"-I",2)==0) {
|
||||
+ inputAddPath(inputPvt,pval);
|
||||
+ } else if(strncmp(argv[1],"-o",2)==0) {
|
||||
+ if(freopen(pval,"w",stdout)==NULL) {
|
||||
+ fprintf(stderr,"Can't open %s for writing: %s\n", pval, strerror(errno));
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ } else if(strncmp(argv[1],"-M",2)==0) {
|
||||
+ addMacroReplacements(macPvt,pval);
|
||||
+ } else if(strncmp(argv[1],"-S",2)==0) {
|
||||
+ substitutionName = calloc(strlen(pval)+1,sizeof(char));
|
||||
+ strcpy(substitutionName,pval);
|
||||
+ } else if(strncmp(argv[1],"-V",2)==0) {
|
||||
+ macSuppressWarning(macPvt,0);
|
||||
+ opt_V = 1;
|
||||
+ narg = 1; /* no argument for this option */
|
||||
+ } else {
|
||||
+ usageExit();
|
||||
+ }
|
||||
+ argc -= narg;
|
||||
+ for(i=1; i<argc; i++) argv[i] = argv[i + narg];
|
||||
+ }
|
||||
+ if(argc>2) {
|
||||
+ fprintf(stderr,"too many filename arguments\n");
|
||||
+ usageExit();
|
||||
+ }
|
||||
+ if(argc==2) {
|
||||
+ templateName = calloc(strlen(argv[1])+1,sizeof(char));
|
||||
+ strcpy(templateName,argv[1]);
|
||||
+ }
|
||||
+ if(!substitutionName) {
|
||||
+ makeSubstitutions(inputPvt,macPvt,templateName);
|
||||
+ } else {
|
||||
+ void *substitutePvt;
|
||||
+ char *filename = 0;
|
||||
+
|
||||
+ substituteOpen(&substitutePvt,substitutionName);
|
||||
+ while(substituteGetNextSet(substitutePvt,&filename)) {
|
||||
+ if(templateName) filename = templateName;
|
||||
+ if(!filename) {
|
||||
+ fprintf(stderr,"no template file\n");
|
||||
+ usageExit();
|
||||
+ }
|
||||
+ macPushScope(macPvt);
|
||||
+ while((pval = substituteGetReplacements(substitutePvt))){
|
||||
+ addMacroReplacements(macPvt,pval);
|
||||
+ makeSubstitutions(inputPvt,macPvt,filename);
|
||||
+ }
|
||||
+ macPopScope(macPvt);
|
||||
+ }
|
||||
+ substituteDestruct(substitutePvt);
|
||||
+ }
|
||||
+ errlogFlush();
|
||||
+ inputDestruct(inputPvt);
|
||||
+ free((void *)templateName);
|
||||
+ free((void *)substitutionName);
|
||||
+ return(exitStatus);
|
||||
+}
|
||||
+
|
||||
+void usageExit(void)
|
||||
+{
|
||||
+ fprintf(stderr,"usage: msi -V -opath -Ipath ... -Msub ... -Ssubfile template\n");
|
||||
+ fprintf(stderr," Specifying path will replace the default '.'\n");
|
||||
+ fprintf(stderr," stdin is used if template is not given\n");
|
||||
+ exit(1);
|
||||
+}
|
||||
+
|
||||
+static void addMacroReplacements(MAC_HANDLE *macPvt,char *pval)
|
||||
+{
|
||||
+ char **pairs;
|
||||
+ long status;
|
||||
+
|
||||
+ status = macParseDefns(macPvt,pval,&pairs);
|
||||
+ if(!status) {
|
||||
+ fprintf(stderr,"Error macParseDefns error\n");
|
||||
+ usageExit();
|
||||
+ }
|
||||
+ status = macInstallMacros(macPvt,pairs);
|
||||
+ if(!status) {
|
||||
+ fprintf(stderr,"Error macInstallMacros error\n");
|
||||
+ usageExit();
|
||||
+ }
|
||||
+ free((void *)pairs);
|
||||
+}
|
||||
+
|
||||
+typedef enum {cmdInclude,cmdSubstitute} cmdType;
|
||||
+static const char *cmdNames[] = {"include","substitute"};
|
||||
+static void makeSubstitutions(void *inputPvt,void *macPvt,char *templateName)
|
||||
+{
|
||||
+ char *input;
|
||||
+ static char buffer[MAX_BUFFER_SIZE];
|
||||
+ int n;
|
||||
+ static int unexpWarned = 0;
|
||||
+
|
||||
+ inputBegin(inputPvt,templateName);
|
||||
+ while((input = inputNextLine(inputPvt))) {
|
||||
+ int expand=1;
|
||||
+ char *p;
|
||||
+ char *command = 0;
|
||||
+
|
||||
+ p = input;
|
||||
+ /*skip whitespace at beginning of line*/
|
||||
+ while(*p && (isspace(*p))) ++p;
|
||||
+ /*Look for i or s */
|
||||
+ if(*p && (*p=='i' || *p=='s')) command = p;
|
||||
+ if(command) {
|
||||
+ char *pstart;
|
||||
+ char *pend;
|
||||
+ char *copy;
|
||||
+ int cmdind=-1;
|
||||
+ int i;
|
||||
+
|
||||
+ for(i=0; i< NELEMENTS(cmdNames); i++) {
|
||||
+ if(strstr(command,cmdNames[i])) {
|
||||
+ cmdind = i;
|
||||
+ }
|
||||
+ }
|
||||
+ if(cmdind<0) goto endif;
|
||||
+ p = command + strlen(cmdNames[cmdind]);
|
||||
+ /*skip whitespace after command*/
|
||||
+ while(*p && (isspace(*p))) ++p;
|
||||
+ /*Next character must be quote*/
|
||||
+ if((*p==0) || (*p!='"')) goto endif;
|
||||
+ pstart = ++p;
|
||||
+ /*Look for end quote*/
|
||||
+ while(*p && (*p!='"')) {
|
||||
+ /*allow escape for imbeded quote*/
|
||||
+ if((*p=='\\') && *(p+1)=='"') {
|
||||
+ p += 2; continue;
|
||||
+ } else {
|
||||
+ if(*p=='"') break;
|
||||
+ }
|
||||
+ ++p;
|
||||
+ }
|
||||
+ pend = p;
|
||||
+ if(*p==0) goto endif;
|
||||
+ /*skip quote and any trailing blanks*/
|
||||
+ while(*++p==' ') ;
|
||||
+ if(*p != '\n' && *p !=0) goto endif;
|
||||
+ copy = calloc(pend-pstart+1,sizeof(char));
|
||||
+ strncpy(copy,pstart,pend-pstart);
|
||||
+ switch(cmdind) {
|
||||
+ case cmdInclude:
|
||||
+ inputNewIncludeFile(inputPvt,copy);
|
||||
+ break;
|
||||
+ case cmdSubstitute:
|
||||
+ addMacroReplacements(macPvt,copy);
|
||||
+ break;
|
||||
+ default:
|
||||
+ fprintf(stderr,"Logic Error: makeSubstitutions\n");
|
||||
+ inputErrPrint(inputPvt);
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ free(copy);
|
||||
+ expand = 0;
|
||||
+ }
|
||||
+endif:
|
||||
+ if (expand) {
|
||||
+ n = macExpandString(macPvt,input,buffer,MAX_BUFFER_SIZE-1);
|
||||
+ fputs(buffer,stdout);
|
||||
+ if (!unexpWarned && n<0) {
|
||||
+ const char * pErrMsg = "Warning: Undefined macros present, use msi -V to list\n";
|
||||
+ if ( opt_V ) {
|
||||
+ exitStatus = 2;
|
||||
+ pErrMsg = "Error: Undefined macros present\n";
|
||||
+ }
|
||||
+ fprintf( stderr, pErrMsg );
|
||||
+ unexpWarned++;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+typedef struct inputFile{
|
||||
+ ELLNODE node;
|
||||
+ char *filename;
|
||||
+ FILE *fp;
|
||||
+ int lineNum;
|
||||
+}inputFile;
|
||||
+
|
||||
+typedef struct pathNode {
|
||||
+ ELLNODE node;
|
||||
+ char *directory;
|
||||
+} pathNode;
|
||||
+
|
||||
+typedef struct inputData {
|
||||
+ ELLLIST inputFileList;
|
||||
+ ELLLIST pathList;
|
||||
+ char inputBuffer[MAX_BUFFER_SIZE];
|
||||
+}inputData;
|
||||
+
|
||||
+static void inputOpenFile(inputData *pinputData,char *filename);
|
||||
+static void inputCloseFile(inputData *pinputData);
|
||||
+static void inputCloseAllFiles(inputData *pinputData);
|
||||
+
|
||||
+static void inputConstruct(void **ppvt)
|
||||
+{
|
||||
+ inputData *pinputData;
|
||||
+
|
||||
+ pinputData = calloc(1,sizeof(inputData));
|
||||
+ ellInit(&pinputData->inputFileList);
|
||||
+ ellInit(&pinputData->pathList);
|
||||
+ *ppvt = pinputData;
|
||||
+}
|
||||
+
|
||||
+static void inputDestruct(void *pvt)
|
||||
+{
|
||||
+ inputData *pinputData = (inputData *)pvt;
|
||||
+ pathNode *ppathNode;
|
||||
+
|
||||
+ inputCloseAllFiles(pinputData);
|
||||
+ while((ppathNode = (pathNode *)ellFirst(&pinputData->pathList))) {
|
||||
+ ellDelete(&pinputData->pathList,&ppathNode->node);
|
||||
+ free((void *)ppathNode->directory);
|
||||
+ free((void *)ppathNode);
|
||||
+ }
|
||||
+ free(pvt);
|
||||
+}
|
||||
+
|
||||
+static void inputAddPath(void *pvt, char *path)
|
||||
+{
|
||||
+ inputData *pinputData = (inputData *)pvt;
|
||||
+ ELLLIST *ppathList = &pinputData->pathList;
|
||||
+ pathNode *ppathNode;
|
||||
+ const char *pcolon;
|
||||
+ const char *pdir;
|
||||
+ int len;
|
||||
+ int emptyName;
|
||||
+
|
||||
+ pdir = path;
|
||||
+ /*an empty name at beginning, middle, or end means current directory*/
|
||||
+ while(pdir && *pdir) {
|
||||
+ emptyName = ((*pdir == ':') ? 1 : 0);
|
||||
+ if(emptyName) ++pdir;
|
||||
+ ppathNode = (pathNode *)calloc(1,sizeof(pathNode));
|
||||
+ ellAdd(ppathList,&ppathNode->node);
|
||||
+ if(!emptyName) {
|
||||
+ pcolon = strchr(pdir,':');
|
||||
+ len = (pcolon ? (pcolon - pdir) : strlen(pdir));
|
||||
+ if(len>0) {
|
||||
+ ppathNode->directory = (char *)calloc(len+1,sizeof(char));
|
||||
+ strncpy(ppathNode->directory,pdir,len);
|
||||
+ pdir = pcolon;
|
||||
+ /*unless at end skip past first colon*/
|
||||
+ if(pdir && *(pdir+1)!=0) ++pdir;
|
||||
+ } else { /*must have been trailing : */
|
||||
+ emptyName=1;
|
||||
+ }
|
||||
+ }
|
||||
+ if(emptyName) {
|
||||
+ ppathNode->directory = (char *)calloc(2,sizeof(char));
|
||||
+ strcpy(ppathNode->directory,".");
|
||||
+ }
|
||||
+ }
|
||||
+ return;
|
||||
+}
|
||||
+
|
||||
+static void inputBegin(void *pvt,char *fileName)
|
||||
+{
|
||||
+ inputData *pinputData = (inputData *)pvt;
|
||||
+
|
||||
+ inputCloseAllFiles(pinputData);
|
||||
+ inputOpenFile(pinputData,fileName);
|
||||
+}
|
||||
+
|
||||
+static char *inputNextLine(void *pvt)
|
||||
+{
|
||||
+ inputData *pinputData = (inputData *)pvt;
|
||||
+ inputFile *pinputFile;
|
||||
+ char *pline;
|
||||
+
|
||||
+ while((pinputFile = (inputFile *)ellFirst(&pinputData->inputFileList))) {
|
||||
+ pline = fgets(pinputData->inputBuffer,MAX_BUFFER_SIZE,pinputFile->fp);
|
||||
+ if(pline) {
|
||||
+ ++pinputFile->lineNum;
|
||||
+ return(pline);
|
||||
+ }
|
||||
+ inputCloseFile(pinputData);
|
||||
+ }
|
||||
+ return(0);
|
||||
+}
|
||||
+
|
||||
+static void inputNewIncludeFile(void *pvt,char *name)
|
||||
+{
|
||||
+ inputData *pinputData = (inputData *)pvt;
|
||||
+
|
||||
+ inputOpenFile(pinputData,name);
|
||||
+}
|
||||
+
|
||||
+static void inputErrPrint(void *pvt)
|
||||
+{
|
||||
+ inputData *pinputData = (inputData *)pvt;
|
||||
+ inputFile *pinputFile;
|
||||
+
|
||||
+ fprintf(stderr,"input: %s which is ",pinputData->inputBuffer);
|
||||
+ pinputFile = (inputFile *)ellFirst(&pinputData->inputFileList);
|
||||
+ while(pinputFile) {
|
||||
+ fprintf(stderr,"line %d of ",pinputFile->lineNum);
|
||||
+ if(pinputFile->filename) {
|
||||
+ fprintf(stderr," file %s\n",pinputFile->filename);
|
||||
+ } else {
|
||||
+ fprintf(stderr,"stdin:\n");
|
||||
+ }
|
||||
+ pinputFile = (inputFile *)ellNext(&pinputFile->node);
|
||||
+ if(pinputFile) {
|
||||
+ fprintf(stderr," which is included from ");
|
||||
+ } else {
|
||||
+ fprintf(stderr,"\n");
|
||||
+ }
|
||||
+ }
|
||||
+ fprintf(stderr,"\n");
|
||||
+}
|
||||
+
|
||||
+static void inputOpenFile(inputData *pinputData,char *filename)
|
||||
+{
|
||||
+ ELLLIST *ppathList = &pinputData->pathList;
|
||||
+ pathNode *ppathNode = 0;
|
||||
+ inputFile *pinputFile;
|
||||
+ char *fullname = 0;
|
||||
+ FILE *fp = 0;
|
||||
+
|
||||
+ if(!filename) {
|
||||
+ fp = stdin;
|
||||
+ } else if((ellCount(ppathList)==0) || strchr(filename,'/')){
|
||||
+ fp = fopen(filename,"r");
|
||||
+ } else {
|
||||
+ ppathNode = (pathNode *)ellFirst(ppathList);
|
||||
+ while(ppathNode) {
|
||||
+ fullname = calloc(strlen(filename)+strlen(ppathNode->directory) +2,
|
||||
+ sizeof(char));
|
||||
+ strcpy(fullname,ppathNode->directory);
|
||||
+ strcat(fullname,"/");
|
||||
+ strcat(fullname,filename);
|
||||
+ fp = fopen(fullname,"r");
|
||||
+ if(fp) break;
|
||||
+ free((void *)fullname);
|
||||
+ ppathNode = (pathNode *)ellNext(&ppathNode->node);
|
||||
+ }
|
||||
+ }
|
||||
+ if(!fp) {
|
||||
+ fprintf(stderr,"Could not open %s\n",filename);
|
||||
+ inputErrPrint((void *)pinputData);
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ pinputFile = calloc(1,sizeof(inputFile));
|
||||
+ if(ppathNode) {
|
||||
+ pinputFile->filename = calloc(1,strlen(fullname)+1);
|
||||
+ strcpy(pinputFile->filename,fullname);
|
||||
+ free((void *)fullname);
|
||||
+ } else if(filename) {
|
||||
+ pinputFile->filename = calloc(1,strlen(filename)+1);
|
||||
+ strcpy(pinputFile->filename,filename);
|
||||
+ } else {
|
||||
+ pinputFile->filename = calloc(1,strlen("stdin")+1);
|
||||
+ strcpy(pinputFile->filename,"stdin");
|
||||
+ }
|
||||
+ pinputFile->fp = fp;
|
||||
+ ellInsert(&pinputData->inputFileList,0,&pinputFile->node);
|
||||
+}
|
||||
+
|
||||
+static void inputCloseFile(inputData *pinputData)
|
||||
+{
|
||||
+ inputFile *pinputFile;
|
||||
+
|
||||
+ pinputFile = (inputFile *)ellFirst(&pinputData->inputFileList);
|
||||
+ if(!pinputFile) return;
|
||||
+ ellDelete(&pinputData->inputFileList,&pinputFile->node);
|
||||
+ if(fclose(pinputFile->fp))
|
||||
+ fprintf(stderr,"fclose failed: file %s\n",pinputFile->filename);
|
||||
+ free(pinputFile->filename);
|
||||
+ free(pinputFile);
|
||||
+}
|
||||
+
|
||||
+static void inputCloseAllFiles(inputData *pinputData)
|
||||
+{
|
||||
+ inputFile *pinputFile;
|
||||
+
|
||||
+ while((pinputFile=(inputFile *)ellFirst(&pinputData->inputFileList))){
|
||||
+ inputCloseFile(pinputData);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+/*start of code that handles substitution file*/
|
||||
+typedef enum {
|
||||
+ tokenLBrace,tokenRBrace,tokenSeparater,tokenString,tokenEOF
|
||||
+}tokenType;
|
||||
+
|
||||
+typedef struct subFile {
|
||||
+ char *substitutionName;
|
||||
+ FILE *fp;
|
||||
+ int lineNum;
|
||||
+ char inputBuffer[MAX_BUFFER_SIZE];
|
||||
+ char *pnextChar;
|
||||
+ tokenType token;
|
||||
+ char string[MAX_BUFFER_SIZE];
|
||||
+} subFile;
|
||||
+
|
||||
+typedef struct patternNode {
|
||||
+ ELLNODE node;
|
||||
+ char *var;
|
||||
+}patternNode;
|
||||
+
|
||||
+typedef struct subInfo {
|
||||
+ subFile *psubFile;
|
||||
+ int isFile;
|
||||
+ char *filename;
|
||||
+ int isPattern;
|
||||
+ ELLLIST patternList;
|
||||
+ size_t size;
|
||||
+ size_t curLength;
|
||||
+ char *macroReplacements;
|
||||
+}subInfo;
|
||||
+
|
||||
+static char *subGetNextLine(subFile *psubFile);
|
||||
+static tokenType subGetNextToken(subFile *psubFile);
|
||||
+static void subFileErrPrint(subFile *psubFile,char * message);
|
||||
+static void freeSubFile(subInfo *psubInfo);
|
||||
+static void freePattern(subInfo *psubInfo);
|
||||
+static void catMacroReplacements(subInfo *psubInfo,const char *value);
|
||||
+
|
||||
+void freeSubFile(subInfo *psubInfo)
|
||||
+{
|
||||
+ subFile *psubFile = psubInfo->psubFile;
|
||||
+ if(psubFile->fp) {
|
||||
+ if(fclose(psubFile->fp))
|
||||
+ fprintf(stderr,"fclose failed on substitution file\n");
|
||||
+ }
|
||||
+ free((void *)psubFile);
|
||||
+ free((void *)psubInfo->filename);
|
||||
+ psubInfo->psubFile = 0;
|
||||
+}
|
||||
+
|
||||
+void freePattern(subInfo *psubInfo)
|
||||
+{
|
||||
+ patternNode *ppatternNode;
|
||||
+ while((ppatternNode = (patternNode *)ellFirst(&psubInfo->patternList))) {
|
||||
+ ellDelete(&psubInfo->patternList,&ppatternNode->node);
|
||||
+ free(ppatternNode->var);
|
||||
+ free(ppatternNode);
|
||||
+ }
|
||||
+ psubInfo->isPattern = 0;
|
||||
+}
|
||||
+
|
||||
+static void substituteDestruct(void *pvt)
|
||||
+{
|
||||
+ subInfo *psubInfo = (subInfo *)pvt;
|
||||
+
|
||||
+ freeSubFile(psubInfo);
|
||||
+ freePattern(psubInfo);
|
||||
+ free((void *)psubInfo);
|
||||
+ return;
|
||||
+}
|
||||
+
|
||||
+static void substituteOpen(void **ppvt,char *substitutionName)
|
||||
+{
|
||||
+ subInfo *psubInfo;
|
||||
+ subFile *psubFile;
|
||||
+ FILE *fp;
|
||||
+
|
||||
+ psubInfo = calloc(1,sizeof(subInfo));
|
||||
+ *ppvt = (void *)psubInfo;
|
||||
+ psubFile = calloc(1,sizeof(subFile));
|
||||
+ psubInfo->psubFile = psubFile;
|
||||
+ ellInit(&psubInfo->patternList);
|
||||
+ fp = fopen(substitutionName,"r");
|
||||
+ if(!fp) {
|
||||
+ fprintf(stderr,"Could not open %s\n",substitutionName);
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ psubFile->substitutionName = substitutionName;
|
||||
+ psubFile->fp = fp;
|
||||
+ psubFile->lineNum = 0;
|
||||
+ psubFile->inputBuffer[0] = 0;
|
||||
+ psubFile->pnextChar = &psubFile->inputBuffer[0];
|
||||
+ subGetNextToken(psubFile);
|
||||
+ return;
|
||||
+}
|
||||
+
|
||||
+static int substituteGetNextSet(void *pvt,char **filename)
|
||||
+{
|
||||
+ subInfo *psubInfo = (subInfo *)pvt;
|
||||
+ subFile *psubFile = psubInfo->psubFile;
|
||||
+ patternNode *ppatternNode;
|
||||
+
|
||||
+ *filename = 0;
|
||||
+ while(psubFile->token==tokenSeparater) subGetNextToken(psubFile);
|
||||
+ if(psubFile->token==tokenEOF) return(0);
|
||||
+ if(psubFile->token==tokenString && strcmp(psubFile->string,"file")==0) {
|
||||
+ psubInfo->isFile = 1;
|
||||
+ if(subGetNextToken(psubFile)!=tokenString) {
|
||||
+ subFileErrPrint(psubFile,"Expecting filename");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ freePattern(psubInfo);
|
||||
+ free((void *)psubInfo->filename);
|
||||
+ if(psubFile->string[0]=='"'&&psubFile->string[strlen(psubFile->string)-1]=='"') {
|
||||
+ psubFile->string[strlen(psubFile->string)-1]='\0';
|
||||
+ psubInfo->filename = macEnvExpand(psubFile->string+1);
|
||||
+ }
|
||||
+ else {
|
||||
+ psubInfo->filename = macEnvExpand(psubFile->string);
|
||||
+ }
|
||||
+ while(subGetNextToken(psubFile)==tokenSeparater);
|
||||
+ if(psubFile->token!=tokenLBrace) {
|
||||
+ subFileErrPrint(psubFile,"Expecting {");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ subGetNextToken(psubFile);
|
||||
+ }
|
||||
+ *filename = psubInfo->filename;
|
||||
+ while(psubFile->token==tokenSeparater) subGetNextToken(psubFile);
|
||||
+ if(psubFile->token==tokenLBrace) return(1);
|
||||
+ if(psubFile->token==tokenRBrace) return(0);
|
||||
+ if(psubFile->token!=tokenString
|
||||
+ || strcmp(psubFile->string,"pattern")!=0) {
|
||||
+ subFileErrPrint(psubFile,"Expecting pattern");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ freePattern(psubInfo);
|
||||
+ psubInfo->isPattern = 1;
|
||||
+ while(subGetNextToken(psubFile)==tokenSeparater);
|
||||
+ if(psubFile->token!=tokenLBrace) {
|
||||
+ subFileErrPrint(psubFile,"Expecting {");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ while(1) {
|
||||
+ while(subGetNextToken(psubFile)==tokenSeparater);
|
||||
+ if(psubFile->token!=tokenString) break;
|
||||
+ ppatternNode = calloc(1,sizeof(patternNode));
|
||||
+ ellAdd(&psubInfo->patternList,&ppatternNode->node);
|
||||
+ ppatternNode->var = calloc(strlen(psubFile->string)+1,sizeof(char));
|
||||
+ strcpy(ppatternNode->var,psubFile->string);
|
||||
+ }
|
||||
+ if(psubFile->token!=tokenRBrace) {
|
||||
+ subFileErrPrint(psubFile,"Expecting }");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ subGetNextToken(psubFile);
|
||||
+ return(1);
|
||||
+}
|
||||
+
|
||||
+static char *substituteGetReplacements(void *pvt)
|
||||
+{
|
||||
+ subInfo *psubInfo = (subInfo *)pvt;
|
||||
+ subFile *psubFile = psubInfo->psubFile;
|
||||
+ patternNode *ppatternNode;
|
||||
+
|
||||
+ if(psubInfo->macroReplacements) psubInfo->macroReplacements[0] = 0;
|
||||
+ psubInfo->curLength = 0;
|
||||
+ while(psubFile->token==tokenSeparater) subGetNextToken(psubFile);
|
||||
+ if(psubFile->token==tokenRBrace && psubInfo->isFile) {
|
||||
+ psubInfo->isFile = 0;
|
||||
+ free((void *)psubInfo->filename);
|
||||
+ psubInfo->filename = 0;
|
||||
+ freePattern(psubInfo);
|
||||
+ subGetNextToken(psubFile);
|
||||
+ return(0);
|
||||
+ }
|
||||
+ if(psubFile->token==tokenEOF) return(0);
|
||||
+ if(psubFile->token!=tokenLBrace) return(0);
|
||||
+ if(psubInfo->isPattern) {
|
||||
+ int gotFirstPattern = 0;
|
||||
+
|
||||
+ while(subGetNextToken(psubFile)==tokenSeparater);
|
||||
+ ppatternNode = (patternNode *)ellFirst(&psubInfo->patternList);
|
||||
+ while(1) {
|
||||
+ if(psubFile->token==tokenRBrace) {
|
||||
+ if(ppatternNode)
|
||||
+ subFileErrPrint(psubFile,"less values than patterns");
|
||||
+ subGetNextToken(psubFile);
|
||||
+ return(psubInfo->macroReplacements);
|
||||
+ }
|
||||
+ if(psubFile->token!=tokenString) {
|
||||
+ subFileErrPrint(psubFile,"Illegal token");
|
||||
+ exit(-1);
|
||||
+ }
|
||||
+ if(gotFirstPattern) catMacroReplacements(psubInfo,",");
|
||||
+ gotFirstPattern = 1;
|
||||
+ if(ppatternNode) {
|
||||
+ catMacroReplacements(psubInfo,ppatternNode->var);
|
||||
+ catMacroReplacements(psubInfo,"=");
|
||||
+ catMacroReplacements(psubInfo,psubFile->string);
|
||||
+ ppatternNode = (patternNode *)ellNext(&ppatternNode->node);
|
||||
+ } else {
|
||||
+ subFileErrPrint(psubFile,"more values than patterns");
|
||||
+ }
|
||||
+ while(subGetNextToken(psubFile)==tokenSeparater);
|
||||
+ }
|
||||
+ } else while(1) {
|
||||
+ switch(subGetNextToken(psubFile)) {
|
||||
+ case tokenRBrace:
|
||||
+ subGetNextToken(psubFile);
|
||||
+ return(psubInfo->macroReplacements);
|
||||
+ case tokenSeparater:
|
||||
+ catMacroReplacements(psubInfo,",");
|
||||
+ break;
|
||||
+ case tokenString:
|
||||
+ catMacroReplacements(psubInfo,psubFile->string);
|
||||
+ break;
|
||||
+ default:
|
||||
+ subFileErrPrint(psubFile,"Illegal token");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static char *subGetNextLine(subFile *psubFile)
|
||||
+{
|
||||
+ char *pline;
|
||||
+
|
||||
+ pline = fgets(psubFile->inputBuffer,MAX_BUFFER_SIZE,psubFile->fp);
|
||||
+ ++psubFile->lineNum;
|
||||
+ while(pline && psubFile->inputBuffer[0]=='#') {
|
||||
+ pline = fgets(psubFile->inputBuffer,MAX_BUFFER_SIZE,psubFile->fp);
|
||||
+ ++psubFile->lineNum;
|
||||
+ }
|
||||
+ if(!pline) {
|
||||
+ psubFile->token = tokenEOF;
|
||||
+ psubFile->inputBuffer[0] = 0;
|
||||
+ psubFile->pnextChar = 0;
|
||||
+ return(0);
|
||||
+ }
|
||||
+ psubFile->pnextChar = &psubFile->inputBuffer[0];
|
||||
+ return(&psubFile->inputBuffer[0]);
|
||||
+}
|
||||
+
|
||||
+static void subFileErrPrint(subFile *psubFile,char * message)
|
||||
+{
|
||||
+ fprintf(stderr,"substitution file %s line %d: %s",
|
||||
+ psubFile->substitutionName,
|
||||
+ psubFile->lineNum,psubFile->inputBuffer);
|
||||
+ fprintf(stderr,"%s\n",message);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static tokenType subGetNextToken(subFile *psubFile)
|
||||
+{
|
||||
+ char *p;
|
||||
+ char *pto;
|
||||
+
|
||||
+ p = psubFile->pnextChar;
|
||||
+ if(!p) { psubFile->token = tokenEOF; return(tokenEOF);}
|
||||
+ if(*p==0 || *p=='\n' || *p=='#') {
|
||||
+ p = subGetNextLine(psubFile);
|
||||
+ if(!p) { psubFile->token = tokenEOF; return(tokenEOF);}
|
||||
+ else { psubFile->token = tokenSeparater; return(tokenSeparater);}
|
||||
+ }
|
||||
+ while(isspace(*p)) p++;
|
||||
+ if(*p=='{') {
|
||||
+ psubFile->token = tokenLBrace;
|
||||
+ psubFile->pnextChar = ++p;
|
||||
+ return(tokenLBrace);
|
||||
+ }
|
||||
+ if(*p=='}') {
|
||||
+ psubFile->token = tokenRBrace;
|
||||
+ psubFile->pnextChar = ++p;
|
||||
+ return(tokenRBrace);
|
||||
+ }
|
||||
+ if(*p==0 || isspace(*p) || *p==',') {
|
||||
+ while(isspace(*p) || *p==',') p++;
|
||||
+ psubFile->token = tokenSeparater;
|
||||
+ psubFile->pnextChar = p;
|
||||
+ return(tokenSeparater);
|
||||
+ }
|
||||
+ /*now handle quoted strings*/
|
||||
+ if(*p=='"') {
|
||||
+ pto = &psubFile->string[0];
|
||||
+ *pto++ = *p++;
|
||||
+ while(*p!='"') {
|
||||
+ if(*p==0 || *p=='\n') {
|
||||
+ subFileErrPrint(psubFile,"Strings must be on single line\n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ /*allow escape for imbeded quote*/
|
||||
+ if((*p=='\\') && *(p+1)=='"') {
|
||||
+ *pto++ = *p++;
|
||||
+ *pto++ = *p++;
|
||||
+ continue;
|
||||
+ }
|
||||
+ *pto++ = *p++;
|
||||
+ }
|
||||
+ *pto++ = *p++;
|
||||
+ psubFile->pnextChar = p;
|
||||
+ *pto = 0;
|
||||
+ psubFile->token = tokenString;
|
||||
+ return(tokenString);
|
||||
+ }
|
||||
+ /*Now take anything up to next non String token and not space*/
|
||||
+ pto = &psubFile->string[0];
|
||||
+ while(!isspace(*p) && (strspn(p,"\",{}")==0)) *pto++ = *p++;
|
||||
+ *pto = 0;
|
||||
+ psubFile->pnextChar = p;
|
||||
+ psubFile->token = tokenString;
|
||||
+ return(tokenString);
|
||||
+}
|
||||
+
|
||||
+static void catMacroReplacements(subInfo *psubInfo,const char *value)
|
||||
+{
|
||||
+ size_t len = strlen(value);
|
||||
+
|
||||
+ if(psubInfo->size <= (psubInfo->curLength + len)) {
|
||||
+ size_t newsize = psubInfo->size + MAX_BUFFER_SIZE;
|
||||
+ char *newbuf;
|
||||
+
|
||||
+ if(newsize <= psubInfo->curLength + len)
|
||||
+ newsize = psubInfo->curLength + len + 1;
|
||||
+ newbuf = calloc(1,newsize);
|
||||
+ if(!newbuf) {
|
||||
+ fprintf(stderr,"calloc failed for size %Zu\n",newsize);
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ if(psubInfo->macroReplacements) {
|
||||
+ memcpy(newbuf,psubInfo->macroReplacements,psubInfo->curLength);
|
||||
+ free(psubInfo->macroReplacements);
|
||||
+ }
|
||||
+ psubInfo->size = newsize;
|
||||
+ psubInfo->macroReplacements = newbuf;
|
||||
+ }
|
||||
+ strcat(psubInfo->macroReplacements,value);
|
||||
+ psubInfo->curLength += len;
|
||||
+}
|
||||
@@ -30,7 +30,7 @@
|
||||
#SNCSEQ = $(MODULES)/seq-ver
|
||||
|
||||
# EPICS_BASE should appear last so earlier modules can override stuff:
|
||||
EPICS_BASE = /home/ralph/work/EPICS/V3/base-3.15.6
|
||||
EPICS_BASE = /path/to/base/must/be/set/in/a/RELEASE.local/file
|
||||
|
||||
# Set RULES here if you want to use build rules from somewhere
|
||||
# other than EPICS_BASE:
|
||||
|
||||
@@ -33,3 +33,5 @@ STREAM_REPOOWNER=paulscherrerinstitute
|
||||
# busy
|
||||
# sscan
|
||||
# iocStats
|
||||
# motor
|
||||
# ipac
|
||||
|
||||
@@ -4,5 +4,10 @@ DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
|
||||
|
||||
DIRS := $(DIRS) test
|
||||
|
||||
test_DEPEND_DIRS += src
|
||||
|
||||
include $(TOP)/configure/RULES_DIRS
|
||||
|
||||
|
||||
@@ -4,6 +4,9 @@ include $(TOP)/configure/CONFIG
|
||||
#----------------------------------------
|
||||
# ADD MACRO DEFINITIONS BELOW HERE
|
||||
|
||||
# use the new RSET definition
|
||||
USR_CPPFLAGS += -DUSE_TYPED_RSET
|
||||
|
||||
# xxxRecord.h will be created from xxxRecord.dbd
|
||||
DBDINC += xxxRecord
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/* xxxRecord.c */
|
||||
/* Example record support module */
|
||||
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
@@ -25,111 +25,111 @@
|
||||
/* Create RSET - Record Support Entry Table */
|
||||
#define report NULL
|
||||
#define initialize NULL
|
||||
static long init_record();
|
||||
static long process();
|
||||
static long init_record(struct dbCommon *, int);
|
||||
static long process(struct dbCommon *);
|
||||
#define special NULL
|
||||
#define get_value NULL
|
||||
#define cvt_dbaddr NULL
|
||||
#define get_array_info NULL
|
||||
#define put_array_info NULL
|
||||
static long get_units();
|
||||
static long get_precision();
|
||||
static long get_units(DBADDR *, char *);
|
||||
static long get_precision(const DBADDR *, long *);
|
||||
#define get_enum_str NULL
|
||||
#define get_enum_strs NULL
|
||||
#define put_enum_str NULL
|
||||
static long get_graphic_double();
|
||||
static long get_control_double();
|
||||
static long get_alarm_double();
|
||||
|
||||
static long get_graphic_double(DBADDR *, struct dbr_grDouble *);
|
||||
static long get_control_double(DBADDR *, struct dbr_ctrlDouble *);
|
||||
static long get_alarm_double(DBADDR *, struct dbr_alDouble *);
|
||||
|
||||
rset xxxRSET={
|
||||
RSETNUMBER,
|
||||
report,
|
||||
initialize,
|
||||
init_record,
|
||||
process,
|
||||
special,
|
||||
get_value,
|
||||
cvt_dbaddr,
|
||||
get_array_info,
|
||||
put_array_info,
|
||||
get_units,
|
||||
get_precision,
|
||||
get_enum_str,
|
||||
get_enum_strs,
|
||||
put_enum_str,
|
||||
get_graphic_double,
|
||||
get_control_double,
|
||||
get_alarm_double
|
||||
RSETNUMBER,
|
||||
report,
|
||||
initialize,
|
||||
init_record,
|
||||
process,
|
||||
special,
|
||||
get_value,
|
||||
cvt_dbaddr,
|
||||
get_array_info,
|
||||
put_array_info,
|
||||
get_units,
|
||||
get_precision,
|
||||
get_enum_str,
|
||||
get_enum_strs,
|
||||
put_enum_str,
|
||||
get_graphic_double,
|
||||
get_control_double,
|
||||
get_alarm_double
|
||||
};
|
||||
epicsExportAddress(rset,xxxRSET);
|
||||
|
||||
typedef struct xxxset { /* xxx input dset */
|
||||
long number;
|
||||
DEVSUPFUN dev_report;
|
||||
DEVSUPFUN init;
|
||||
DEVSUPFUN init_record; /*returns: (-1,0)=>(failure,success)*/
|
||||
DEVSUPFUN get_ioint_info;
|
||||
DEVSUPFUN read_xxx;
|
||||
long number;
|
||||
DEVSUPFUN dev_report;
|
||||
DEVSUPFUN init;
|
||||
DEVSUPFUN init_record; /*returns: (-1,0)=>(failure,success)*/
|
||||
DEVSUPFUN get_ioint_info;
|
||||
DEVSUPFUN read_xxx;
|
||||
}xxxdset;
|
||||
|
||||
static void checkAlarms(xxxRecord *prec);
|
||||
static void monitor(xxxRecord *prec);
|
||||
|
||||
static long init_record(void *precord,int pass)
|
||||
|
||||
static long init_record(struct dbCommon *pcommon, int pass)
|
||||
{
|
||||
xxxRecord *prec = (xxxRecord *)precord;
|
||||
xxxRecord *prec = (xxxRecord *)pcommon;
|
||||
xxxdset *pdset;
|
||||
long status;
|
||||
|
||||
if (pass==0) return(0);
|
||||
|
||||
if(!(pdset = (xxxdset *)(prec->dset))) {
|
||||
recGblRecordError(S_dev_noDSET,(void *)prec,"xxx: init_record");
|
||||
return(S_dev_noDSET);
|
||||
recGblRecordError(S_dev_noDSET,(void *)prec,"xxx: init_record");
|
||||
return(S_dev_noDSET);
|
||||
}
|
||||
/* must have read_xxx function defined */
|
||||
if( (pdset->number < 5) || (pdset->read_xxx == NULL) ) {
|
||||
recGblRecordError(S_dev_missingSup,(void *)prec,"xxx: init_record");
|
||||
return(S_dev_missingSup);
|
||||
recGblRecordError(S_dev_missingSup,(void *)prec,"xxx: init_record");
|
||||
return(S_dev_missingSup);
|
||||
}
|
||||
|
||||
if( pdset->init_record ) {
|
||||
if((status=(*pdset->init_record)(prec))) return(status);
|
||||
if((status=(*pdset->init_record)(prec))) return(status);
|
||||
}
|
||||
return(0);
|
||||
}
|
||||
|
||||
static long process(void *precord)
|
||||
|
||||
static long process(struct dbCommon *pcommon)
|
||||
{
|
||||
xxxRecord *prec = (xxxRecord *)precord;
|
||||
xxxdset *pdset = (xxxdset *)(prec->dset);
|
||||
long status;
|
||||
unsigned char pact=prec->pact;
|
||||
xxxRecord *prec = (xxxRecord *)pcommon;
|
||||
xxxdset *pdset = (xxxdset *)(prec->dset);
|
||||
long status;
|
||||
unsigned char pact=prec->pact;
|
||||
|
||||
if( (pdset==NULL) || (pdset->read_xxx==NULL) ) {
|
||||
prec->pact=TRUE;
|
||||
recGblRecordError(S_dev_missingSup,(void *)prec,"read_xxx");
|
||||
return(S_dev_missingSup);
|
||||
}
|
||||
if( (pdset==NULL) || (pdset->read_xxx==NULL) ) {
|
||||
prec->pact=TRUE;
|
||||
recGblRecordError(S_dev_missingSup,(void *)prec,"read_xxx");
|
||||
return(S_dev_missingSup);
|
||||
}
|
||||
|
||||
/* pact must not be set until after calling device support */
|
||||
status=(*pdset->read_xxx)(prec);
|
||||
/* check if device support set pact */
|
||||
if ( !pact && prec->pact ) return(0);
|
||||
prec->pact = TRUE;
|
||||
/* pact must not be set until after calling device support */
|
||||
status=(*pdset->read_xxx)(prec);
|
||||
/* check if device support set pact */
|
||||
if ( !pact && prec->pact ) return(0);
|
||||
prec->pact = TRUE;
|
||||
|
||||
recGblGetTimeStamp(prec);
|
||||
/* check for alarms */
|
||||
checkAlarms(prec);
|
||||
/* check event list */
|
||||
monitor(prec);
|
||||
/* process the forward scan link record */
|
||||
recGblGetTimeStamp(prec);
|
||||
/* check for alarms */
|
||||
checkAlarms(prec);
|
||||
/* check event list */
|
||||
monitor(prec);
|
||||
/* process the forward scan link record */
|
||||
recGblFwdLink(prec);
|
||||
|
||||
prec->pact=FALSE;
|
||||
return(status);
|
||||
prec->pact=FALSE;
|
||||
return(status);
|
||||
}
|
||||
|
||||
|
||||
static long get_units(DBADDR *paddr, char *units)
|
||||
{
|
||||
xxxRecord *prec=(xxxRecord *)paddr->precord;
|
||||
@@ -138,7 +138,7 @@ static long get_units(DBADDR *paddr, char *units)
|
||||
return(0);
|
||||
}
|
||||
|
||||
static long get_precision(DBADDR *paddr, long *precision)
|
||||
static long get_precision(const DBADDR *paddr, long *precision)
|
||||
{
|
||||
xxxRecord *prec=(xxxRecord *)paddr->precord;
|
||||
|
||||
@@ -176,8 +176,8 @@ static long get_control_double(DBADDR *paddr,struct dbr_ctrlDouble *pcd)
|
||||
|| fieldIndex == xxxRecordHIGH
|
||||
|| fieldIndex == xxxRecordLOW
|
||||
|| fieldIndex == xxxRecordLOLO) {
|
||||
pcd->upper_ctrl_limit = prec->hopr;
|
||||
pcd->lower_ctrl_limit = prec->lopr;
|
||||
pcd->upper_ctrl_limit = prec->hopr;
|
||||
pcd->lower_ctrl_limit = prec->lopr;
|
||||
} else recGblGetControlDouble(paddr,pcd);
|
||||
return(0);
|
||||
}
|
||||
@@ -195,79 +195,79 @@ static long get_alarm_double(DBADDR *paddr,struct dbr_alDouble *pad)
|
||||
} else recGblGetAlarmDouble(paddr,pad);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
static void checkAlarms(xxxRecord *prec)
|
||||
{
|
||||
double val, hyst, lalm;
|
||||
float hihi, high, low, lolo;
|
||||
unsigned short hhsv, llsv, hsv, lsv;
|
||||
unsigned short hhsv, llsv, hsv, lsv;
|
||||
|
||||
if(prec->udf == TRUE ){
|
||||
if(prec->udf == TRUE ){
|
||||
recGblSetSevr(prec,UDF_ALARM,INVALID_ALARM);
|
||||
return;
|
||||
}
|
||||
hihi = prec->hihi; lolo = prec->lolo; high = prec->high; low = prec->low;
|
||||
hhsv = prec->hhsv; llsv = prec->llsv; hsv = prec->hsv; lsv = prec->lsv;
|
||||
val = prec->val; hyst = prec->hyst; lalm = prec->lalm;
|
||||
return;
|
||||
}
|
||||
hihi = prec->hihi; lolo = prec->lolo; high = prec->high; low = prec->low;
|
||||
hhsv = prec->hhsv; llsv = prec->llsv; hsv = prec->hsv; lsv = prec->lsv;
|
||||
val = prec->val; hyst = prec->hyst; lalm = prec->lalm;
|
||||
|
||||
/* alarm condition hihi */
|
||||
if (hhsv && (val >= hihi || ((lalm==hihi) && (val >= hihi-hyst)))){
|
||||
if (recGblSetSevr(prec,HIHI_ALARM,prec->hhsv)) prec->lalm = hihi;
|
||||
return;
|
||||
}
|
||||
/* alarm condition hihi */
|
||||
if (hhsv && (val >= hihi || ((lalm==hihi) && (val >= hihi-hyst)))){
|
||||
if (recGblSetSevr(prec,HIHI_ALARM,prec->hhsv)) prec->lalm = hihi;
|
||||
return;
|
||||
}
|
||||
|
||||
/* alarm condition lolo */
|
||||
if (llsv && (val <= lolo || ((lalm==lolo) && (val <= lolo+hyst)))){
|
||||
if (recGblSetSevr(prec,LOLO_ALARM,prec->llsv)) prec->lalm = lolo;
|
||||
return;
|
||||
}
|
||||
/* alarm condition lolo */
|
||||
if (llsv && (val <= lolo || ((lalm==lolo) && (val <= lolo+hyst)))){
|
||||
if (recGblSetSevr(prec,LOLO_ALARM,prec->llsv)) prec->lalm = lolo;
|
||||
return;
|
||||
}
|
||||
|
||||
/* alarm condition high */
|
||||
if (hsv && (val >= high || ((lalm==high) && (val >= high-hyst)))){
|
||||
if (recGblSetSevr(prec,HIGH_ALARM,prec->hsv)) prec->lalm = high;
|
||||
return;
|
||||
}
|
||||
/* alarm condition high */
|
||||
if (hsv && (val >= high || ((lalm==high) && (val >= high-hyst)))){
|
||||
if (recGblSetSevr(prec,HIGH_ALARM,prec->hsv)) prec->lalm = high;
|
||||
return;
|
||||
}
|
||||
|
||||
/* alarm condition low */
|
||||
if (lsv && (val <= low || ((lalm==low) && (val <= low+hyst)))){
|
||||
if (recGblSetSevr(prec,LOW_ALARM,prec->lsv)) prec->lalm = low;
|
||||
return;
|
||||
}
|
||||
/* alarm condition low */
|
||||
if (lsv && (val <= low || ((lalm==low) && (val <= low+hyst)))){
|
||||
if (recGblSetSevr(prec,LOW_ALARM,prec->lsv)) prec->lalm = low;
|
||||
return;
|
||||
}
|
||||
|
||||
/* we get here only if val is out of alarm by at least hyst */
|
||||
prec->lalm = val;
|
||||
return;
|
||||
/* we get here only if val is out of alarm by at least hyst */
|
||||
prec->lalm = val;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
static void monitor(xxxRecord *prec)
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
double delta;
|
||||
unsigned short monitor_mask;
|
||||
double delta;
|
||||
|
||||
monitor_mask = recGblResetAlarms(prec);
|
||||
/* check for value change */
|
||||
delta = prec->mlst - prec->val;
|
||||
if(delta<0.0) delta = -delta;
|
||||
if (delta > prec->mdel) {
|
||||
/* post events for value change */
|
||||
monitor_mask |= DBE_VALUE;
|
||||
/* update last value monitored */
|
||||
prec->mlst = prec->val;
|
||||
}
|
||||
/* check for value change */
|
||||
delta = prec->mlst - prec->val;
|
||||
if(delta<0.0) delta = -delta;
|
||||
if (delta > prec->mdel) {
|
||||
/* post events for value change */
|
||||
monitor_mask |= DBE_VALUE;
|
||||
/* update last value monitored */
|
||||
prec->mlst = prec->val;
|
||||
}
|
||||
|
||||
/* check for archive change */
|
||||
delta = prec->alst - prec->val;
|
||||
if(delta<0.0) delta = -delta;
|
||||
if (delta > prec->adel) {
|
||||
/* post events on value field for archive change */
|
||||
monitor_mask |= DBE_LOG;
|
||||
/* update last archive value monitored */
|
||||
prec->alst = prec->val;
|
||||
}
|
||||
/* check for archive change */
|
||||
delta = prec->alst - prec->val;
|
||||
if(delta<0.0) delta = -delta;
|
||||
if (delta > prec->adel) {
|
||||
/* post events on value field for archive change */
|
||||
monitor_mask |= DBE_LOG;
|
||||
/* update last archive value monitored */
|
||||
prec->alst = prec->val;
|
||||
}
|
||||
|
||||
/* send out monitors connected to the value field */
|
||||
if (monitor_mask){
|
||||
db_post_events(prec,&prec->val,monitor_mask);
|
||||
}
|
||||
return;
|
||||
/* send out monitors connected to the value field */
|
||||
if (monitor_mask){
|
||||
db_post_events(prec,&prec->val,monitor_mask);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
58
exampleApp/test/Makefile
Normal file
58
exampleApp/test/Makefile
Normal file
@@ -0,0 +1,58 @@
|
||||
#*************************************************************************
|
||||
# Copyright (c) 2020 ITER Organization.
|
||||
# EPICS BASE is distributed subject to a Software License Agreement found
|
||||
# in the file LICENSE that is included with this distribution.
|
||||
#*************************************************************************
|
||||
CURDIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
|
||||
TOP = ../..
|
||||
|
||||
include $(TOP)/configure/CONFIG
|
||||
|
||||
# use the new RSET definition
|
||||
USR_CPPFLAGS += -DUSE_TYPED_RSET
|
||||
|
||||
TARGETS += $(COMMON_DIR)/exampleTest.dbd
|
||||
DBDDEPENDS_FILES += exampleTest.dbd$(DEP)
|
||||
exampleTest_DBD += example.dbd
|
||||
|
||||
TESTFILES += $(COMMON_DIR)/exampleTest.dbd
|
||||
|
||||
testHarness_SRCS += exampleTest_registerRecordDeviceDriver.cpp
|
||||
|
||||
PROD_LIBS += exampleSupport
|
||||
ifneq ($(SNCSEQ),)
|
||||
PROD_LIBS += seq pv
|
||||
endif
|
||||
PROD_LIBS += $(EPICS_BASE_IOC_LIBS)
|
||||
|
||||
TESTPROD_HOST += exampleTest
|
||||
exampleTest_SRCS += exampleTest.c
|
||||
exampleTest_SRCS += exampleTest_registerRecordDeviceDriver.cpp
|
||||
testHarness_SRCS += exampleTest.c
|
||||
TESTFILES += ../../../db/dbExample1.db
|
||||
TESTS += exampleTest
|
||||
|
||||
# This runs all the test programs in a known working order:
|
||||
testHarness_SRCS += epicsRunExampleTests.c
|
||||
|
||||
exampleTestHarness_SRCS += $(testHarness_SRCS)
|
||||
exampleTestHarness_SRCS_RTEMS += rtemsTestHarness.c
|
||||
|
||||
PROD_SRCS_RTEMS += rtemsTestData.c
|
||||
|
||||
PROD_vxWorks = exampleTestHarness
|
||||
PROD_RTEMS = exampleTestHarness
|
||||
|
||||
TESTSPEC_vxWorks = exampleTestHarness.munch; epicsRunExampleTests
|
||||
TESTSPEC_RTEMS = exampleTestHarness.boot; epicsRunExampleTests
|
||||
|
||||
TESTSCRIPTS_HOST += $(TESTS:%=%.t)
|
||||
ifneq ($(filter $(T_A),$(CROSS_COMPILER_RUNTEST_ARCHS)),)
|
||||
TESTPROD_RTEMS = $(TESTPROD_HOST)
|
||||
TESTSCRIPTS_RTEMS += $(TESTS:%=%.t)
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
rtemsTestData.c : $(TESTFILES) $(TOOLS)/epicsMakeMemFs.pl
|
||||
$(PERL) $(TOOLS)/epicsMakeMemFs.pl $@ epicsRtemsFSImage $(TESTFILES)
|
||||
28
exampleApp/test/epicsRunExampleTests.c
Normal file
28
exampleApp/test/epicsRunExampleTests.c
Normal file
@@ -0,0 +1,28 @@
|
||||
/*************************************************************************\
|
||||
* Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
|
||||
* National Laboratory.
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
|
||||
/*
|
||||
* Run Example tests as a batch.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "epicsUnitTest.h"
|
||||
#include "epicsExit.h"
|
||||
#include "dbmf.h"
|
||||
|
||||
int exampleTest(void);
|
||||
|
||||
void epicsRunExampleTests(void)
|
||||
{
|
||||
testHarness();
|
||||
|
||||
runTest(exampleTest);
|
||||
|
||||
dbmfFreeChunks();
|
||||
|
||||
epicsExit(0); /* Trigger test harness */
|
||||
}
|
||||
58
exampleApp/test/exampleTest.c
Normal file
58
exampleApp/test/exampleTest.c
Normal file
@@ -0,0 +1,58 @@
|
||||
/*************************************************************************\
|
||||
* Copyright (c) 2020 ITER Organization.
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
|
||||
/*
|
||||
* Author: Ralph Lange <ralph.lange@gmx.de>
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <epicsUnitTest.h>
|
||||
#include <testMain.h>
|
||||
|
||||
#include <dbAccess.h>
|
||||
#include <dbStaticLib.h>
|
||||
#include <errlog.h>
|
||||
|
||||
void exampleTest_registerRecordDeviceDriver(struct dbBase *);
|
||||
|
||||
static dbCommon *prec;
|
||||
|
||||
/* from Base 3.15 dbUnitTest.c */
|
||||
static
|
||||
dbCommon* testdbRecordPtr(const char* pv)
|
||||
{
|
||||
DBADDR addr;
|
||||
|
||||
if (dbNameToAddr(pv, &addr))
|
||||
testAbort("Missing record \"%s\"", pv);
|
||||
|
||||
return addr.precord;
|
||||
}
|
||||
|
||||
static void testOnce(void)
|
||||
{
|
||||
testDiag("check that tests work");
|
||||
|
||||
dbReadDatabase(&pdbbase, "exampleTest.dbd", "../O.Common", NULL);
|
||||
exampleTest_registerRecordDeviceDriver(pdbbase);
|
||||
dbReadDatabase(&pdbbase, "dbExample1.db", "../../../db", "user=test");
|
||||
|
||||
testDiag("Searching for records from example application");
|
||||
|
||||
prec = testdbRecordPtr("test:xxxExample");
|
||||
testOk((prec != NULL), "record test:xxxExample");
|
||||
|
||||
prec = testdbRecordPtr("test:aiExample");
|
||||
testOk((prec != NULL), "record test:aiExample");
|
||||
}
|
||||
|
||||
MAIN(exampleTest)
|
||||
{
|
||||
testPlan(2);
|
||||
testOnce();
|
||||
return testDone();
|
||||
}
|
||||
14
exampleApp/test/rtemsTestHarness.c
Normal file
14
exampleApp/test/rtemsTestHarness.c
Normal file
@@ -0,0 +1,14 @@
|
||||
/*************************************************************************\
|
||||
* Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
|
||||
* National Laboratory.
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
|
||||
extern void epicsRunExampleTests(void);
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
epicsRunExampleTests(); /* calls epicsExit(0) */
|
||||
return 0;
|
||||
}
|
||||
43
synApps-6.0.set
Normal file
43
synApps-6.0.set
Normal file
@@ -0,0 +1,43 @@
|
||||
# Release tags for synApps modules as per synApps-6.0
|
||||
# see https://github.com/EPICS-synApps/support/blob/21f7fcd0f33cef5d34aacbd4e33511b43398a6dc/assemble_synApps.sh
|
||||
# also for additional configuration that could be done in hook scripts
|
||||
|
||||
ALLENBRADLEY=2.3
|
||||
ALIVE=R1-1-0
|
||||
AREA_DETECTOR=R3-3-1
|
||||
ASYN=R4-33
|
||||
AUTOSAVE=R5-9
|
||||
BUSY=R1-7
|
||||
CALC=R3-7-1
|
||||
CAMAC=R2-7-1
|
||||
CAPUTRECORDER=R1-7-1
|
||||
DAC128V=R2-9
|
||||
DELAYGEN=R1-2-0
|
||||
DXP=R5-0
|
||||
DXPSITORO=R1-1
|
||||
DEVIOCSTATS=3.1.15
|
||||
#GALIL=V3-6
|
||||
IP=R2-19-1
|
||||
IPAC=2.15
|
||||
IP330=R2-9
|
||||
IPUNIDIG=R2-11
|
||||
LOVE=R3-2-6
|
||||
LUA=R1-2-2
|
||||
MCA=R7-7
|
||||
MEASCOMP=R2-1
|
||||
MODBUS=R2-11
|
||||
MOTOR=R6-10-1
|
||||
OPTICS=R2-13-1
|
||||
QUADEM=R9-1
|
||||
SNCSEQ=2.2.5
|
||||
SOFTGLUE=R2-8-1
|
||||
SOFTGLUEZYNQ=R2-0-1
|
||||
SSCAN=R2-11-1
|
||||
STD=R3-5
|
||||
STREAM=R2-7-7c
|
||||
VAC=R1-7
|
||||
VME=R2-9
|
||||
YOKOGAWA_DAS=R1-0-0
|
||||
XXX=R6-0
|
||||
|
||||
include synApps-common
|
||||
44
synApps-6.1.set
Normal file
44
synApps-6.1.set
Normal file
@@ -0,0 +1,44 @@
|
||||
# Release tags for synApps modules as per synApps-6.1
|
||||
# see https://github.com/EPICS-synApps/support/blob/cc5adba5b8848c9cb98ab96768d668ae927d8859/assemble_synApps.sh
|
||||
# also for additional configuration that could be done in hook scripts
|
||||
|
||||
#ALLENBRADLEY=2.3
|
||||
ALIVE=R1-1-1
|
||||
AREA_DETECTOR=R3-7
|
||||
ASYN=R4-36
|
||||
AUTOSAVE=R5-10
|
||||
BUSY=R1-7-2
|
||||
CALC=R3-7-3
|
||||
CAMAC=R2-7-1
|
||||
CAPUTRECORDER=R1-7-2
|
||||
DAC128V=R2-9
|
||||
DELAYGEN=R1-2-1
|
||||
DXP=R6-0
|
||||
DXPSITORO=R1-2
|
||||
DEVIOCSTATS=3.1.16
|
||||
#ETHERIP=ether_ip-3-1
|
||||
#GALIL=V3-6
|
||||
IP=R2-20-1
|
||||
IPAC=2.15
|
||||
IP330=R2-9
|
||||
IPUNIDIG=R2-11
|
||||
LOVE=R3-2-7
|
||||
LUA=R2-0
|
||||
MCA=R7-8
|
||||
MEASCOMP=R2-3
|
||||
MODBUS=R3-0
|
||||
MOTOR=R7-1
|
||||
OPTICS=R2-13-3
|
||||
QUADEM=R9-2-1
|
||||
SNCSEQ=2.2.6
|
||||
SOFTGLUE=R2-8-2
|
||||
SOFTGLUEZYNQ=R2-0-2
|
||||
SSCAN=R2-11-3
|
||||
STD=R3-6
|
||||
STREAM=2.8.9
|
||||
VAC=R1-9
|
||||
VME=R2-9-2
|
||||
YOKOGAWA_DAS=R2-0-1
|
||||
XXX=R6-1
|
||||
|
||||
include synApps-common
|
||||
7
synApps-common.set
Normal file
7
synApps-common.set
Normal file
@@ -0,0 +1,7 @@
|
||||
# Common settings for all synApps releases
|
||||
|
||||
DEVIOCSTATS_REPONAME=iocStats
|
||||
ETHERIP_REPOOWNER=EPICSTools
|
||||
GALIL_REPOOWNER=motorapp
|
||||
GALIL_REPONAME=Galil-3-0
|
||||
AREADETECTOR_REPOOWNER=areaDetector
|
||||
161
travis-test.sh
161
travis-test.sh
@@ -5,6 +5,18 @@
|
||||
# SET=test00 in .travis.yml runs the tests in this script
|
||||
# all other jobs are started as compile jobs
|
||||
|
||||
# The following if clause can be removed for ci-scripts major version 3
|
||||
if [ "$TRAVIS_OS_NAME" == osx -a "$BASH_VERSINFO" -lt 4 ]
|
||||
then
|
||||
brew install bash
|
||||
if [ $(/usr/local/bin/bash -c 'echo $BASH_VERSINFO') -lt 4 ]
|
||||
then
|
||||
echo "Failed to install a recent bash" >&2
|
||||
exit 1
|
||||
fi
|
||||
exec /usr/local/bin/bash $0 "$@"
|
||||
fi
|
||||
|
||||
# Set VV empty in .travis.yml to make scripts terse
|
||||
[ "${VV:-1}" ] && set -x
|
||||
|
||||
@@ -16,8 +28,8 @@ UTILS_UNITTEST=1
|
||||
readlinkf() { perl -MCwd -e 'print Cwd::abs_path shift' "$1"; }
|
||||
|
||||
# test utilities
|
||||
die() {
|
||||
echo "${ANSI_RED}$1${ANSI_RESET}"
|
||||
fail() {
|
||||
echo -e "${ANSI_RED}$1${ANSI_RESET}"
|
||||
exit 1
|
||||
}
|
||||
|
||||
@@ -39,65 +51,68 @@ SETUP_DIRS=${SETUP_PATH//:/ }
|
||||
|
||||
SCRIPTDIR=$(dirname $(readlinkf $0))/travis
|
||||
CURDIR="$PWD"
|
||||
CACHEDIR="$HOME/.cache"
|
||||
CACHEDIR=${CACHEDIR:-${HOME}/.cache}
|
||||
[ -e ${CACHEDIR} ] || mkdir -p ${CACHEDIR}
|
||||
|
||||
echo "Testing contents of utils.sh"
|
||||
|
||||
[ -d "$SCRIPTDIR" ] || die "SCRIPTDIR does not exist"
|
||||
[ -e "$SCRIPTDIR/utils.sh" ] || die "SCRIPTDIR/utils.sh does not exist"
|
||||
[ -d "$SCRIPTDIR" ] || fail "SCRIPTDIR does not exist"
|
||||
[ -e "$SCRIPTDIR/utils.sh" ] || fail "SCRIPTDIR/utils.sh does not exist"
|
||||
|
||||
# source functions
|
||||
. $SCRIPTDIR/utils.sh
|
||||
|
||||
# check for functions
|
||||
fn_exists fold_start || die "function fold_start missing from SCRIPTDIR/utils.sh"
|
||||
fn_exists fold_end || die "function fold_end missing from SCRIPTDIR/utils.sh"
|
||||
fn_exists source_set || die "function source_set missing from SCRIPTDIR/utils.sh"
|
||||
fn_exists update_release_local || die "function update_release_local missing from SCRIPTDIR/utils.sh"
|
||||
fn_exists add_dependency || die "function add_dependency missing from SCRIPTDIR/utils.sh"
|
||||
fn_exists fold_start || fail "function fold_start missing from SCRIPTDIR/utils.sh"
|
||||
fn_exists fold_end || fail "function fold_end missing from SCRIPTDIR/utils.sh"
|
||||
fn_exists source_set || fail "function source_set missing from SCRIPTDIR/utils.sh"
|
||||
fn_exists update_release_local || fail "function update_release_local missing from SCRIPTDIR/utils.sh"
|
||||
fn_exists add_dependency || fail "function add_dependency missing from SCRIPTDIR/utils.sh"
|
||||
|
||||
# test source_set()
|
||||
######################################################################
|
||||
|
||||
SETUP_DIRS= source_set test01 | grep -q "(SETUP_PATH) is empty" || die "empty search path not detected"
|
||||
source_set xxdoesnotexistxx | grep -q "does not exist" || die "missing setup file not detected"
|
||||
source_set test01 | grep -q "Loading setup file" || die "test01 setup file not found"
|
||||
SETUP_PATH= source_set test01 | grep -q "(SETUP_PATH) is empty" || fail "empty search path not detected"
|
||||
source_set xxdoesnotexistxx | grep -q "does not exist" || fail "missing setup file not detected"
|
||||
source_set test01 | grep -q "Loading setup file" || fail "test01 setup file not found"
|
||||
unset SEEN_SETUPS
|
||||
export BASE=foo
|
||||
source_set test01
|
||||
[ "$BASE" = "foo" ] || die "preset module BASE version does not override test01 setup file (expected foo got $BASE)"
|
||||
[ "$BASE" = "foo" ] || fail "preset module BASE version does not override test01 setup file (expected foo got $BASE)"
|
||||
unset SEEN_SETUPS
|
||||
BASE=
|
||||
source_set test02
|
||||
[ "$BASE" = "foo" ] || die "BASE set in test02 does not override included test01 setup file (expected foo got $BASE)"
|
||||
[ "$FOO" = "bar" ] || die "Setting of single word does not work"
|
||||
[ "$FOO2" = "bar bar2" ] || die "Setting of multiple words does not work"
|
||||
[ "$FOO3" = "bar bar2" ] || die "Indented setting of multiple words does not work"
|
||||
[ "$SNCSEQ" = "R2-2-7" ] || die "Setup test01 was not included"
|
||||
[ "$BASE" = "foo" ] || fail "BASE set in test02 does not override included test01 setup file (expected foo got $BASE)"
|
||||
[ "$FOO" = "bar" ] || fail "Setting of single word does not work"
|
||||
[ "$FOO2" = "bar bar2" ] || fail "Setting of multiple words does not work"
|
||||
[ "$FOO3" = "bar bar2" ] || fail "Indented setting of multiple words does not work"
|
||||
[ "$SNCSEQ" = "R2-2-7" ] || fail "Setup test01 was not included"
|
||||
unset SEEN_SETUPS
|
||||
source_set test03 | grep -q "Ignoring already included setup file" || die "test01 setup file included twice"
|
||||
source_set test03 | grep -q "Ignoring already included setup file" || fail "test01 setup file included twice"
|
||||
|
||||
# test default settings file
|
||||
######################################################################
|
||||
|
||||
echo "Testing default settings for completeness and valid git repo settings"
|
||||
|
||||
[ -e ./defaults.set ] || die "defaults.set does not exist"
|
||||
[ -e ./defaults.set ] || fail "defaults.set does not exist"
|
||||
source_set defaults
|
||||
|
||||
repo_exists BASE || die "Defaults for BASE do not point to a valid git repository at $repourl"
|
||||
repo_exists PVDATA || die "Defaults for PVDATA do not point to a valid git repository at $repourl"
|
||||
repo_exists PVACCESS || die "Defaults for PVACCESS do not point to a valid git repository at $repourl"
|
||||
repo_exists NTYPES || die "Defaults for NTYPES do not point to a valid git repository at $repourl"
|
||||
repo_exists SNCSEQ || die "Defaults for SNCSEQ do not point to a valid git repository at $repourl"
|
||||
repo_exists STREAM || die "Defaults for STREAM do not point to a valid git repository at $repourl"
|
||||
repo_exists ASYN || die "Defaults for STREAM do not point to a valid git repository at $repourl"
|
||||
repo_exists STD || die "Defaults for STD do not point to a valid git repository at $repourl"
|
||||
repo_exists CALC || die "Defaults for CALC do not point to a valid git repository at $repourl"
|
||||
repo_exists AUTOSAVE || die "Defaults for AUTOSAVE do not point to a valid git repository at $repourl"
|
||||
repo_exists BUSY || die "Defaults for BUSY do not point to a valid git repository at $repourl"
|
||||
repo_exists SSCAN || die "Defaults for SSCAN do not point to a valid git repository at $repourl"
|
||||
repo_exists IOCSTATS || die "Defaults for IOCSTATS do not point to a valid git repository at $repourl"
|
||||
repo_exists BASE || fail "Defaults for BASE do not point to a valid git repository at $repourl"
|
||||
repo_exists PVDATA || fail "Defaults for PVDATA do not point to a valid git repository at $repourl"
|
||||
repo_exists PVACCESS || fail "Defaults for PVACCESS do not point to a valid git repository at $repourl"
|
||||
repo_exists NTYPES || fail "Defaults for NTYPES do not point to a valid git repository at $repourl"
|
||||
repo_exists SNCSEQ || fail "Defaults for SNCSEQ do not point to a valid git repository at $repourl"
|
||||
repo_exists STREAM || fail "Defaults for STREAM do not point to a valid git repository at $repourl"
|
||||
repo_exists ASYN || fail "Defaults for ASYN do not point to a valid git repository at $repourl"
|
||||
repo_exists STD || fail "Defaults for STD do not point to a valid git repository at $repourl"
|
||||
repo_exists CALC || fail "Defaults for CALC do not point to a valid git repository at $repourl"
|
||||
repo_exists AUTOSAVE || fail "Defaults for AUTOSAVE do not point to a valid git repository at $repourl"
|
||||
repo_exists BUSY || fail "Defaults for BUSY do not point to a valid git repository at $repourl"
|
||||
repo_exists SSCAN || fail "Defaults for SSCAN do not point to a valid git repository at $repourl"
|
||||
repo_exists IOCSTATS || fail "Defaults for IOCSTATS do not point to a valid git repository at $repourl"
|
||||
repo_exists MOTOR || fail "Defaults for MOTOR do not point to a valid git repository at $repourl"
|
||||
repo_exists IPAC || fail "Defaults for IPAC do not point to a valid git repository at $repourl"
|
||||
|
||||
# test update_release_local()
|
||||
######################################################################
|
||||
@@ -111,34 +126,34 @@ rm -f $release_local
|
||||
# Set a module
|
||||
update_release_local MOD1 /tmp/mod1
|
||||
updated_line="MOD1=/tmp/mod1"
|
||||
grep -q "MOD1=" $release_local || die "Line for MOD1 not added to RELEASE.local"
|
||||
grep -q "MOD1=" $release_local || fail "Line for MOD1 not added to RELEASE.local"
|
||||
existing_line=$(grep "MOD1=" $release_local)
|
||||
[ "${existing_line}" = "${updated_line}" ] || die "Wrong line for MOD1 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
|
||||
[ "${existing_line}" = "${updated_line}" ] || fail "Wrong line for MOD1 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
|
||||
|
||||
# Set base
|
||||
update_release_local EPICS_BASE /tmp/base
|
||||
updated_line="EPICS_BASE=/tmp/base"
|
||||
grep -q "EPICS_BASE=" $release_local || die "Line for EPICS_BASE not added to RELEASE.local"
|
||||
grep -q "EPICS_BASE=" $release_local || fail "Line for EPICS_BASE not added to RELEASE.local"
|
||||
|
||||
# Set another module
|
||||
update_release_local MOD2 /tmp/mod2
|
||||
updated_line="MOD2=/tmp/mod2"
|
||||
grep -q "MOD2=" $release_local || die "Line for MOD2 not added to RELEASE.local"
|
||||
grep -q "MOD2=" $release_local || fail "Line for MOD2 not added to RELEASE.local"
|
||||
existing_line=$(grep "MOD2=" $release_local)
|
||||
[ "${existing_line}" = "${updated_line}" ] || die "Wrong line for MOD2 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
|
||||
tail -n 1 $release_local | grep -q "EPICS_BASE=" || die "Line for EPICS_BASE not moved to the end of RELEASE.local"
|
||||
[ "${existing_line}" = "${updated_line}" ] || fail "Wrong line for MOD2 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
|
||||
tail -n 1 $release_local | grep -q "EPICS_BASE=" || fail "Line for EPICS_BASE not moved to the end of RELEASE.local"
|
||||
|
||||
# Update a module
|
||||
update_release_local MOD1 /tmp/mod1b
|
||||
updated_line="MOD1=/tmp/mod1b"
|
||||
grep -q "MOD1=" $release_local || die "Line for MOD1 not present in RELEASE.local"
|
||||
grep -q "MOD1=" $release_local || fail "Line for MOD1 not present in RELEASE.local"
|
||||
existing_line=$(grep "MOD1=" $release_local)
|
||||
[ "${existing_line}" = "${updated_line}" ] || die "Wrong line for MOD1 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
|
||||
head -n 1 $release_local | grep -q "MOD1=" || die "Line for MOD1 not at the top of RELEASE.local"
|
||||
tail -n 1 $release_local | grep -q "EPICS_BASE=" || die "Line for EPICS_BASE not moved to the end of RELEASE.local"
|
||||
[ "${existing_line}" = "${updated_line}" ] || fail "Wrong line for MOD1 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
|
||||
head -n 1 $release_local | grep -q "MOD1=" || fail "Line for MOD1 not at the top of RELEASE.local"
|
||||
tail -n 1 $release_local | grep -q "EPICS_BASE=" || fail "Line for EPICS_BASE not moved to the end of RELEASE.local"
|
||||
|
||||
# Check that RELEASE.local only contains variable settings
|
||||
[ $(grep -v -c '[^ =]*=.*' $release_local) -ne 0 ] && die "RELEASE.local contains invalid lines"
|
||||
[ $(grep -v -c '[^ =]*=.*' $release_local) -ne 0 ] && fail "RELEASE.local contains invalid lines"
|
||||
|
||||
rm -f $release_local
|
||||
|
||||
@@ -153,23 +168,65 @@ location=$CACHEDIR/base-R3.15.6
|
||||
# CAREFUL: order of the following check matters (speeds up the test)
|
||||
|
||||
# dependency does not exist in the cache
|
||||
rm -fr $location
|
||||
rm -fr $location; modules_to_compile=
|
||||
add_dependency BASE R3.15.6
|
||||
[ -e $location/LICENSE ] || die "Missing dependency was not checked out"
|
||||
[ -e $location/LICENSE ] || fail "Missing dependency was not checked out"
|
||||
BUILT=$(cat "$location/built")
|
||||
[ "$BUILT" != "$hash_3_15_6" ] && die "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")"
|
||||
[ "$BUILT" != "$hash_3_15_6" ] && fail "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")"
|
||||
grep -q "include \$(TOP)/../RELEASE.local" $location/configure/RELEASE && fail "RELEASE in Base includes RELEASE.local"
|
||||
[ "$do_recompile" ] || fail "do_recompile flag was not set for missing dependency"
|
||||
echo "$modules_to_compile" | grep -q "$location" || fail "Missing dependency was not set to compile"
|
||||
|
||||
# up-to-date dependency does exist in the cache
|
||||
( cd $CACHEDIR; git clone --quiet --depth 5 --recursive --branch R3.15.6 https://github.com/epics-base/epics-base.git base-R3.15.6 )
|
||||
rm -f $location/LICENSE
|
||||
unset do_recompile; modules_to_compile=
|
||||
add_dependency BASE R3.15.6
|
||||
[ -e $location/LICENSE ] && die "Existing correct dependency was checked out on top"
|
||||
[ -e $location/LICENSE ] && fail "Existing correct dependency was checked out on top"
|
||||
[ "$do_recompile" ] && fail "do_recompile flag was set for up-to-date dependency"
|
||||
echo "$modules_to_compile" | grep -q "$location" && fail "Up-to-date dependency was set to compile"
|
||||
|
||||
do_recompile=yes
|
||||
add_dependency BASE R3.15.6
|
||||
echo "$modules_to_compile" | grep -q "$location" || fail "Up-to-date module was not set to compile wile do_recompile=yes"
|
||||
|
||||
# dependency in the cache is outdated
|
||||
echo "nottherighthash" > "$location/built"
|
||||
unset do_recompile
|
||||
add_dependency BASE R3.15.6
|
||||
[ -e $location/LICENSE ] || die "Outdated dependency was not checked out"
|
||||
[ -e $location/LICENSE ] || fail "Outdated dependency was not checked out"
|
||||
BUILT=$(cat "$location/built")
|
||||
[ "$BUILT" != "$hash_3_15_6" ] && die "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")"
|
||||
[ "$BUILT" != "$hash_3_15_6" ] && fail "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")"
|
||||
[ "$do_recompile" ] || fail "do_recompile flag was not set for outdated dependency"
|
||||
echo "$modules_to_compile" | grep -q "$location" || fail "Outdated dependency was not set to compile"
|
||||
|
||||
rm -fr $location
|
||||
# msi is automatically added to 3.14
|
||||
rm -fr $location; modules_to_compile=
|
||||
location=$CACHEDIR/base-R3.14.12.1
|
||||
rm -fr $location;
|
||||
add_dependency BASE R3.14.12.1
|
||||
[ -e $location/src/dbtools/msi.c ] || fail "MSI was not added to Base 3.14"
|
||||
|
||||
rm -fr $CACHEDIR/*; modules_to_compile=
|
||||
|
||||
# missing inclusion of RELEASE.local in configure/RELEASE
|
||||
location=$CACHEDIR/std-R3-4
|
||||
add_dependency STD R3-4
|
||||
grep -q "include \$(TOP)/../RELEASE.local" $location/configure/RELEASE || fail "Inclusion of RELEASE.local not added to configure/RELEASE"
|
||||
rm -fr $location; modules_to_compile=
|
||||
|
||||
# correct handling of FOO_RECURSIVE setting (https://github.com/epics-base/ci-scripts/issues/25 regression)
|
||||
export SSCAN_RECURSIVE=NO
|
||||
add_dependency SSCAN master
|
||||
add_dependency ASYN master
|
||||
[ -e $CACHEDIR/sscan-master/.ci/README.md ] && fail "Sscan was checked out recursively despite SSCAN_RECURSIVE=NO"
|
||||
[ -e $CACHEDIR/asyn-master/.ci/README.md ] || fail "Asyn was not checked out recursively"
|
||||
rm -fr $CACHEDIR/*; modules_to_compile=
|
||||
|
||||
unset SSCAN_RECURSIVE
|
||||
export ASYN_RECURSIVE=NO
|
||||
add_dependency SSCAN master
|
||||
add_dependency ASYN master
|
||||
[ -e $CACHEDIR/sscan-master/.ci/README.md ] || fail "Sscan was not checked out recursively"
|
||||
[ -e $CACHEDIR/asyn-master/.ci/README.md ] && fail "Asyn was checked out recursively despite ASYN_RECURSIVE=NO"
|
||||
rm -fr $CACHEDIR/*
|
||||
|
||||
@@ -50,18 +50,19 @@ script:
|
||||
# Define build jobs
|
||||
|
||||
# Well-known variables to use
|
||||
# SET source setup file
|
||||
# EXTRA content will be added to make command line
|
||||
# STATIC set to YES for static build (default: NO)
|
||||
# TEST set to NO to skip running the tests (default: YES)
|
||||
# VV set to make build scripts verbose (default: unset)
|
||||
# SET source setup file
|
||||
# ADD_MODULES extra modules (for a specific job)
|
||||
# EXTRA content will be added to make command line
|
||||
# STATIC set to YES for static build (default: NO)
|
||||
# TEST set to NO to skip running the tests (default: YES)
|
||||
# VV set to make build scripts verbose (default: unset)
|
||||
|
||||
# Usually from setup files, but may be specified or overridden
|
||||
# on a job line
|
||||
# MODULES list of dependency modules
|
||||
# BASE branch or release tag name of the EPICS Base to use
|
||||
# <MODULE> branch or release tag for a specific module
|
||||
# ... see README for setup file syntax description
|
||||
# MODULES list of dependency modules
|
||||
# BASE branch or release tag name of the EPICS Base to use
|
||||
# <MODULE> branch or release tag for a specific module
|
||||
# ... see README for setup file syntax description
|
||||
|
||||
jobs:
|
||||
include:
|
||||
|
||||
@@ -4,7 +4,7 @@ set -e
|
||||
# Set VV in .travis.yml to make scripts verbose
|
||||
[ "$VV" ] && set -x
|
||||
|
||||
CACHEDIR="$HOME/.cache"
|
||||
CACHEDIR=${CACHEDIR:-${HOME}/.cache}
|
||||
|
||||
eval $(grep "EPICS_BASE=" ${CACHEDIR}/RELEASE.local)
|
||||
export EPICS_BASE
|
||||
@@ -15,8 +15,13 @@ export EPICS_HOST_ARCH
|
||||
|
||||
make -j2 $EXTRA
|
||||
|
||||
ret=0
|
||||
|
||||
if [ "$TEST" != "NO" ]
|
||||
then
|
||||
make tapfiles
|
||||
make tapfiles || ret=$?
|
||||
|
||||
make -s test-results
|
||||
fi
|
||||
|
||||
exit $ret
|
||||
|
||||
@@ -21,7 +21,8 @@ readlinkf() { perl -MCwd -e 'print Cwd::abs_path shift' "$1"; }
|
||||
|
||||
SCRIPTDIR=$(dirname $(readlinkf $0))
|
||||
CURDIR="$PWD"
|
||||
CACHEDIR="$HOME/.cache"
|
||||
CACHEDIR=${CACHEDIR:-${HOME}/.cache}
|
||||
[ -e ${CACHEDIR} ] || mkdir -p ${CACHEDIR}
|
||||
|
||||
# source functions
|
||||
. $SCRIPTDIR/utils.sh
|
||||
@@ -46,7 +47,7 @@ fold_end load.settings
|
||||
|
||||
fold_start check.out.dependencies "Checking/cloning dependencies"
|
||||
|
||||
for mod in BASE $MODULES
|
||||
for mod in BASE $ADD_MODULES $MODULES
|
||||
do
|
||||
mod_uc=${mod^^}
|
||||
eval add_dependency $mod_uc \${${mod_uc}:=master}
|
||||
@@ -202,7 +203,7 @@ echo -e "${ANSI_BLUE}Dependency module information${ANSI_RESET}"
|
||||
|
||||
echo "Module Tag Binaries Commit"
|
||||
echo "-----------------------------------------------------------------------------------"
|
||||
for mod in base $MODULES
|
||||
for mod in base $MODULES $ADD_MODULES
|
||||
do
|
||||
mod_uc=${mod^^}
|
||||
eval tag=\${${mod_uc}}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# Utility functions for Travis scripts in ci-scripts
|
||||
#
|
||||
# This file is sourced by the executable scripts
|
||||
# CACHEDIR must be defined and existing before calling these functions
|
||||
|
||||
# Portable version of 'sed -i' (that MacOS doesn't provide)
|
||||
|
||||
@@ -139,6 +140,7 @@ add_dependency() {
|
||||
eval varname=\${${DEP}_VARNAME:=${DEP}}
|
||||
eval recursive=\${${DEP}_RECURSIVE:=1}
|
||||
recursive=${recursive,,}
|
||||
local recurse=""
|
||||
[ "$recursive" != "0" -a "$recursive" != "no" ] && recurse="--recursive"
|
||||
|
||||
# determine if $DEP points to a valid release or branch
|
||||
@@ -175,7 +177,24 @@ add_dependency() {
|
||||
echo "Cloning $TAG of dependency $DEP into $CACHEDIR/$dirname-$TAG"
|
||||
git clone --quiet $deptharg $recurse --branch "$TAG" $repourl $dirname-$TAG
|
||||
( cd $dirname-$TAG && git log -n1 )
|
||||
modules_to_compile="${modules_to_compile} $CACHEDIR/$dirname-$TAG"
|
||||
do_recompile=yes
|
||||
# add MSI to Base 3.14
|
||||
if [ $DEP == "BASE" ]
|
||||
then
|
||||
versionfile=$CACHEDIR/$dirname-$TAG/configure/CONFIG_BASE_VERSION
|
||||
if [ -e ${versionfile} ] && grep -q "BASE_3_14=YES" ${versionfile}
|
||||
then
|
||||
echo "Adding MSI 1.7 to $CACHEDIR/$dirname-$TAG"
|
||||
( cd $dirname-$TAG; patch -p0 < $SCRIPTDIR/../add-msi-to-314.patch )
|
||||
fi
|
||||
else
|
||||
# fix non-base modules that do not include the .local files in configure/RELEASE
|
||||
release=$CACHEDIR/$dirname-$TAG/configure/RELEASE
|
||||
if [ -e $release ]
|
||||
then
|
||||
echo "-include \$(TOP)/../RELEASE.local" > $release
|
||||
fi
|
||||
fi
|
||||
# run hook
|
||||
eval hook="\${${DEP}_HOOK}"
|
||||
if [ "$hook" ]
|
||||
@@ -193,5 +212,7 @@ add_dependency() {
|
||||
cd "$curdir"
|
||||
fi
|
||||
|
||||
[ "${do_recompile}" ] && modules_to_compile="${modules_to_compile} $CACHEDIR/$dirname-$TAG"
|
||||
|
||||
update_release_local ${varname} $CACHEDIR/$dirname-$TAG
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user