Skip to content
Snippets Groups Projects
Commit b4103518 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Merge branch 'master' of eicweb.phy.anl.gov:controls/epics/epics_bootstrap

parents b4ad78e0 f939fc72
No related branches found
No related tags found
No related merge requests found
...@@ -18,11 +18,17 @@ cd epics ...@@ -18,11 +18,17 @@ cd epics
## Dependencies ## Dependencies
### Ubuntu
Should be installed by `bootstrap_epics` Should be installed by `bootstrap_epics`
``` ```
sudo apt-get install re2c libreadline-dev sudo apt-get install re2c libreadline-dev
``` ```
### libXp
https://askubuntu.com/questions/944838/libxp-so-6-missing-for-ubuntu-17-04
## IOCs ## IOCs
### Python IOC ### Python IOC
...@@ -40,4 +46,23 @@ wget https://epics.anl.gov/bcda/synApps/tar/synApps_6_0.tar.gz ...@@ -40,4 +46,23 @@ wget https://epics.anl.gov/bcda/synApps/tar/synApps_6_0.tar.gz
``` ```
### Synapps fix
#### asyn/stream headers
In `asyn/include`, `stream/include`
```
sed -i \
-e 's|epicsShareFunc|DBCORE_API|g' \
-e 's|epicsShareClass|DBCORE_API|g' \
-e 's|epicsShareExtern|DBCORE_API extern|g' \
-e 's|epicsShareDef\s*||g' \
-e 's|shareLib\.h|dbCoreAPI.h|g' \
-e 's|epicsShareAPI|epicsStdCall|g' \
-e '/#define\s*epicsExportSharedSymbols/d' *.h
```
Also include the `.c` and `.cc` files in `stream/src`
...@@ -88,7 +88,7 @@ if [[ $? ]] ; then ...@@ -88,7 +88,7 @@ if [[ $? ]] ; then
if [[ "$?" == "0" ]] ; then if [[ "$?" == "0" ]] ; then
sudo apt-get install -y \ sudo apt-get install -y \
re2c libreadline-dev libusb-dev \ re2c libreadline-dev libusb-dev \
libusb-java libusb-1.0-0-dev libnet1-dev \ libusb-java libusb-1.0-0-dev libnet1-dev libavl-dev \
python-pip \ python-pip \
libpcap-dev libx11-dev libxext-dev python-numpy libpcap-dev libx11-dev libxext-dev python-numpy
if [[ "$(uname -m)" == "aarch64" ]] ; then if [[ "$(uname -m)" == "aarch64" ]] ; then
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# When deploying, change "TOP" # When deploying, change "TOP"
# to the absolute installation path # to the absolute installation path
TOP="/opt/epics/css/phoebus-4.6.0" TOP="/opt/epics/css/phoebus-4.6.6"
# Ideally, assert that Java is found # Ideally, assert that Java is found
# export JAVA_HOME=/opt/jdk-9 # export JAVA_HOME=/opt/jdk-9
......
# Self-update
org.phoebus.applications.update/current_version=2022-02-09 23:59
org.phoebus.applications.update/update_url=https://controlssoftware.sns.ornl.gov/css_phoebus/nightly/phoebus-$(arch).zip
org.csstudio.trends.databrowser3/archives=pbraw://10.10.241.20:17668/retrieval|sodium
org.csstudio.trends.databrowser3/urls=pbraw://10.10.241.20:17668/retrieval
...@@ -7,6 +7,8 @@ export EPICS_BASE=/opt/epics/base ...@@ -7,6 +7,8 @@ export EPICS_BASE=/opt/epics/base
if [[ "aarch64" == "$(uname -m)" ]] ; then if [[ "aarch64" == "$(uname -m)" ]] ; then
export EPICS_HOST_ARCH=linux-arm export EPICS_HOST_ARCH=linux-arm
elif [[ "armv7l" == "$(uname -m)" ]] ; then
export EPICS_HOST_ARCH=linux-arm
else else
export EPICS_HOST_ARCH=linux-x86_64 export EPICS_HOST_ARCH=linux-x86_64
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment