Skip to content

Commit

Permalink
Import optics version R2-14
Browse files Browse the repository at this point in the history
  • Loading branch information
esmith1729 committed Apr 16, 2024
1 parent 1d73abf commit 393d55a
Show file tree
Hide file tree
Showing 845 changed files with 797,700 additions and 425,935 deletions.
31 changes: 5 additions & 26 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,27 +1,6 @@
# Set the default behavior, in case people don't have core.autocrlf set.
#Which files need CRLF handling
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.cpp text
*.h text
*.hpp text
*.java text
*.sh text eol=lf
*.bat text
*.cmd text
*.db text
*.dbd text
*.template text
*.substitutions text

# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.class binary
*.vi binary

*.sh eol=lf
*.bat eol=crlf
*.cmd -text
*.html html
115 changes: 115 additions & 0 deletions .github/workflows/ci-scripts-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
# .github/workflows/ci-scripts-build.yml for use with EPICS Base ci-scripts
# (see: https://github.com/epics-base/ci-scripts)

# This is YAML - indentation levels are crucial

# Set the 'name:' properties to values that work for you (MYMODULE)

name: OPTICS

# Trigger on pushes and PRs to any branch
on:
push:
paths-ignore:
- 'documentation/*'
- '**/*.html'
- '**/*.md'
branches:
- master
pull_request:

env:
SETUP_PATH: .github/workflows:.ci
# For the sequencer on Linux/Windows/MacOS
APT: re2c
CHOCO: re2c
BREW: re2c

jobs:
build-base:
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
# Set environment variables from matrix parameters
env:
CMP: ${{ matrix.cmp }}
BCFG: ${{ matrix.configuration }}
WINE: ${{ matrix.wine }}
RTEMS: ${{ matrix.rtems }}
RTEMS_TARGET: ${{ matrix.rtems_target }}
EXTRA: ${{ matrix.extra }}
TEST: ${{ matrix.test }}
SET: ${{ matrix.set }}
strategy:
fail-fast: false
matrix:
# Job names also name artifacts, character limitations apply
include:
- os: ubuntu-20.04
cmp: gcc
configuration: default
set: stable_7_0
name: "Linux stable 7.0"

- os: ubuntu-20.04
cmp: gcc
configuration: default
set: stable_3_15
name: "Linux stable 3.15"

- os: ubuntu-20.04
cmp: gcc
configuration: default
set: master_7_0
name: "Linux master 7.0"

- os: ubuntu-20.04
cmp: gcc
configuration: default
set: master_3_15
name: "Linux master 3.15"

- os: macos-latest
cmp: clang
configuration: default
set: master_7_0
name: "MacOS master 7.0"

- os: windows-2022
cmp: vs2022
configuration: static
set: master_7_0
name: "Windows master 7.0"

steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Automatic core dumper analysis
uses: mdavidsaver/ci-core-dumper@master
- name: "apt-get install"
run: |
sudo apt-get update
sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
if: runner.os == 'Linux'
- name: "apt-get install ${{ matrix.cmp }}"
run: |
sudo apt-get -y install software-properties-common
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get -y install ${{ matrix.cmp }}
if: matrix.utoolchain
- name: Prepare and compile dependencies
run: python .ci/cue.py prepare
- name: Build main module
run: python .ci/cue.py build
- name: Run main module tests
run: python .ci/cue.py -T 15M test
- name: Upload tapfiles Artifact
uses: actions/upload-artifact@v2
with:
name: tapfiles ${{ matrix.name }}
path: '**/O.*/*.tap'
- name: Collect and show test results
run: python .ci/cue.py test-results


8 changes: 8 additions & 0 deletions .github/workflows/master_3_15.set
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
BASE="3.15"

MODULES="sncseq calc asyn busy"

BUSY="master"
ASYN="master"
CALC="master"
SNCSEQ="R2-2-9"
8 changes: 8 additions & 0 deletions .github/workflows/master_7_0.set
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
BASE="7.0"

MODULES="sncseq calc asyn busy"

BUSY="master"
ASYN="master"
CALC="master"
SNCSEQ="R2-2-9"
8 changes: 8 additions & 0 deletions .github/workflows/stable_3_15.set
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
BASE="3.15"

MODULES="sncseq calc asyn busy"

BUSY="R1-7-3"
ASYN="R4-42"
CALC="R3-7-4"
SNCSEQ="R2-2-9"
8 changes: 8 additions & 0 deletions .github/workflows/stable_7_0.set
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
BASE="R7.0.4.1"

MODULES="sncseq calc asyn busy"

BUSY="R1-7-3"
ASYN="R4-42"
CALC="R3-7-4"
SNCSEQ="R2-2-9"
32 changes: 20 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
O.*/
/db
/bin
/dbd
/include
/lib
/templates
envPaths
*~
O.*
*.swp
*BAK.adl
bin/
/db/
dbd/
html/
include/
/iocsh/
lib/
templates/
cdCommands
envPaths
dllPath.bat
runIOC.bat
runIOC.sh
relPaths.sh
.project
auto_settings.sav*
auto_positions.sav*
RELEASE.local

# bird droppings from IT
.log
.loglogin
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule ".ci"]
path = .ci
url = https://github.com/epics-base/ci-scripts
65 changes: 65 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@

Copyright (c) 2004 University of Chicago and the Regents of the University of
California. All rights reserved.

synApps is distributed subject to the following license conditions:
SOFTWARE LICENSE AGREEMENT
Software: synApps
Versions: Release 4-5 and higher.

1. The "Software", below, refers to synApps (in either source code, or
binary form and accompanying documentation). Each licensee is addressed
as "you" or "Licensee."

2. The copyright holders shown above and their third-party licensors hereby
grant Licensee a royalty-free nonexclusive license, subject to the
limitations stated herein and U.S. Government license rights.

3. You may modify and make a copy or copies of the Software for use within
your organization, if you meet the following conditions:
1. Copies in source code must include the copyright notice and this
Software License Agreement.
2. Copies in binary form must include the copyright notice and this
Software License Agreement in the documentation and/or other
materials provided with the copy.

4. You may modify a copy or copies of the Software or any portion of it, thus
forming a work based on the Software, and distribute copies of such work
outside your organization, if you meet all of the following conditions:
1. Copies in source code must include the copyright notice and this
Software License Agreement;
2. Copies in binary form must include the copyright notice and this
Software License Agreement in the documentation and/or other
materials provided with the copy;
3. Modified copies and works based on the Software must carry
prominent notices stating that you changed specified portions of
the Software.

5. Portions of the Software resulted from work developed under a
U.S. Government contract and are subject to the following license:
the Government is granted for itself and others acting on its behalf a
paid-up, nonexclusive, irrevocable worldwide license in this computer
software to reproduce, prepare derivative works, and perform publicly and
display publicly.

6. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY OF
ANY KIND. THE COPYRIGHT HOLDERS, THEIR THIRD PARTY LICENSORS, THE UNITED
STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND THEIR EMPLOYEES: (1)
DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY
OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS OF THE
SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE SOFTWARE WOULD NOT
INFRINGE PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT THAT THE SOFTWARE WILL
FUNCTION UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL BE
CORRECTED.

7. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR
THIRD PARTY LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF
ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, INCIDENTAL,
CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE,
INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA, FOR ANY
REASON WHATSOEVER, WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF
CONTRACT, TORT (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE,
EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE POSSIBILITY OF SUCH
LOSS OR DAMAGES.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Makefile at top of application tree
TOP = .
include $(TOP)/configure/CONFIG
DIRS += configure opticsApp iocBoot
DIRS += configure opticsApp tests
opticsApp_DEPEND_DIRS = configure
iocBoot_DEPEND_DIRS = configure opticsApp
tests_DEPEND_DIRS = configure opticsApp
include $(TOP)/configure/RULES_TOP
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[![OPTICS](https://github.com/epics-modules/optics/actions/workflows/ci-scripts-build.yml/badge.svg)](https://github.com/epics-modules/optics/actions/workflows/ci-scripts-build.yml)

# optics
APS BCDA synApps module: optics

For more information, see
https://epics.anl.gov/bcda/synApps/

[Report an issue with optics](https://github.com/epics-modules/optics/issues/new?title=%20ISSUE%20NAME%20HERE&body=**Describe%20the%20issue**%0A%0A**Steps%20to%20reproduce**%0A1.%20Step%20one%0A2.%20Step%20two%0A3.%20Step%20three%0A%0A**Expected%20behaivour**%0A%0A**Actual%20behaviour**%0A%0A**Build%20Environment**%0AArchitecture:%0AEpics%20Base%20Version:%0ADependent%20Module%20Versions:&labels=bug)
[Request a feature](https://github.com/epics-modules/optics/issues/new?title=%20FEATURE%20SHORT%20DESCRIPTION&body=**Feature%20Long%20Description**%0A%0A**Why%20should%20this%20be%20added?**%0A&labels=enhancement)

* [HTML documentation](https://epics-modules.github.io/optics/)


converted from APS SVN repository: Fri Nov 20 17:38:04 CST 2015

Regarding the license of tagged versions prior to synApps 4-5,
refer to https://epics.anl.gov/bcda/synApps/license.php
46 changes: 31 additions & 15 deletions configure/CONFIG
Original file line number Diff line number Diff line change
@@ -1,15 +1,31 @@
#CONFIG
include $(TOP)/configure/CONFIG_APP
# Add any changes to make definitions here

# At present, base has only 68040
#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 vxWorks-ppc604
#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040

# Use this when your IOC and the host use different paths
# to access the application. Typically this will be
# used with the Microsoft FTP server or with NFS mounts. Use
# is indicated by failure of the cdCommands script on
# vxWorks. You must rebuild in the iocBoot directory
# before this takes effect.
#IOCS_APPL_TOP = <the top of the application as seen by the IOC>
# CONFIG - Load build configuration data
#
# Do not make changes to this file!

# Allow user to override where the build rules come from
RULES = $(EPICS_BASE)

USR_CPPFLAGS += -DUSE_TYPED_RSET

# RELEASE files point to other application tops
include $(TOP)/configure/RELEASE
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
ifdef T_A
-include $(TOP)/configure/RELEASE.Common.$(T_A)
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
endif

CONFIG = $(RULES)/configure
include $(CONFIG)/CONFIG

# Override the Base definition:
INSTALL_LOCATION = $(TOP)

# CONFIG_SITE files contain other build configuration settings
include $(TOP)/configure/CONFIG_SITE
-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
ifdef T_A
-include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
endif

21 changes: 0 additions & 21 deletions configure/CONFIG_APP

This file was deleted.

Loading

0 comments on commit 393d55a

Please sign in to comment.