From 4dc9dce9145c018bdfeddbe74841c8e52e03b0a1 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 14 Jan 2025 09:57:50 +0100 Subject: [PATCH 01/12] Improve comment in Linux CONFIG_SITE, remove debris --- configure/CONFIG_SITE.Common.linux-x86_64 | 3 +-- configure/CONFIG_SITE.Common.linux-x86_64-centos8 | 2 -- configure/CONFIG_SITE.Common.linux-x86_64-ub22 | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 configure/CONFIG_SITE.Common.linux-x86_64-centos8 delete mode 100644 configure/CONFIG_SITE.Common.linux-x86_64-ub22 diff --git a/configure/CONFIG_SITE.Common.linux-x86_64 b/configure/CONFIG_SITE.Common.linux-x86_64 index d500d713c..a7cbc8f41 100644 --- a/configure/CONFIG_SITE.Common.linux-x86_64 +++ b/configure/CONFIG_SITE.Common.linux-x86_64 @@ -4,6 +4,5 @@ # If your system has libftdi1, set the following to YES. If it has libftdi, set it to NO #DRV_FTDI_USE_LIBFTDI1=YES -# If your system has tirpc, set the following to YES. +# If your system has tirpc (Linux does), set the following to YES. TIRPC=YES - diff --git a/configure/CONFIG_SITE.Common.linux-x86_64-centos8 b/configure/CONFIG_SITE.Common.linux-x86_64-centos8 deleted file mode 100644 index 28e1e7827..000000000 --- a/configure/CONFIG_SITE.Common.linux-x86_64-centos8 +++ /dev/null @@ -1,2 +0,0 @@ -TIRPC=YES - diff --git a/configure/CONFIG_SITE.Common.linux-x86_64-ub22 b/configure/CONFIG_SITE.Common.linux-x86_64-ub22 deleted file mode 100644 index 28e1e7827..000000000 --- a/configure/CONFIG_SITE.Common.linux-x86_64-ub22 +++ /dev/null @@ -1,2 +0,0 @@ -TIRPC=YES - From bc59a1ca99bd49d511d21fba1be96affe1614304 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 14 Jan 2025 10:55:51 +0100 Subject: [PATCH 02/12] ci: merge improvements from Base GitHub configuration - improve job name - bump versions v3->v4 for actions/checkout and actions/upload-artifact - make artifact name unique (needed for action v4) --- .github/workflows/ci-scripts.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml index fb4356dc1..1965e1c76 100644 --- a/.github/workflows/ci-scripts.yml +++ b/.github/workflows/ci-scripts.yml @@ -1,12 +1,22 @@ -name: asyn +name: Build from source (ci-scripts) # Trigger on pushes and PRs to any branch on: push: paths-ignore: + - 'documentation/*' + - '.gitattributes' + - '**/*.html' - '**/*.md' - '**/*.txt' pull_request: + paths-ignore: + - 'documentation/*' + - '.gitattributes' + - '**/*.html' + - '**/*.md' + - '**/*.txt' + workflow_dispatch: env: SETUP_PATH: .ci-local:.ci @@ -101,7 +111,7 @@ jobs: # deps: "no-deps" # cross: "RTEMS-pc686-qemu@5" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true @@ -119,9 +129,9 @@ jobs: - name: Upload tapfiles Artifact if: ${{ always() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: tapfiles ${{ matrix.name }} + name: "tapfiles ${{ matrix.name }}" path: '**/O.*/*.tap' if-no-files-found: ignore From bc866b1194b01ded25c6b4db9757ca04d5ec0365 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 14 Jan 2025 10:31:17 +0100 Subject: [PATCH 03/12] ci: install libtirpc-dev on Ubuntu runner - Ubuntu-24.04 runner (ubuntu-latest as of Jan 2025) doesn't have it pre-installed --- .github/workflows/ci-scripts.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml index 1965e1c76..dd8023d20 100644 --- a/.github/workflows/ci-scripts.yml +++ b/.github/workflows/ci-scripts.yml @@ -32,7 +32,7 @@ jobs: SET: ${{ matrix.deps }} CI_CROSS_TARGETS: ${{ matrix.cross }} TEST: ${{ matrix.test }} - APT: re2c + APT: re2c libtirpc-dev CHOCO: re2c BREW: re2c @@ -118,9 +118,6 @@ jobs: - name: Prepare and compile EPICS dependencies run: python .ci/cue.py prepare - - name: TIRPC - run: echo TIRPC=YES > configure/CONFIG_SITE.Common.linux-x86_64 - - name: Build main module run: python .ci/cue.py build From b2b6ac0d4f79ad7d6f53b8513b15a572baef5aef Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 14 Jan 2025 10:55:34 +0100 Subject: [PATCH 04/12] ci: minimize BASE_RECURSIVE=NO setting --- .ci-local/deps-latest.set | 2 -- .ci-local/deps1.set | 2 -- .ci-local/deps2.set | 2 -- .ci-local/no-deps.set | 2 -- .github/workflows/ci-scripts.yml | 1 + 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.ci-local/deps-latest.set b/.ci-local/deps-latest.set index 4a2a26378..87d1dc21b 100644 --- a/.ci-local/deps-latest.set +++ b/.ci-local/deps-latest.set @@ -1,7 +1,5 @@ MODULES="sncseq sscan calc ipac" -BASE_RECURSIVE=no - SNCSEQ=master SSCAN=master CALC=master diff --git a/.ci-local/deps1.set b/.ci-local/deps1.set index 34dc30a23..ceea2828e 100644 --- a/.ci-local/deps1.set +++ b/.ci-local/deps1.set @@ -1,7 +1,5 @@ MODULES="sncseq sscan calc ipac" -BASE_RECURSIVE=no - SNCSEQ=R2-2-8 SSCAN=R2-11-3 CALC=R3-7-3 diff --git a/.ci-local/deps2.set b/.ci-local/deps2.set index 6f0fcae98..b78e0b464 100644 --- a/.ci-local/deps2.set +++ b/.ci-local/deps2.set @@ -1,7 +1,5 @@ MODULES="sncseq sscan calc ipac" -BASE_RECURSIVE=no - SNCSEQ=R2-2-8 SSCAN=R2-11-5 CALC=R3-7-4 diff --git a/.ci-local/no-deps.set b/.ci-local/no-deps.set index 45d901f82..bc5b53881 100644 --- a/.ci-local/no-deps.set +++ b/.ci-local/no-deps.set @@ -1,3 +1 @@ MODULES="" - -BASE_RECURSIVE=no diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml index dd8023d20..c79194d48 100644 --- a/.github/workflows/ci-scripts.yml +++ b/.github/workflows/ci-scripts.yml @@ -20,6 +20,7 @@ on: env: SETUP_PATH: .ci-local:.ci + BASE_RECURSIVE: NO jobs: test: From 3d70efef96227220247b2b370c30bb9dff623526 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 15 Jan 2025 11:08:07 +0100 Subject: [PATCH 05/12] ci: improve job names; fix artifact upload --- .github/workflows/ci-scripts.yml | 68 +++++++++++++++++++------------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml index c79194d48..a097bb153 100644 --- a/.github/workflows/ci-scripts.yml +++ b/.github/workflows/ci-scripts.yml @@ -1,4 +1,4 @@ -name: Build from source (ci-scripts) +name: Build and Test # Trigger on pushes and PRs to any branch on: @@ -24,7 +24,7 @@ env: jobs: test: - name: ${{ matrix.os }}/${{ matrix.deps }}/${{ matrix.base }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.cross }} + name: ${{ matrix.name }} runs-on: ${{ matrix.os }} env: CMP: ${{ matrix.cmp }} @@ -42,62 +42,72 @@ jobs: matrix: # Job names also name artifacts, character limitations apply include: - - os: ubuntu-latest + - name: Linux Base7.0 + os: ubuntu-latest cmp: gcc configuration: default base: "7.0" deps: "deps2" - - os: ubuntu-latest + - name: Linux Base7.0 static + os: ubuntu-latest cmp: gcc configuration: static base: "7.0" deps: "deps2" - - os: ubuntu-latest + - name: Linux Base3.15 + os: ubuntu-latest + cmp: gcc + configuration: default + base: "3.15" + deps: "deps2" + + - name: Linux Base3.15 static + os: ubuntu-latest cmp: gcc configuration: static - base: "7.0" + base: "3.15" deps: "deps2" - - os: ubuntu-latest + - name: Linux Base3.15 no-deps + os: ubuntu-latest cmp: gcc configuration: default base: "3.15" deps: "no-deps" - - os: ubuntu-latest + - name: Linux Base3.14 deps1 + os: ubuntu-latest cmp: gcc - configuration: static - base: "3.15" - deps: "deps2" - -# - os: ubuntu-latest -# cmp: gcc -# configuration: static -# base: "3.14" -# deps: "deps1" + configuration: default + base: "3.14" + deps: "deps1" - - os: windows-2019 + - name: Win2019 Base7.0 DLL + os: windows-2019 cmp: vs2019 configuration: default base: "7.0" deps: "deps2" - - os: windows-2019 + - name: Win2019 Base7.0 static + os: windows-2019 cmp: vs2019 configuration: static base: "7.0" deps: "deps2" - - os: ubuntu-latest + - name: RTEMS-4.9 Base7.0 + os: ubuntu-latest cmp: gcc configuration: default base: "7.0" deps: "no-deps" cross: "RTEMS-pc386-qemu@4.9" - - os: ubuntu-latest + - name: RTEMS-4.10 Base7.0 + os: ubuntu-latest cmp: gcc configuration: default base: "7.0" @@ -105,12 +115,14 @@ jobs: cross: "RTEMS-pc386-qemu@4.10" test: NO -# - os: ubuntu-latest -# cmp: gcc -# configuration: default -# base: "7.0" -# deps: "no-deps" -# cross: "RTEMS-pc686-qemu@5" + - name: RTEMS-5 Base7.0 + os: ubuntu-latest + cmp: gcc + configuration: default + base: "7.0" + deps: "no-deps" + cross: "RTEMS-pc686-qemu@5" + steps: - uses: actions/checkout@v4 with: @@ -129,7 +141,7 @@ jobs: if: ${{ always() }} uses: actions/upload-artifact@v4 with: - name: "tapfiles ${{ matrix.name }}" + name: tapfiles ${{ matrix.name }} path: '**/O.*/*.tap' if-no-files-found: ignore From 014cc5e144be7dab98fd0a919dcd36da01ffa3d4 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 15 Jan 2025 14:28:44 +0100 Subject: [PATCH 06/12] ci: install Base prerequisites on GHA runners - add libreadline-dev --- .github/workflows/ci-scripts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml index a097bb153..e2d168b4b 100644 --- a/.github/workflows/ci-scripts.yml +++ b/.github/workflows/ci-scripts.yml @@ -33,7 +33,7 @@ jobs: SET: ${{ matrix.deps }} CI_CROSS_TARGETS: ${{ matrix.cross }} TEST: ${{ matrix.test }} - APT: re2c libtirpc-dev + APT: re2c libtirpc-dev libreadline-dev CHOCO: re2c BREW: re2c From 1fb06ad88b5d8bf39b28ca9fc3c7670eb99b146c Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 15 Jan 2025 16:46:57 +0100 Subject: [PATCH 07/12] ci: reorganize job settings - remove unnecessary settings - create settings for synapps 5.8, 6.0 and 6.3 - use these settings in the ci-scripts-build - use reasonable defaults - make the default builds use dependency defaults --- .ci-local/deps-latest.set | 6 --- .ci-local/deps1.set | 6 --- .ci-local/deps2.set | 6 --- .ci-local/no-deps.set | 1 - .ci-local/synapps-5.8.set | 5 ++ .ci-local/synapps-6.0.set | 5 ++ .ci-local/synapps-6.3.set | 5 ++ .../{ci-scripts.yml => ci-scripts-build.yml} | 50 ++++++++++++------- 8 files changed, 48 insertions(+), 36 deletions(-) delete mode 100644 .ci-local/deps-latest.set delete mode 100644 .ci-local/deps1.set delete mode 100644 .ci-local/deps2.set delete mode 100644 .ci-local/no-deps.set create mode 100644 .ci-local/synapps-5.8.set create mode 100644 .ci-local/synapps-6.0.set create mode 100644 .ci-local/synapps-6.3.set rename .github/workflows/{ci-scripts.yml => ci-scripts-build.yml} (78%) diff --git a/.ci-local/deps-latest.set b/.ci-local/deps-latest.set deleted file mode 100644 index 87d1dc21b..000000000 --- a/.ci-local/deps-latest.set +++ /dev/null @@ -1,6 +0,0 @@ -MODULES="sncseq sscan calc ipac" - -SNCSEQ=master -SSCAN=master -CALC=master -IPAC=master diff --git a/.ci-local/deps1.set b/.ci-local/deps1.set deleted file mode 100644 index ceea2828e..000000000 --- a/.ci-local/deps1.set +++ /dev/null @@ -1,6 +0,0 @@ -MODULES="sncseq sscan calc ipac" - -SNCSEQ=R2-2-8 -SSCAN=R2-11-3 -CALC=R3-7-3 -IPAC=2.15 diff --git a/.ci-local/deps2.set b/.ci-local/deps2.set deleted file mode 100644 index b78e0b464..000000000 --- a/.ci-local/deps2.set +++ /dev/null @@ -1,6 +0,0 @@ -MODULES="sncseq sscan calc ipac" - -SNCSEQ=R2-2-8 -SSCAN=R2-11-5 -CALC=R3-7-4 -IPAC=2.16 diff --git a/.ci-local/no-deps.set b/.ci-local/no-deps.set deleted file mode 100644 index bc5b53881..000000000 --- a/.ci-local/no-deps.set +++ /dev/null @@ -1 +0,0 @@ -MODULES="" diff --git a/.ci-local/synapps-5.8.set b/.ci-local/synapps-5.8.set new file mode 100644 index 000000000..0c97c38d9 --- /dev/null +++ b/.ci-local/synapps-5.8.set @@ -0,0 +1,5 @@ +SNCSEQ=R2-2-1 +SSCAN=R2-10-1 +CALC=R3-4-2-1 +IPAC=2.12 +BASE=R3.14.12.4 diff --git a/.ci-local/synapps-6.0.set b/.ci-local/synapps-6.0.set new file mode 100644 index 000000000..b4ba6769a --- /dev/null +++ b/.ci-local/synapps-6.0.set @@ -0,0 +1,5 @@ +SNCSEQ=R2-2-5 +SSCAN=R2-11-1 +CALC=R3-7-1 +IPAC=2.15 +BASE=R3.15.5 diff --git a/.ci-local/synapps-6.3.set b/.ci-local/synapps-6.3.set new file mode 100644 index 000000000..f5215c9dd --- /dev/null +++ b/.ci-local/synapps-6.3.set @@ -0,0 +1,5 @@ +SNCSEQ=R2-2-9 +SSCAN=R2-11-5 +CALC=R3-7-4 +IPAC=2.16 +BASE=R7.0.4.1 diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts-build.yml similarity index 78% rename from .github/workflows/ci-scripts.yml rename to .github/workflows/ci-scripts-build.yml index e2d168b4b..ceed26188 100644 --- a/.github/workflows/ci-scripts.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -21,6 +21,10 @@ on: env: SETUP_PATH: .ci-local:.ci BASE_RECURSIVE: NO + MODULES: "sncseq sscan calc ipac" + APT: re2c libtirpc-dev libreadline-dev + CHOCO: re2c + BREW: re2c jobs: test: @@ -33,9 +37,6 @@ jobs: SET: ${{ matrix.deps }} CI_CROSS_TARGETS: ${{ matrix.cross }} TEST: ${{ matrix.test }} - APT: re2c libtirpc-dev libreadline-dev - CHOCO: re2c - BREW: re2c strategy: fail-fast: false @@ -47,63 +48,80 @@ jobs: cmp: gcc configuration: default base: "7.0" - deps: "deps2" - name: Linux Base7.0 static os: ubuntu-latest cmp: gcc configuration: static base: "7.0" - deps: "deps2" - name: Linux Base3.15 os: ubuntu-latest cmp: gcc configuration: default base: "3.15" - deps: "deps2" - name: Linux Base3.15 static os: ubuntu-latest cmp: gcc configuration: static base: "3.15" - deps: "deps2" - - name: Linux Base3.15 no-deps + - name: Linux Base7.0 synapps-6.3 os: ubuntu-latest cmp: gcc configuration: default - base: "3.15" - deps: "no-deps" + base: "7.0" + deps: "synapps-6.3" + + - name: Linux (Base7.0.4.1) synapps-6.3 + os: ubuntu-latest + cmp: gcc + configuration: default + deps: "synapps-6.3" + + - name: Linux (Base3.15.5) synapps-6.0 + os: ubuntu-latest + cmp: gcc + configuration: default + deps: "synapps-6.0" - - name: Linux Base3.14 deps1 + - name: Linux Base3.14 synapps-6.0 os: ubuntu-latest cmp: gcc configuration: default base: "3.14" - deps: "deps1" + deps: "synapps-6.0" + + - name: Linux (Base3.14.12.4) synapps-5.8 + os: ubuntu-latest + cmp: gcc + configuration: default + deps: "synapps-5.8" + + - name: Linux Base3.15 no-deps + os: ubuntu-latest + cmp: gcc + configuration: default + base: "3.15" - name: Win2019 Base7.0 DLL os: windows-2019 cmp: vs2019 configuration: default base: "7.0" - deps: "deps2" - name: Win2019 Base7.0 static os: windows-2019 cmp: vs2019 configuration: static base: "7.0" - deps: "deps2" - name: RTEMS-4.9 Base7.0 os: ubuntu-latest cmp: gcc configuration: default base: "7.0" - deps: "no-deps" cross: "RTEMS-pc386-qemu@4.9" - name: RTEMS-4.10 Base7.0 @@ -111,7 +129,6 @@ jobs: cmp: gcc configuration: default base: "7.0" - deps: "no-deps" cross: "RTEMS-pc386-qemu@4.10" test: NO @@ -120,7 +137,6 @@ jobs: cmp: gcc configuration: default base: "7.0" - deps: "no-deps" cross: "RTEMS-pc686-qemu@5" steps: From e7081cfd11f0e7bef28923b250295d07ece9ec14 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 15 Jan 2025 15:07:04 +0100 Subject: [PATCH 08/12] ci: build synapps-sets on Base branches (not releases) --- .ci-local/synapps-5.8.set | 3 ++- .ci-local/synapps-6.0.set | 3 ++- .ci-local/synapps-6.3.set | 3 ++- .github/workflows/ci-scripts-build.yml | 11 ++--------- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.ci-local/synapps-5.8.set b/.ci-local/synapps-5.8.set index 0c97c38d9..0ed881f4f 100644 --- a/.ci-local/synapps-5.8.set +++ b/.ci-local/synapps-5.8.set @@ -2,4 +2,5 @@ SNCSEQ=R2-2-1 SSCAN=R2-10-1 CALC=R3-4-2-1 IPAC=2.12 -BASE=R3.14.12.4 + +BASE=3.14 diff --git a/.ci-local/synapps-6.0.set b/.ci-local/synapps-6.0.set index b4ba6769a..1d525a6fb 100644 --- a/.ci-local/synapps-6.0.set +++ b/.ci-local/synapps-6.0.set @@ -2,4 +2,5 @@ SNCSEQ=R2-2-5 SSCAN=R2-11-1 CALC=R3-7-1 IPAC=2.15 -BASE=R3.15.5 + +BASE=3.15 diff --git a/.ci-local/synapps-6.3.set b/.ci-local/synapps-6.3.set index f5215c9dd..df467a05f 100644 --- a/.ci-local/synapps-6.3.set +++ b/.ci-local/synapps-6.3.set @@ -2,4 +2,5 @@ SNCSEQ=R2-2-9 SSCAN=R2-11-5 CALC=R3-7-4 IPAC=2.16 -BASE=R7.0.4.1 + +BASE=7.0 diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index ceed26188..4d0500e68 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -68,19 +68,12 @@ jobs: base: "3.15" - name: Linux Base7.0 synapps-6.3 - os: ubuntu-latest - cmp: gcc - configuration: default - base: "7.0" - deps: "synapps-6.3" - - - name: Linux (Base7.0.4.1) synapps-6.3 os: ubuntu-latest cmp: gcc configuration: default deps: "synapps-6.3" - - name: Linux (Base3.15.5) synapps-6.0 + - name: Linux Base3.15 synapps-6.0 os: ubuntu-latest cmp: gcc configuration: default @@ -93,7 +86,7 @@ jobs: base: "3.14" deps: "synapps-6.0" - - name: Linux (Base3.14.12.4) synapps-5.8 + - name: Linux Base3.14 synapps-5.8 os: ubuntu-latest cmp: gcc configuration: default From 5fe0a4953e227fb1421aaed561d1e327fca3de86 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 15 Jan 2025 15:10:37 +0100 Subject: [PATCH 09/12] ci: add job for MacOS --- .github/workflows/ci-scripts-build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml index 4d0500e68..6d4f3949b 100644 --- a/.github/workflows/ci-scripts-build.yml +++ b/.github/workflows/ci-scripts-build.yml @@ -98,6 +98,11 @@ jobs: configuration: default base: "3.15" + - name: MacOS Base7.0 + os: macos-latest + cmp: clang + configuration: default + - name: Win2019 Base7.0 DLL os: windows-2019 cmp: vs2019 From 52639b85b295c364bfe00caea22839030666e04b Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 15 Jan 2025 16:18:38 +0100 Subject: [PATCH 10/12] ci: add patch for sscan-2.10.1 (synapps-5.8) --- .ci-local/sscan-2.10.1-fix.patch | 20 ++++++++++++++++++++ .ci-local/synapps-5.8.set | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 .ci-local/sscan-2.10.1-fix.patch diff --git a/.ci-local/sscan-2.10.1-fix.patch b/.ci-local/sscan-2.10.1-fix.patch new file mode 100644 index 000000000..697c65c28 --- /dev/null +++ b/.ci-local/sscan-2.10.1-fix.patch @@ -0,0 +1,20 @@ +diff --git a/sscanApp/src/Makefile b/sscanApp/src/Makefile +index 7853dcb..012e246 100644 +--- a/sscanApp/src/Makefile ++++ b/sscanApp/src/Makefile +@@ -44,15 +44,7 @@ ifdef SNCSEQ + endif + + # save scan data stuff +-# XDR not available on WIN32 +-ifeq ($(OS_CLASS), WIN32) + sscan_SRCS += saveData_writeXDR.c, writeXDR.c +-else +-sscan_SRCS += xdr_lib.c +-sscan_SRCS += saveData.c +-sscan_SRCS_vxWorks += xdr_stdio.c +-sscan_SYS_LIBS_cygwin32 += $(CYGWIN_RPC_LIB) +-endif + + # for scanProgress + ifdef SNCSEQ diff --git a/.ci-local/synapps-5.8.set b/.ci-local/synapps-5.8.set index 0ed881f4f..de5ca095c 100644 --- a/.ci-local/synapps-5.8.set +++ b/.ci-local/synapps-5.8.set @@ -4,3 +4,5 @@ CALC=R3-4-2-1 IPAC=2.12 BASE=3.14 + +SSCAN_HOOK=.ci-local/sscan-2.10.1-fix.patch From f6b6265d1cbaae48b06f07cec5ee6cda08b40ea1 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Sun, 19 Jan 2025 10:39:20 +0100 Subject: [PATCH 11/12] ci: update AppVeyor setup - integrate features/changes from Base - use the new setup files - 'cinst' -> 'choco install' (Chocolatey dropped the alias) --- .appveyor.yml | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7590fb783..d426b0786 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -33,17 +33,7 @@ skip_commits: - 'templates/*' - '**/*.html' - '**/*.md' - - '.travis.yml' - -#---------------------------------# -# additional packages # -#---------------------------------# - -install: -# fetch submodules (like ci-scripts) - - cmd: git submodule update --init --recursive -# for the sequencer - - cinst re2c + - ".github/*" #---------------------------------# # build matrix configuration # @@ -89,33 +79,23 @@ configuration: environment: # common / default variables for all jobs SETUP_PATH: .ci-local:.ci + BASE: "7.0" matrix: + - CMP: gcc - CMP: vs2019 - BASE: "7.0" - SET: "deps2" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - - CMP: gcc - BASE: "7.0" - SET: "deps2" - CMP: vs2019 BASE: "3.15" - SET: "deps2" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CMP: vs2019 BASE: "3.14" - SET: "deps1" + SET: "synapps-6.0" APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - #- CMP: vs2017 - # BASE: "7.0" - # SET: "deps2" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - CMP: vs2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - CMP: vs2015 - BASE: "7.0" - SET: "deps2" - #- CMP: vs2013 - # BASE: "7.0" - # SET: "deps2" + - CMP: vs2013 # Platform: processor architecture platform: @@ -125,28 +105,46 @@ platform: # Matrix configuration: exclude sets of jobs matrix: exclude: + # VS2012 and older installs don't have the 64 bit compiler + - platform: x64 + CMP: vs2012 + - platform: x64 + CMP: vs2010 # Exclude more jobs to reduce build time # E.g., skip 32-bit for newer compilers - platform: x86 CMP: vs2019 - #- platform: x86 - # CMP: vs2015 + # MinGW debug builds use the same libraries, unlike VS + - configuration: dynamic-debug + CMP: gcc + - configuration: static-debug + CMP: gcc #---------------------------------# # building & testing # #---------------------------------# -build_script: +install: + - cmd: git submodule update --init --recursive +# for the sequencer + - choco install re2c + - cmd: pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper - cmd: python .ci/cue.py prepare + +build_script: - cmd: python .ci/cue.py build test_script: + - cmd: python -m ci_core_dumper install - cmd: python .ci/cue.py -T 20M test on_finish: - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } - cmd: python .ci/cue.py -T 5M test-results +on_failure: + - cmd: python -m ci_core_dumper report + #---------------------------------# # debugging # #---------------------------------# From 3e5c29c6ae4029f246d35c372c1dc238086e8339 Mon Sep 17 00:00:00 2001 From: Heinz Junkes Date: Thu, 30 Jan 2025 09:49:56 +0100 Subject: [PATCH 12/12] Make support for vxi11 optional --- RELEASE.md | 7 +++++++ asyn/Makefile | 4 ++++ configure/CONFIG_SITE | 3 +++ testGpibApp/src/Makefile | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index f56cd741a..3904fd559 100755 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,5 +1,12 @@ # asynDriver: Release Notes +## Release 4-46 (XXX, 2025) +- devVxi11 + - Make VXI11 support (for VISA systems) optional. + VXI11 is broken on RTEMS-5 and rarely required for real-time system IOCs. + By default enabled via setting DRV_VXI11=YES in configure/CONFIG_SITE. (Except RTEMS-5.) + - Thanks to Heinz Junkes for this. + ## Release 4-45 (December 1, 2024) - asynManager, asynPortDriver - Add support for destructable ports. diff --git a/asyn/Makefile b/asyn/Makefile index 3f803f489..608900159 100644 --- a/asyn/Makefile +++ b/asyn/Makefile @@ -215,6 +215,7 @@ ifneq ($(EPICS_LIBCOM_ONLY),YES) DB += asynRecord.db endif +ifeq ($(DRV_VXI11),YES) SRC_DIRS += $(ASYN)/vxi11 ifeq ($(OS_CLASS), WIN32) asyn_SRCS += drvVxi11Win32.c @@ -226,6 +227,7 @@ asyn_SRCS += E5810Reboot.c asyn_SRCS += E2050Reboot.c asyn_SRCS += TDS3000Reboot.c DBD += drvVxi11.dbd +endif SRC_DIRS += $(ASYN)/drvPrologixGPIB asyn_SRCS += drvPrologixGPIB.c @@ -242,9 +244,11 @@ endif ifneq (, $(findstring RTEMS, $(T_A))) DRV_USBTMC = NO + DRV_VXI11 = NO endif ifneq (, $(findstring vxWorks, $(T_A))) DRV_USBTMC = NO + DRV_VXI11 = NO endif ifeq ($(DRV_USBTMC),YES) SRC_DIRS += $(ASYN)/drvAsynUSBTMC diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 538cd55ce..b6a3bec49 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -36,6 +36,9 @@ CHECK_RELEASE = YES # then set LINUX_GPIB=YES LINUX_GPIB=NO +# If you have rpc-lib installed and want to have support for VISA devices (VXI11) set DRV_VXI11=YES +#DRV_VXI11=YES + # If you have libusb-1.0 revision 16 or newer and want the USB TMC support set DRV_USBTMC=YES #DRV_USBTMC=YES diff --git a/testGpibApp/src/Makefile b/testGpibApp/src/Makefile index 20957003d..27c13fdb6 100644 --- a/testGpibApp/src/Makefile +++ b/testGpibApp/src/Makefile @@ -10,7 +10,7 @@ ASYN_LIB = $(TOP)/lib/$(T_A) ASYN_BIN = $(TOP)/bin/$(T_A) USR_CFLAGS += -DUSE_TYPED_RSET -DUSE_TYPED_DSET -DUSE_TYPED_DRVET - +ifeq ($(DRV_VXI11),YES) DBD += devTestGpib.dbd DBD += testGpib.dbd @@ -61,7 +61,7 @@ testGpibVx_LIBS += $(EPICS_BASE_IOC_LIBS) #=========================== - +endif include $(TOP)/configure/RULES #---------------------------------------- # ADD RULES AFTER THIS LINE