Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xxx-R6-1
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
synApps_6_1_Working
xxx-R6-1
Commits
db317f9e
Unverified
Commit
db317f9e
authored
6 years ago
by
klang
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
AreaDetector no longer has the indicated files
parent
8a4b2b83
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure/RELEASE
+4
-14
4 additions, 14 deletions
configure/RELEASE
with
4 additions
and
14 deletions
configure/RELEASE
+
4
−
14
View file @
db317f9e
...
...
@@ -31,24 +31,14 @@ SUPPORT=/home/oxygen/MOONEY/epics/synAppsGIT/support
# Specify the standard synApps configuration.
include $(SUPPORT)/configure/RELEASE
#CAPUTLOG=$(SUPPORT)/caPutLog-3-4
# We might need to redefine SUPPORT and EPICS_BASE after including that file
-include $(TOP)/../configure/SUPPORT.$(EPICS_HOST_ARCH)
-include $(TOP)/../configure/EPICS_BASE.$(EPICS_HOST_ARCH)
AREA_DETECTOR=$(SUPPORT)/areaDetector-3-1
-include $(AREA_DETECTOR)/configure/RELEASE_PATHS.local
# Unfortunately RELEASE_PATHS.local above redefines SUPPORT and AREA_DETECTOR
# and this messes things up on Windows building on a Linux host.
# Need to redefine them as above.
-include $(TOP)/../configure/SUPPORT.$(EPICS_HOST_ARCH)
AREA_DETECTOR=$(SUPPORT)/areaDetector-3-1
-include $(AREA_DETECTOR)/configure/RELEASE_PATHS.local.$(EPICS_HOST_ARCH)
-include $(AREA_DETECTOR)/configure/RELEASE_PRODS.local
TDS3000 = $(SUPPORT)/../nonSynAppsSupport/tds3000-2.4
FLY = $(SUPPORT)/../nonSynAppsSupport/fly-0-0
# Include any non-standard support
#TDS3000 = $(SUPPORT)/../nonSynAppsSupport/tds3000-2.4
#FLY = $(SUPPORT)/../nonSynAppsSupport/fly-0-0
# For a local, custom configuration; copy $(SUPPORT)/configure/RELEASE
# to this directory as the file MASTER_RELEASE, edit the file, comment out
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment