From e482d2ef4282e75a7ed7846ea27d8b1561dcab16 Mon Sep 17 00:00:00 2001 From: Martin Konrad Date: Thu, 10 Jan 2019 17:50:30 -0500 Subject: [PATCH 1/5] New upstream version 5.9 --- .ci/assemble_synApps.sh | 96 +++++++++++++++++++ .travis.yml | 32 +++++++ README.md | 2 + asApp/op/ui/.gitignore | 0 asApp/op/ui/autoconvert/.gitignore | 0 asApp/op/ui/{ => autoconvert}/SR_X_Status.ui | 0 asApp/op/ui/{ => autoconvert}/configMenu.ui | 0 .../{ => autoconvert}/configMenuHead_bare.ui | 0 .../ui/{ => autoconvert}/configMenu_bare1.ui | 0 .../ui/{ => autoconvert}/configMenu_more.ui | 0 .../configMenu_more_bare1.ui | 0 .../ui/{ => autoconvert}/configMenu_small.ui | 0 .../ui/{ => autoconvert}/configMenu_smallA.ui | 0 .../{ => autoconvert}/save_restoreStatus.ui | 0 .../save_restoreStatusLegend.ui | 0 .../save_restoreStatus_more.ui | 0 .../save_restoreStatus_tiny.ui | 0 asApp/src/Makefile | 7 +- asApp/src/asMain.cpp | 10 +- documentation/autosaveReleaseNotes.html | 11 +++ 20 files changed, 151 insertions(+), 7 deletions(-) create mode 100755 .ci/assemble_synApps.sh create mode 100644 .travis.yml create mode 100644 asApp/op/ui/.gitignore create mode 100644 asApp/op/ui/autoconvert/.gitignore rename asApp/op/ui/{ => autoconvert}/SR_X_Status.ui (100%) rename asApp/op/ui/{ => autoconvert}/configMenu.ui (100%) rename asApp/op/ui/{ => autoconvert}/configMenuHead_bare.ui (100%) rename asApp/op/ui/{ => autoconvert}/configMenu_bare1.ui (100%) rename asApp/op/ui/{ => autoconvert}/configMenu_more.ui (100%) rename asApp/op/ui/{ => autoconvert}/configMenu_more_bare1.ui (100%) rename asApp/op/ui/{ => autoconvert}/configMenu_small.ui (100%) rename asApp/op/ui/{ => autoconvert}/configMenu_smallA.ui (100%) rename asApp/op/ui/{ => autoconvert}/save_restoreStatus.ui (100%) rename asApp/op/ui/{ => autoconvert}/save_restoreStatusLegend.ui (100%) rename asApp/op/ui/{ => autoconvert}/save_restoreStatus_more.ui (100%) rename asApp/op/ui/{ => autoconvert}/save_restoreStatus_tiny.ui (100%) diff --git a/.ci/assemble_synApps.sh b/.ci/assemble_synApps.sh new file mode 100755 index 0000000..3bad795 --- /dev/null +++ b/.ci/assemble_synApps.sh @@ -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 <> 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 diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f1e7945 --- /dev/null +++ b/.travis.yml @@ -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 + diff --git a/README.md b/README.md index a1e4b78..d7f6a16 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/asApp/op/ui/.gitignore b/asApp/op/ui/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/asApp/op/ui/autoconvert/.gitignore b/asApp/op/ui/autoconvert/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/asApp/op/ui/SR_X_Status.ui b/asApp/op/ui/autoconvert/SR_X_Status.ui similarity index 100% rename from asApp/op/ui/SR_X_Status.ui rename to asApp/op/ui/autoconvert/SR_X_Status.ui diff --git a/asApp/op/ui/configMenu.ui b/asApp/op/ui/autoconvert/configMenu.ui similarity index 100% rename from asApp/op/ui/configMenu.ui rename to asApp/op/ui/autoconvert/configMenu.ui diff --git a/asApp/op/ui/configMenuHead_bare.ui b/asApp/op/ui/autoconvert/configMenuHead_bare.ui similarity index 100% rename from asApp/op/ui/configMenuHead_bare.ui rename to asApp/op/ui/autoconvert/configMenuHead_bare.ui diff --git a/asApp/op/ui/configMenu_bare1.ui b/asApp/op/ui/autoconvert/configMenu_bare1.ui similarity index 100% rename from asApp/op/ui/configMenu_bare1.ui rename to asApp/op/ui/autoconvert/configMenu_bare1.ui diff --git a/asApp/op/ui/configMenu_more.ui b/asApp/op/ui/autoconvert/configMenu_more.ui similarity index 100% rename from asApp/op/ui/configMenu_more.ui rename to asApp/op/ui/autoconvert/configMenu_more.ui diff --git a/asApp/op/ui/configMenu_more_bare1.ui b/asApp/op/ui/autoconvert/configMenu_more_bare1.ui similarity index 100% rename from asApp/op/ui/configMenu_more_bare1.ui rename to asApp/op/ui/autoconvert/configMenu_more_bare1.ui diff --git a/asApp/op/ui/configMenu_small.ui b/asApp/op/ui/autoconvert/configMenu_small.ui similarity index 100% rename from asApp/op/ui/configMenu_small.ui rename to asApp/op/ui/autoconvert/configMenu_small.ui diff --git a/asApp/op/ui/configMenu_smallA.ui b/asApp/op/ui/autoconvert/configMenu_smallA.ui similarity index 100% rename from asApp/op/ui/configMenu_smallA.ui rename to asApp/op/ui/autoconvert/configMenu_smallA.ui diff --git a/asApp/op/ui/save_restoreStatus.ui b/asApp/op/ui/autoconvert/save_restoreStatus.ui similarity index 100% rename from asApp/op/ui/save_restoreStatus.ui rename to asApp/op/ui/autoconvert/save_restoreStatus.ui diff --git a/asApp/op/ui/save_restoreStatusLegend.ui b/asApp/op/ui/autoconvert/save_restoreStatusLegend.ui similarity index 100% rename from asApp/op/ui/save_restoreStatusLegend.ui rename to asApp/op/ui/autoconvert/save_restoreStatusLegend.ui diff --git a/asApp/op/ui/save_restoreStatus_more.ui b/asApp/op/ui/autoconvert/save_restoreStatus_more.ui similarity index 100% rename from asApp/op/ui/save_restoreStatus_more.ui rename to asApp/op/ui/autoconvert/save_restoreStatus_more.ui diff --git a/asApp/op/ui/save_restoreStatus_tiny.ui b/asApp/op/ui/autoconvert/save_restoreStatus_tiny.ui similarity index 100% rename from asApp/op/ui/save_restoreStatus_tiny.ui rename to asApp/op/ui/autoconvert/save_restoreStatus_tiny.ui diff --git a/asApp/src/Makefile b/asApp/src/Makefile index d8f2275..7e36dd3 100644 --- a/asApp/src/Makefile +++ b/asApp/src/Makefile @@ -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 # .dbd will be created from Include.dbd DBD += as.dbd diff --git a/asApp/src/asMain.cpp b/asApp/src/asMain.cpp index cd6aa16..ae0ecb6 100644 --- a/asApp/src/asMain.cpp +++ b/asApp/src/asMain.cpp @@ -1,4 +1,5 @@ -/* asMain */ +/* _APPNAME_Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ #include #include @@ -6,16 +7,17 @@ #include #include +#include "epicsExit.h" +#include "epicsThread.h" #include "iocsh.h" -#include int main(int argc,char *argv[]) { - - if(argc>=2) { + if(argc>=2) { iocsh(argv[1]); epicsThreadSleep(.2); } iocsh(NULL); + epicsExit(0); return(0); } diff --git a/documentation/autosaveReleaseNotes.html b/documentation/autosaveReleaseNotes.html index bbcd9e7..3d22299 100644 --- a/documentation/autosaveReleaseNotes.html +++ b/documentation/autosaveReleaseNotes.html @@ -10,6 +10,17 @@

autosave Release Notes

+

5.9

+
    + +
  • Added op/ui/autoconvert directory. + +
  • 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 + +
  • Use dbLoadRecordsHook by default. (This enables automated build of autosave request files.) + +
+

5.8

    From e2bc206c6e281922ba87b1ecf782acd46629dc51 Mon Sep 17 00:00:00 2001 From: Martin Konrad Date: Thu, 10 Jan 2019 17:51:59 -0500 Subject: [PATCH 2/5] Bump up versions in library names --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 1cf7a29..b634580 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ 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, @@ -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, From cdbe4f607dc5e2c4fc7470c18a6bee990cf22bb7 Mon Sep 17 00:00:00 2001 From: Martin Konrad Date: Thu, 10 Jan 2019 17:53:39 -0500 Subject: [PATCH 3/5] Update changelog for 5.9-1 release --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4ea1fe1..112ddbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +autosave (5.9-1) unstable; urgency=medium + + * New upstream version 5.9 + * Bump up versions in library names + + -- Martin Konrad Thu, 10 Jan 2019 17:53:39 -0500 + autosave (5.8-2) unstable; urgency=medium * Use build profile to enable RTEMS cross build From 1a1b210e53dbce3dd6e3f4c3758f08fb40cea65f Mon Sep 17 00:00:00 2001 From: Martin Konrad Date: Mon, 15 Jul 2019 08:36:41 -0400 Subject: [PATCH 4/5] Bump up standards version and debhelper version --- debian/compat | 2 +- debian/control | 8 ++++---- debian/rules | 2 +- debian/source/options | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 debian/source/options diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index b634580..a9572c9 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,15 @@ Source: autosave Section: libdevel -Priority: extra -Maintainer: mdavidsaver -Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14), +Priority: optional +Maintainer: Martin Konrad +Build-Depends: debhelper (>= 10), dpkg-dev (>= 1.17.14), epics-debhelper (>= 8.14~), epics-dev, rtems-epics-mvme2100 , rtems-epics-mvme3100 , rtems-epics-mvme5500 , rtems-epics-pc386 , 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 diff --git a/debian/rules b/debian/rules index 51c1722..832fe20 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ export DH_VERBOSE=1 %: - dh $@ --with epics -Sepicsmake --parallel + dh $@ --with epics -Sepicsmake override_dh_install: dh_install --fail-missing diff --git a/debian/source/options b/debian/source/options deleted file mode 100644 index 62d9178..0000000 --- a/debian/source/options +++ /dev/null @@ -1 +0,0 @@ -compression-level = 9 From effed6715954863018c2e6ae5c61e063e370d77d Mon Sep 17 00:00:00 2001 From: Martin Konrad Date: Mon, 15 Jul 2019 08:39:05 -0400 Subject: [PATCH 5/5] Release 5.9-2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 112ddbb..607c121 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +autosave (5.9-2) unstable; urgency=medium + + * Bump up standards version to 4.3.0 + + -- Martin Konrad Mon, 15 Jul 2019 08:38:50 -0400 + autosave (5.9-1) unstable; urgency=medium * New upstream version 5.9