Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V5.9 #7

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 96 additions & 0 deletions .ci/assemble_synApps.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
#!/bin/bash
shopt -s expand_aliases

cd $HOME/.cache

EPICS_BASE=$HOME/.cache/base-$BASE

if [ ! -e "$EPICS_BASE" ]
then
git clone --branch $BASE --depth 1 git://github.com/epics-base/epics-base.git base-$BASE
EPICS_HOST_ARCH=`sh $EPICS_BASE/startup/EpicsHostArch`

case "$STATIC" in
static)
cat << EOF >> "$EPICS_BASE/configure/CONFIG_SITE"
SHARED_LIBRARIES=NO
STATIC_BUILD=YES
EOF
;;
*) ;;
esac

case "$CMPLR" in
clang)
echo "Host compiler is clang"
cat << EOF >> $EPICS_BASE/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
GNU = NO
CMPLR_CLASS = clang
CC = clang
CCC = clang++
EOF
;;
*) echo "Host compiler is default";;
esac

# requires wine and g++-mingw-w64-i686
if [ "$WINE" = "32" ]
then
echo "Cross mingw32"
sed -i -e '/CMPLR_PREFIX/d' $EPICS_BASE/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
cat << EOF >> $EPICS_BASE/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
CMPLR_PREFIX=i686-w64-mingw32-
EOF
cat << EOF >> $EPICS_BASE/configure/CONFIG_SITE
CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
EOF
fi

# set RTEMS to eg. "4.9" or "4.10"
if [ -n "$RTEMS" ]
then
echo "Cross RTEMS${RTEMS} for pc386"
install -d /home/travis/.cache
curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
| tar -C /home/travis/.cache -xj

sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' $EPICS_BASE/configure/os/CONFIG_SITE.Common.RTEMS
cat << EOF >> $EPICS_BASE/configure/os/CONFIG_SITE.Common.RTEMS
RTEMS_VERSION=$RTEMS
RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
EOF
cat << EOF >> $EPICS_BASE/configure/CONFIG_SITE
CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
EOF

fi

make -C "$EPICS_BASE" -j2
# get MSI for 3.14
case "$BASE" in
3.14*)
echo "Build MSI"
install -d "$HOME/msi/extensions/src"
curl https://www.aps.anl.gov/epics/download/extensions/extensionsTop_20120904.tar.gz | tar -C "$HOME/msi" -xvz
curl https://www.aps.anl.gov/epics/download/extensions/msi1-7.tar.gz | tar -C "$HOME/msi/extensions/src" -xvz
mv "$HOME/msi/extensions/src/msi1-7" "$HOME/msi/extensions/src/msi"

cat << EOF > "$HOME/msi/extensions/configure/RELEASE"
EPICS_BASE=$EPICS_BASE
EPICS_EXTENSIONS=\$(TOP)
EOF
make -C "$HOME/msi/extensions"
cp "$HOME/msi/extensions/bin/$EPICS_HOST_ARCH/msi" "$EPICS_BASE/bin/$EPICS_HOST_ARCH/"
echo 'MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi' >> "$EPICS_BASE/configure/CONFIG_SITE"

cat <<EOF >> configure/CONFIG_SITE
MSI = \$(EPICS_BASE)/bin/\$(EPICS_HOST_ARCH)/msi
EOF

;;
*) echo "Use MSI from Base"
;;
esac
fi

echo "EPICS_BASE=$EPICS_BASE" > $TRAVIS_BUILD_DIR/configure/RELEASE
32 changes: 32 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
sudo: false
dist: trusty
language: c
compiler:
- gcc
cache:
directories:
- $HOME/.cache
notifications:
email: false
addons:
apt:
packages:
- libreadline6-dev
- libncurses5-dev
- perl
- clang
- g++-mingw-w64-i686
- re2c
env:
- BASE=R3.15.5 STATIC=shared
- BASE=R3.14.12.6 STATIC=shared

before_install: chmod +x ./.ci/assemble_synApps.sh

install: ./.ci/assemble_synApps.sh


script:
# Build the module
- make

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![Build Status](https://travis-ci.org/epics-modules/autosave.svg?branch=master)](https://travis-ci.org/epics-modules/autosave)

# autosave
APS BCDA synApps module: autosave

Expand Down
Empty file added asApp/op/ui/.gitignore
Empty file.
Empty file.
File renamed without changes.
File renamed without changes.
7 changes: 4 additions & 3 deletions asApp/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ asVerify_LIBS += Com

#DBDINC += xxxRecord

# To enable autosaveBuild, use dbLoadRecordsHookRegister. (But it doesn't
# appear in EPICS base until 3.14.12.5, so disable by default for now.)
#USR_CFLAGS += -DDBLOADRECORDSHOOKREGISTER
# To enable autosaveBuild, use dbLoadRecordsHookRegister(). (Requires EPICS
# base 3.14.12.5 or later.)

USR_CFLAGS += -DDBLOADRECORDSHOOKREGISTER

# <name>.dbd will be created from <name>Include.dbd
DBD += as.dbd
Expand Down
10 changes: 6 additions & 4 deletions asApp/src/asMain.cpp
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
/* asMain */
/* _APPNAME_Main.cpp */
/* Author: Marty Kraimer Date: 17MAR2000 */

#include <stddef.h>
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
#include <stdio.h>

#include "epicsExit.h"
#include "epicsThread.h"
#include "iocsh.h"
#include <epicsThread.h>

int main(int argc,char *argv[])
{

if(argc>=2) {
if(argc>=2) {
iocsh(argv[1]);
epicsThreadSleep(.2);
}
iocsh(NULL);
epicsExit(0);
return(0);
}
13 changes: 13 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
autosave (5.9-2) unstable; urgency=medium

* Bump up standards version to 4.3.0

-- Martin Konrad <[email protected]> Mon, 15 Jul 2019 08:38:50 -0400

autosave (5.9-1) unstable; urgency=medium

* New upstream version 5.9
* Bump up versions in library names

-- Martin Konrad <[email protected]> Thu, 10 Jan 2019 17:53:39 -0500

autosave (5.8-2) unstable; urgency=medium

* Use build profile to enable RTEMS cross build
Expand Down
2 changes: 1 addition & 1 deletion debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
12 changes: 6 additions & 6 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
Source: autosave
Section: libdevel
Priority: extra
Maintainer: mdavidsaver <[email protected]>
Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14),
Priority: optional
Maintainer: Martin Konrad <[email protected]>
Build-Depends: debhelper (>= 10), dpkg-dev (>= 1.17.14),
epics-debhelper (>= 8.14~), epics-dev,
rtems-epics-mvme2100 <pkg.epics-base.rtems>,
rtems-epics-mvme3100 <pkg.epics-base.rtems>,
rtems-epics-mvme5500 <pkg.epics-base.rtems>,
rtems-epics-pc386 <pkg.epics-base.rtems>,
XS-Rtems-Build-Depends: rtems-epics
Standards-Version: 3.9.6
Standards-Version: 4.3.0
Homepage: http://aps.anl.gov/bcda/synApps/autosave/autosave.html
Vcs-Git: https://github.com/epicsdeb/autosave.git
Vcs-Browser: https://github.com/epicsdeb/autosave

Package: epics-autosave-dev
Architecture: any
Depends: libautosave5.8 (= ${binary:Version}),
Depends: libautosave5.9 (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends},
${epics:Depends},
Conflicts: epics-synapps,
Expand All @@ -25,7 +25,7 @@ Description: Bump-less reboot for IOCs
.
This package contains headers and libraries needed at build time.

Package: libautosave5.8
Package: libautosave5.9
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
Conflicts: epics-synapps,
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
export DH_VERBOSE=1

%:
dh $@ --with epics -Sepicsmake --parallel
dh $@ --with epics -Sepicsmake

override_dh_install:
dh_install --fail-missing
1 change: 0 additions & 1 deletion debian/source/options

This file was deleted.

11 changes: 11 additions & 0 deletions documentation/autosaveReleaseNotes.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@

<h1 align="center">autosave Release Notes</h1>

<h3>5.9</h3>
<ul>

<li>Added op/ui/autoconvert directory.

<li>New version of *Main.cpp file from base 3.15.5; contains epicsExit() after iocsh(NULL) which is needed for epicsAtExit() to work on Windows

<li>Use dbLoadRecordsHook by default. (This enables automated build of autosave request files.)

</ul>

<h3>5.8</h3>
<ul>

Expand Down