Merge ~epics-contrib/epics-base/+git/contrib:tidy-startup into ~epics-core/epics-base/+git/epics-base:3.14
- Git
- lp:~epics-contrib/epics-base/+git/contrib
- tidy-startup
- Merge into 3.14
Proposed by
Andrew Johnson
Status: | Merged |
---|---|
Merged at revision: | 4b594761701e23bb6fc82a7e8ee7deda54416d27 |
Proposed branch: | ~epics-contrib/epics-base/+git/contrib:tidy-startup |
Merge into: | ~epics-core/epics-base/+git/epics-base:3.14 |
Diff against target: |
1342 lines (+539/-368) (has conflicts) 14 files modified
ci/travis-build.sh (+1/-1) configure/CONFIG (+6/-2) dev/null (+0/-122) documentation/README.1st (+5/-8) documentation/README.darwin.html (+1/-1) documentation/README.html (+5/-8) documentation/RELEASE_NOTES.html (+41/-0) src/tools/EpicsHostArch.pl (+55/-0) src/tools/Makefile (+3/-0) startup/EpicsHostArch (+16/-79) startup/unix.csh (+96/-0) startup/unix.sh (+100/-0) startup/win32.bat (+105/-147) startup/windows.bat (+105/-0) Conflict in documentation/RELEASE_NOTES.html |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Konrad (community) | Needs Fixing | ||
EPICS Core Developers | Pending | ||
Review via email: mp+352919@code.launchpad.net |
Commit message
Description of the change
A tidy-up of the Base startup directory, which should be suitable for all branches.
The EpicsHostArch.pl script has been rewritten, and moved to src/tools from where it gets installed into lib/perl (ci/travis-build.sh has been adjusted to find it there).
The original EpicsHostArch shell-script has been replaced with one that finds and runs the Perl version.
To post a comment you must log in.
Revision history for this message
Martin Konrad (info-martin-konrad) : | # |
review:
Needs Fixing
Revision history for this message
Andrew Johnson (anj) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/ci/travis-build.sh b/ci/travis-build.sh | |||
2 | index a3ca3fd..2ee5d65 100644 | |||
3 | --- a/ci/travis-build.sh | |||
4 | +++ b/ci/travis-build.sh | |||
5 | @@ -17,7 +17,7 @@ ticker() { | |||
6 | 17 | 17 | ||
7 | 18 | CACHEKEY=1 | 18 | CACHEKEY=1 |
8 | 19 | 19 | ||
10 | 20 | EPICS_HOST_ARCH=`sh startup/EpicsHostArch` | 20 | EPICS_HOST_ARCH=`perl src/tools/EpicsHostArch.pl` |
11 | 21 | 21 | ||
12 | 22 | [ -e configure/os/CONFIG_SITE.Common.linux-x86 ] || die "Wrong location: $PWD" | 22 | [ -e configure/os/CONFIG_SITE.Common.linux-x86 ] || die "Wrong location: $PWD" |
13 | 23 | 23 | ||
14 | diff --git a/configure/CONFIG b/configure/CONFIG | |||
15 | index 6fe6b9b..f5ba0b7 100644 | |||
16 | --- a/configure/CONFIG | |||
17 | +++ b/configure/CONFIG | |||
18 | @@ -20,11 +20,15 @@ else | |||
19 | 20 | endif | 20 | endif |
20 | 21 | 21 | ||
21 | 22 | # Provide a default if the user hasn't set EPICS_HOST_ARCH | 22 | # Provide a default if the user hasn't set EPICS_HOST_ARCH |
22 | 23 | # | ||
23 | 23 | ifeq ($(origin EPICS_HOST_ARCH), undefined) | 24 | ifeq ($(origin EPICS_HOST_ARCH), undefined) |
24 | 25 | # Bootstrapping ... | ||
25 | 26 | EHA := $(firstword $(wildcard $(EPICS_BASE)/lib/perl/EpicsHostArch.pl \ | ||
26 | 27 | $(TOP)/src/tools/EpicsHostArch.pl)) | ||
27 | 24 | # NB: We use a simply expanded variable here for performance: | 28 | # NB: We use a simply expanded variable here for performance: |
29 | 25 | EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl) | 29 | export EPICS_HOST_ARCH := $(shell perl $(EHA)) |
30 | 30 | undefine EHA | ||
31 | 26 | endif | 31 | endif |
32 | 27 | # | ||
33 | 28 | 32 | ||
34 | 29 | -include $(CONFIG)/os/CONFIG_COMPAT | 33 | -include $(CONFIG)/os/CONFIG_COMPAT |
35 | 30 | 34 | ||
36 | diff --git a/documentation/README.1st b/documentation/README.1st | |||
37 | index 462ac46..7a6e770 100644 | |||
38 | --- a/documentation/README.1st | |||
39 | +++ b/documentation/README.1st | |||
40 | @@ -221,14 +221,11 @@ | |||
41 | 221 | 221 | ||
42 | 222 | base/startup directory - contains scripts to set environment and path | 222 | base/startup directory - contains scripts to set environment and path |
43 | 223 | 223 | ||
52 | 224 | EpicsHostArch C shell script to set EPICS_HOST_ARCH env variable | 224 | EpicsHostArch Shell script to set EPICS_HOST_ARCH env variable |
53 | 225 | EpicsHostArch.pl Perl script to set EPICS_HOST_ARCH env variable | 225 | unix.csh C shell script to set path and env variables |
54 | 226 | Site.profile bourne shell script to set path and env variables | 226 | unix.sh Bourne shell script to set path and env variables |
55 | 227 | Site.cshrc c shell script to set path and env variables | 227 | win32.bat Bat file example to configure win32-x86 target |
56 | 228 | borland.bat WIN32 bat file to set borland path and env variables | 228 | windows.bat Bat file example to configure windows-x64 target |
49 | 229 | cygwin.bat WIN32 bat file to set cygwin path and env variables | ||
50 | 230 | win32.bat WIN32 bat file to set path and env variables | ||
51 | 231 | win32-debug.bat WIN32 debug bat file to set debug path and env variables | ||
57 | 232 | 229 | ||
58 | 233 | base/configure directory - contains build definitions and rules | 230 | base/configure directory - contains build definitions and rules |
59 | 234 | 231 | ||
60 | diff --git a/documentation/README.darwin.html b/documentation/README.darwin.html | |||
61 | index cbc2901..dd11ce8 100644 | |||
62 | --- a/documentation/README.darwin.html | |||
63 | +++ b/documentation/README.darwin.html | |||
64 | @@ -21,7 +21,7 @@ of my Bash login script (~/.bash_login): | |||
65 | 21 | # | 21 | # |
66 | 22 | EPICS_BASE="${HOME}/src/EPICS/base" | 22 | EPICS_BASE="${HOME}/src/EPICS/base" |
67 | 23 | EPICS_EXTENSIONS="${HOME}/src/EPICS/extensions" | 23 | EPICS_EXTENSIONS="${HOME}/src/EPICS/extensions" |
69 | 24 | <strong>.</strong> "${EPICS_BASE}"/startup/Site.profile | 24 | <strong>.</strong> "${EPICS_BASE}"/startup/unix.sh |
70 | 25 | </pre> | 25 | </pre> |
71 | 26 | </li> | 26 | </li> |
72 | 27 | <li> | 27 | <li> |
73 | diff --git a/documentation/README.html b/documentation/README.html | |||
74 | index a8a5723..98ec1b1 100644 | |||
75 | --- a/documentation/README.html | |||
76 | +++ b/documentation/README.html | |||
77 | @@ -230,14 +230,11 @@ | |||
78 | 230 | 230 | ||
79 | 231 | <H4>base/startup directory - contains scripts to set environment and path</H4> | 231 | <H4>base/startup directory - contains scripts to set environment and path</H4> |
80 | 232 | <PRE> | 232 | <PRE> |
89 | 233 | EpicsHostArch C shell script to set EPICS_HOST_ARCH env variable | 233 | EpicsHostArch Shell script to set EPICS_HOST_ARCH env variable |
90 | 234 | EpicsHostArch.pl Perl script to set EPICS_HOST_ARCH env variable | 234 | unix.csh C shell script to set path and env variables |
91 | 235 | Site.profile bourne shell script to set path and env variables | 235 | unix.sh Bourne shell script to set path and env variables |
92 | 236 | Site.cshrc c shell script to set path and env variables | 236 | win32.bat Bat file example to configure win32-x86 target |
93 | 237 | borland.bat WIN32 bat file to set borland path and env variables | 237 | windows.bat Bat file example to configure windows-x64 target |
86 | 238 | cygwin.bat WIN32 bat file to set cygwin path and env variables | ||
87 | 239 | win32.bat WIN32 bat file to set path and env variables | ||
88 | 240 | win32-debug.bat WIN32 debug bat file to set debug path and env variables | ||
94 | 241 | </PRE> | 238 | </PRE> |
95 | 242 | 239 | ||
96 | 243 | <H4>base/configure directory - contains build definitions and rules</H4> | 240 | <H4>base/configure directory - contains build definitions and rules</H4> |
97 | diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html | |||
98 | index bb7dd93..28c2e74 100644 | |||
99 | --- a/documentation/RELEASE_NOTES.html | |||
100 | +++ b/documentation/RELEASE_NOTES.html | |||
101 | @@ -16,6 +16,7 @@ Base-3.15 series or to EPICS 7.</p> | |||
102 | 16 | 16 | ||
103 | 17 | <!-- Insert new items immediately below here ... --> | 17 | <!-- Insert new items immediately below here ... --> |
104 | 18 | 18 | ||
105 | 19 | <<<<<<< documentation/RELEASE_NOTES.html | ||
106 | 19 | <h3>Recent Apple XCode Build Issues</h3> | 20 | <h3>Recent Apple XCode Build Issues</h3> |
107 | 20 | 21 | ||
108 | 21 | <p>The latest version of XCode will not compile calls to <tt>system()</tt> or | 22 | <p>The latest version of XCode will not compile calls to <tt>system()</tt> or |
109 | @@ -31,6 +32,46 @@ for a field like HSV to get set to a value that is not a legal alarm severity, | |||
110 | 31 | but the core IOC code should never copy such a value into a record's SEVR or | 32 | but the core IOC code should never copy such a value into a record's SEVR or |
111 | 32 | ACKS fields. With this fix the record's alarm severity will be limited to | 33 | ACKS fields. With this fix the record's alarm severity will be limited to |
112 | 33 | INVALID_ALARM.</p> | 34 | INVALID_ALARM.</p> |
113 | 35 | ======= | ||
114 | 36 | <h3>Cleanup of startup directory</h3> | ||
115 | 37 | |||
116 | 38 | <p>The files in the startup directory have not been maintained in recent years | ||
117 | 39 | and have grown crufty (technical term). This release includes the following | ||
118 | 40 | updates to these files:</p> | ||
119 | 41 | |||
120 | 42 | <ul> | ||
121 | 43 | |||
122 | 44 | <li>The Perl <tt>EpicsHostArch.pl</tt> script has been rewritten, and support | ||
123 | 45 | for a few previously missing host architectures has been added to it.</li> | ||
124 | 46 | |||
125 | 47 | <li>The <tt>EpicsHostArch.pl</tt> script has also been moved into the standard | ||
126 | 48 | <tt>src/tools</tt> directory, from where it will be installed into | ||
127 | 49 | <tt>lib/perl</tt>. In this new location it is no longer executable, so it must | ||
128 | 50 | be run by the <tt>perl</tt> executable.</li> | ||
129 | 51 | |||
130 | 52 | <li>The build system has been adjusted to look for <tt>EpicsHostArch.pl</tt> in | ||
131 | 53 | both places if the <tt>EPICS_HOST_ARCH</tt> environment variable has not been | ||
132 | 54 | set at build-time.</li> | ||
133 | 55 | |||
134 | 56 | <li>Sites that used the original Perl script to set <tt>EPICS_HOST_ARCH</tt> as | ||
135 | 57 | part of their standard environment will need to adjust their scripts when they | ||
136 | 58 | upgrade to this release.</li> | ||
137 | 59 | |||
138 | 60 | <li>The <tt>EpicsHostArch</tt> shell script has been replaced with a wrapper | ||
139 | 61 | routine that calls the Perl <tt>EpicsHostArch.pl</tt> script. Sites that rely on | ||
140 | 62 | this script to set <tt>EPICS_HOST_ARCH</tt> should consider switching to the | ||
141 | 63 | Perl script instead.</li> | ||
142 | 64 | |||
143 | 65 | <li>The <tt>Site.cshrc</tt> and <tt>Site.profile</tt> files have been renamed to | ||
144 | 66 | <tt>unix.csh</tt> and <tt>unix.sh</tt>, respectively.</li> | ||
145 | 67 | |||
146 | 68 | <li>The existing <tt>win32.bat</tt> file has been cleaned up and a new | ||
147 | 69 | <tt>windows.bat</tt> file added for 64-bit targets. The contents of these files | ||
148 | 70 | should be seen as examples, don't uncomment or install parts for software that | ||
149 | 71 | you don't explicitly know that you need.</li> | ||
150 | 72 | |||
151 | 73 | </ul> | ||
152 | 74 | >>>>>>> documentation/RELEASE_NOTES.html | ||
153 | 34 | 75 | ||
154 | 35 | <h3>Fixes for Launchpad bugs</h3> | 76 | <h3>Fixes for Launchpad bugs</h3> |
155 | 36 | 77 | ||
156 | diff --git a/src/tools/EpicsHostArch.pl b/src/tools/EpicsHostArch.pl | |||
157 | 37 | new file mode 100644 | 78 | new file mode 100644 |
158 | index 0000000..e8e49bc | |||
159 | --- /dev/null | |||
160 | +++ b/src/tools/EpicsHostArch.pl | |||
161 | @@ -0,0 +1,55 @@ | |||
162 | 1 | #!/usr/bin/env perl | ||
163 | 2 | #************************************************************************* | ||
164 | 3 | # Copyright (c) 2018 UChicago Argonne LLC, as Operator of Argonne | ||
165 | 4 | # National Laboratory. | ||
166 | 5 | # EPICS BASE is distributed subject to a Software License Agreement found | ||
167 | 6 | # in file LICENSE that is included with this distribution. | ||
168 | 7 | #************************************************************************* | ||
169 | 8 | |||
170 | 9 | # Returns an architecture name for EPICS_HOST_ARCH that should be | ||
171 | 10 | # appropriate for the CPU that this version of Perl was built for. | ||
172 | 11 | # Any arguments to the program will be appended with separator '-' | ||
173 | 12 | # to allow flags like -gnu -debug and/or -static to be added. | ||
174 | 13 | |||
175 | 14 | # Before Base has been built, use a command like this: | ||
176 | 15 | # bash$ export EPICS_HOST_ARCH=`perl src/tools/EpicsHostArch.pl` | ||
177 | 16 | # | ||
178 | 17 | # If Base is already built, use | ||
179 | 18 | # tcsh% setenv EPICS_HOST_ARCH `perl base/lib/perl/EpicsHostArch.pl` | ||
180 | 19 | |||
181 | 20 | # If your architecture is not recognized by this script, please send | ||
182 | 21 | # the output from running 'perl --version' to the EPICS tech-talk | ||
183 | 22 | # mailing list to have it added. | ||
184 | 23 | |||
185 | 24 | use strict; | ||
186 | 25 | |||
187 | 26 | use Config; | ||
188 | 27 | use POSIX; | ||
189 | 28 | |||
190 | 29 | print join('-', HostArch(), @ARGV), "\n"; | ||
191 | 30 | |||
192 | 31 | sub HostArch { | ||
193 | 32 | my $arch = $Config{archname}; | ||
194 | 33 | for ($arch) { | ||
195 | 34 | return 'linux-x86_64' if m/^x86_64-linux/; | ||
196 | 35 | return 'linux-x86' if m/^i[3-6]86-linux/; | ||
197 | 36 | return 'linux-arm' if m/^arm-linux/; | ||
198 | 37 | return 'windows-x64' if m/^MSWin32-x64/; | ||
199 | 38 | return 'win32-x86' if m/^MSWin32-x86/; | ||
200 | 39 | return "cygwin-x86_64" if m/^x86_64-cygwin/; | ||
201 | 40 | return "cygwin-x86" if m/^i[3-6]86-cygwin/; | ||
202 | 41 | return 'solaris-sparc' if m/^sun4-solaris/; | ||
203 | 42 | return 'solaris-x86' if m/^i86pc-solaris/; | ||
204 | 43 | |||
205 | 44 | my ($kernel, $hostname, $release, $version, $cpu) = uname; | ||
206 | 45 | if (m/^darwin/) { | ||
207 | 46 | for ($cpu) { | ||
208 | 47 | return 'darwin-x86' if m/^(i386|x86_64)/; | ||
209 | 48 | return 'darwin-ppc' if m/Power Macintosh/; | ||
210 | 49 | } | ||
211 | 50 | die "$0: macOS CPU type '$cpu' not recognized\n"; | ||
212 | 51 | } | ||
213 | 52 | |||
214 | 53 | die "$0: Architecture '$arch' not recognized\n"; | ||
215 | 54 | } | ||
216 | 55 | } | ||
217 | diff --git a/src/tools/Makefile b/src/tools/Makefile | |||
218 | index bcf1270..c544703 100644 | |||
219 | --- a/src/tools/Makefile | |||
220 | +++ b/src/tools/Makefile | |||
221 | @@ -16,6 +16,9 @@ PERL_MODULES += EPICS/Path.pm | |||
222 | 16 | PERL_MODULES += EPICS/Release.pm | 16 | PERL_MODULES += EPICS/Release.pm |
223 | 17 | PERL_MODULES += EPICS/Getopts.pm | 17 | PERL_MODULES += EPICS/Getopts.pm |
224 | 18 | 18 | ||
225 | 19 | # This goes into lib/perl, not bin/<host> | ||
226 | 20 | PERL_MODULES += EpicsHostArch.pl | ||
227 | 21 | |||
228 | 19 | PERL_SCRIPTS += convertRelease.pl | 22 | PERL_SCRIPTS += convertRelease.pl |
229 | 20 | PERL_SCRIPTS += cvsclean.pl | 23 | PERL_SCRIPTS += cvsclean.pl |
230 | 21 | PERL_SCRIPTS += dos2unix.pl | 24 | PERL_SCRIPTS += dos2unix.pl |
231 | diff --git a/startup/EpicsHostArch b/startup/EpicsHostArch | |||
232 | 22 | old mode 100755 | 25 | old mode 100755 |
233 | 23 | new mode 100644 | 26 | new mode 100644 |
234 | index 8861ac5..de7f3d5 | |||
235 | --- a/startup/EpicsHostArch | |||
236 | +++ b/startup/EpicsHostArch | |||
237 | @@ -1,84 +1,21 @@ | |||
238 | 1 | #!/bin/sh | 1 | #!/bin/sh |
250 | 2 | #************************************************************************* | 2 | # Script to find and run the Perl EpicsHostArch.pl script. |
240 | 3 | # Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne | ||
241 | 4 | # National Laboratory. | ||
242 | 5 | # Copyright (c) 2002 The Regents of the University of California, as | ||
243 | 6 | # Operator of Los Alamos National Laboratory. | ||
244 | 7 | # EPICS BASE is distributed subject to a Software License Agreement found | ||
245 | 8 | # in file LICENSE that is included with this distribution. | ||
246 | 9 | #************************************************************************* | ||
247 | 10 | # | ||
248 | 11 | # EpicsHostArch - returns the Epics host architecture suitable | ||
249 | 12 | # for assigning to the EPICS_HOST_ARCH variable | ||
251 | 13 | 3 | ||
258 | 14 | if [ "x${1}" != "x" ] | 4 | # This script is provided for backwards-compatibility only and may be |
259 | 15 | then | 5 | # dropped from future releases of Base. Please adjust callers to run |
260 | 16 | suffix="-"${1} | 6 | # the Perl version directly as this startup directory isn't copied to |
261 | 17 | else | 7 | # INSTALL_LOCATION by the EPICS build system. |
256 | 18 | suffix="" | ||
257 | 19 | fi | ||
262 | 20 | 8 | ||
264 | 21 | sysname=`uname` | 9 | EHA=EpicsHostArch.pl |
265 | 22 | 10 | ||
327 | 23 | case $sysname in | 11 | cd "$(dirname "$0")/.." |
267 | 24 | Linux ) | ||
268 | 25 | os=linux | ||
269 | 26 | cpu=`uname -m` | ||
270 | 27 | case $cpu in | ||
271 | 28 | i386 | i486 | i586 | i686 ) | ||
272 | 29 | cpu=x86 ;; | ||
273 | 30 | x86_64 ) | ||
274 | 31 | ;; # $cpu is correct | ||
275 | 32 | armv6l | armv7l ) | ||
276 | 33 | cpu=arm ;; | ||
277 | 34 | esac | ||
278 | 35 | echo ${os}-${cpu}${suffix} | ||
279 | 36 | ;; | ||
280 | 37 | Darwin ) | ||
281 | 38 | os=darwin | ||
282 | 39 | cpu=`uname -m` | ||
283 | 40 | case $cpu in | ||
284 | 41 | "Power Macintosh") | ||
285 | 42 | cpu=ppc ;; | ||
286 | 43 | i386 | x86_64 ) | ||
287 | 44 | cpu=x86 ;; | ||
288 | 45 | esac | ||
289 | 46 | echo ${os}-${cpu}${suffix} | ||
290 | 47 | ;; | ||
291 | 48 | SunOS ) | ||
292 | 49 | version=`uname -r | sed '1s/^\([0-9]*\).*$/\1/'` | ||
293 | 50 | if [ ${version} -ge 5 ]; then | ||
294 | 51 | os=solaris | ||
295 | 52 | else | ||
296 | 53 | os=sun4 | ||
297 | 54 | fi | ||
298 | 55 | cpu=`uname -m` | ||
299 | 56 | case $cpu in | ||
300 | 57 | sun4*) | ||
301 | 58 | cpu=sparc | ||
302 | 59 | ;; | ||
303 | 60 | i86pc) | ||
304 | 61 | cpu=x86 | ||
305 | 62 | ;; | ||
306 | 63 | esac | ||
307 | 64 | echo ${os}-${cpu}${suffix} | ||
308 | 65 | ;; | ||
309 | 66 | * ) | ||
310 | 67 | sysname=`uname -o` | ||
311 | 68 | case $sysname in | ||
312 | 69 | Cygwin ) | ||
313 | 70 | os=cygwin | ||
314 | 71 | cpu=`uname -m` | ||
315 | 72 | case $cpu in i386 | i486 | i586 | i686 ) | ||
316 | 73 | cpu=x86 | ||
317 | 74 | ;; | ||
318 | 75 | esac | ||
319 | 76 | echo ${os}-${cpu}${suffix} | ||
320 | 77 | ;; | ||
321 | 78 | * ) | ||
322 | 79 | echo unsupported | ||
323 | 80 | ;; | ||
324 | 81 | esac | ||
325 | 82 | ;; | ||
326 | 83 | esac | ||
328 | 84 | 12 | ||
329 | 13 | # Perl script will be installed into lib/perl | ||
330 | 14 | [[ -f lib/perl/$EHA ]] && exec perl lib/perl/$EHA $* | ||
331 | 15 | |||
332 | 16 | # If Base hasn't been built yet, use the source Luke | ||
333 | 17 | [[ -f src/tools/$EHA ]] && exec perl src/tools/$EHA $* | ||
334 | 18 | |||
335 | 19 | # Die with an error message | ||
336 | 20 | echo "$0: Can't find $EHA" >&2 | ||
337 | 21 | exit 1 | ||
338 | diff --git a/startup/EpicsHostArch.pl b/startup/EpicsHostArch.pl | |||
339 | 85 | deleted file mode 100755 | 22 | deleted file mode 100755 |
340 | index 09f7ffd..0000000 | |||
341 | --- a/startup/EpicsHostArch.pl | |||
342 | +++ /dev/null | |||
343 | @@ -1,47 +0,0 @@ | |||
344 | 1 | eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*- | ||
345 | 2 | if $running_under_some_shell; # EpicsHostArch.pl | ||
346 | 3 | #************************************************************************* | ||
347 | 4 | # Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne | ||
348 | 5 | # National Laboratory. | ||
349 | 6 | # Copyright (c) 2002 The Regents of the University of California, as | ||
350 | 7 | # Operator of Los Alamos National Laboratory. | ||
351 | 8 | # EPICS BASE is distributed subject to a Software License Agreement found | ||
352 | 9 | # in file LICENSE that is included with this distribution. | ||
353 | 10 | #************************************************************************* | ||
354 | 11 | |||
355 | 12 | # Returns the Epics host architecture suitable | ||
356 | 13 | # for assigning to the EPICS_HOST_ARCH variable | ||
357 | 14 | |||
358 | 15 | use Config; | ||
359 | 16 | use POSIX; | ||
360 | 17 | |||
361 | 18 | $suffix=""; | ||
362 | 19 | $suffix="-".$ARGV[0] if ($ARGV[0] ne ""); | ||
363 | 20 | |||
364 | 21 | $EpicsHostArch = GetEpicsHostArch(); | ||
365 | 22 | print "$EpicsHostArch$suffix"; | ||
366 | 23 | |||
367 | 24 | sub GetEpicsHostArch { # no args | ||
368 | 25 | $arch=$Config{'archname'}; | ||
369 | 26 | if ($arch =~ /sun4-solaris/) { return "solaris-sparc"; | ||
370 | 27 | } elsif ($arch =~ m/i86pc-solaris/) { return "solaris-x86"; | ||
371 | 28 | } elsif ($arch =~ m/i[3-6]86-linux/){ return "linux-x86"; | ||
372 | 29 | } elsif ($arch =~ m/x86_64-linux/) { return "linux-x86_64"; | ||
373 | 30 | } elsif ($arch =~ m/arm-linux/) { return "linux-arm"; | ||
374 | 31 | } elsif ($arch =~ m/MSWin32-x86/) { return "win32-x86"; | ||
375 | 32 | } elsif ($arch =~ m/MSWin32-x64/) { return "windows-x64"; | ||
376 | 33 | } elsif ($arch =~ m/cygwin/) { | ||
377 | 34 | my($kernel, $hostname, $release, $version, $cpu) = POSIX::uname(); | ||
378 | 35 | if ($cpu =~ m/x86_64/) { return "cygwin-x86_64"; } | ||
379 | 36 | return "cygwin-x86"; | ||
380 | 37 | } elsif ($arch =~ m/darwin/) { | ||
381 | 38 | my($kernel, $hostname, $release, $version, $cpu) = POSIX::uname(); | ||
382 | 39 | if ($cpu =~ m/Power Macintosh/) { return "darwin-ppc"; } | ||
383 | 40 | elsif ($cpu =~ m/i386/) { return "darwin-x86"; } | ||
384 | 41 | elsif ($cpu =~ m/x86_64/) { return "darwin-x86"; } | ||
385 | 42 | else { return "unsupported"; } | ||
386 | 43 | } else { return "unsupported"; } | ||
387 | 44 | } | ||
388 | 45 | |||
389 | 46 | #EOF EpicsHostArch.pl | ||
390 | 47 | |||
391 | diff --git a/startup/Site.cshrc b/startup/Site.cshrc | |||
392 | 48 | deleted file mode 100755 | 0 | deleted file mode 100755 |
393 | index 23453cb..0000000 | |||
394 | --- a/startup/Site.cshrc | |||
395 | +++ /dev/null | |||
396 | @@ -1,118 +0,0 @@ | |||
397 | 1 | #!/bin/csh -f | ||
398 | 2 | #************************************************************************* | ||
399 | 3 | # Copyright (c) 2002 The University of Chicago, as Operator of Argonne | ||
400 | 4 | # National Laboratory. | ||
401 | 5 | # Copyright (c) 2002 The Regents of the University of California, as | ||
402 | 6 | # Operator of Los Alamos National Laboratory. | ||
403 | 7 | # EPICS BASE Versions 3.13.7 | ||
404 | 8 | # and higher are distributed subject to a Software License Agreement found | ||
405 | 9 | # in file LICENSE that is included with this distribution. | ||
406 | 10 | #************************************************************************* | ||
407 | 11 | # Site-specific EPICS environment settings | ||
408 | 12 | # | ||
409 | 13 | # sites should modify these definitions | ||
410 | 14 | |||
411 | 15 | # Location of epics base | ||
412 | 16 | if ( ! $?EPICS_BASE ) then | ||
413 | 17 | set EPICS_BASE=/usr/local/epics/base | ||
414 | 18 | endif | ||
415 | 19 | |||
416 | 20 | # Location of epics extensions | ||
417 | 21 | if ( ! $?EPICS_EXTENSIONS ) then | ||
418 | 22 | setenv EPICS_EXTENSIONS /usr/local/epics/extensions | ||
419 | 23 | endif | ||
420 | 24 | |||
421 | 25 | # Postscript printer definition needed by some extensions (eg medm, dp, dm, ...) | ||
422 | 26 | if ( ! $?PSPRINTTER ) then | ||
423 | 27 | setenv PSPRINTER lp | ||
424 | 28 | endif | ||
425 | 29 | |||
426 | 30 | # Needed only by medm extension | ||
427 | 31 | #setenv EPICS_DISPLAY_PATH | ||
428 | 32 | # Needed only by medm extension | ||
429 | 33 | setenv BROWSER firefox | ||
430 | 34 | |||
431 | 35 | # Needed only by orbitscreen extension | ||
432 | 36 | if ( ! $?ORBITSCREENHOME ) then | ||
433 | 37 | setenv ORBITSCREENHOME $EPICS_EXTENSIONS/src/orbitscreen | ||
434 | 38 | endif | ||
435 | 39 | |||
436 | 40 | # Needed only by adt extension | ||
437 | 41 | if ( ! $?ADTHOME ) then | ||
438 | 42 | setenv ADTHOME /usr/local/oag/apps/src/appconfig/adt | ||
439 | 43 | echo $ADTHOME | ||
440 | 44 | endif | ||
441 | 45 | |||
442 | 46 | # Needed only by ar extension (archiver) | ||
443 | 47 | setenv EPICS_AR_PORT 7002 | ||
444 | 48 | |||
445 | 49 | # Needed for java extensions | ||
446 | 50 | if ( $?CLASSPATH ) then | ||
447 | 51 | setenv CLASSPATH "${CLASSPATH}:${EPICS_EXTENSIONS}/javalib" | ||
448 | 52 | else | ||
449 | 53 | setenv CLASSPATH "${EPICS_EXTENSIONS}/javalib" | ||
450 | 54 | endif | ||
451 | 55 | |||
452 | 56 | # Allow private versions of extensions without a bin subdir | ||
453 | 57 | if ( $?EPICS_EXTENSIONS_PVT ) then | ||
454 | 58 | set path = ( $path $EPICS_EXTENSIONS_PVT) | ||
455 | 59 | endif | ||
456 | 60 | |||
457 | 61 | ################################################################## | ||
458 | 62 | |||
459 | 63 | # Start of set R3.14 environment variables | ||
460 | 64 | |||
461 | 65 | setenv EPICS_HOST_ARCH `$EPICS_BASE/startup/EpicsHostArch.pl` | ||
462 | 66 | |||
463 | 67 | # Allow private versions of base | ||
464 | 68 | if ( $?EPICS_BASE_PVT ) then | ||
465 | 69 | if ( -e $EPICS_BASE_PVT/bin/$EPICS_HOST_ARCH ) then | ||
466 | 70 | set path = ( $path $EPICS_BASE_PVT/bin/$EPICS_HOST_ARCH) | ||
467 | 71 | endif | ||
468 | 72 | endif | ||
469 | 73 | |||
470 | 74 | # Allow private versions of extensions | ||
471 | 75 | if ( $?EPICS_EXTENSIONS_PVT ) then | ||
472 | 76 | if ( -e $EPICS_EXTENSIONS_PVT/bin/$EPICS_HOST_ARCH ) then | ||
473 | 77 | set path = ( $path $EPICS_EXTENSIONS_PVT/bin/$EPICS_HOST_ARCH) | ||
474 | 78 | endif | ||
475 | 79 | endif | ||
476 | 80 | set path = ( $path $EPICS_EXTENSIONS/bin/$EPICS_HOST_ARCH ) | ||
477 | 81 | |||
478 | 82 | # End of set R3.14 environment variables | ||
479 | 83 | ################################################################## | ||
480 | 84 | |||
481 | 85 | |||
482 | 86 | ## Start of set pre R3.14 environment variables | ||
483 | 87 | # | ||
484 | 88 | ## Time service: | ||
485 | 89 | ## EPICS_TS_MIN_WEST the local time difference from GMT. | ||
486 | 90 | #setenv EPICS_TS_MIN_WEST 360 | ||
487 | 91 | # | ||
488 | 92 | #if ( -e /usr/local/etc/setup/HostArch.pl ) then | ||
489 | 93 | # setenv HOST_ARCH `/usr/local/etc/setup/HostArch.pl` | ||
490 | 94 | #else | ||
491 | 95 | # setenv HOST_ARCH `/usr/local/epics/startup/HostArch.pl` | ||
492 | 96 | #endif | ||
493 | 97 | # | ||
494 | 98 | ## Allow private versions of extensions | ||
495 | 99 | #if ( $?EPICS_EXTENSIONS_PVT ) then | ||
496 | 100 | # if ( -e $EPICS_EXTENSIONS_PVT/bin/$HOST_ARCH ) then | ||
497 | 101 | # set path = ( $path $EPICS_EXTENSIONS_PVT/bin/$HOST_ARCH) | ||
498 | 102 | # endif | ||
499 | 103 | # # Needed if shared extension libraries are built | ||
500 | 104 | # if ( -e $EPICS_EXTENSIONS_PVT/lib/$HOST_ARCH ) then | ||
501 | 105 | # if ( $?LD_LIBRARY_PATH ) then | ||
502 | 106 | # setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}" | ||
503 | 107 | # else | ||
504 | 108 | # setenv LD_LIBRARY_PATH "${EPICS_EXTENSIONS_PVT}/lib/${HOST_ARCH}" | ||
505 | 109 | # endif | ||
506 | 110 | # endif | ||
507 | 111 | #endif | ||
508 | 112 | # | ||
509 | 113 | #set path = ( $path $EPICS_EXTENSIONS/bin/$HOST_ARCH ) | ||
510 | 114 | ## Needed if shared extension libraries are built | ||
511 | 115 | #setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}" | ||
512 | 116 | |||
513 | 117 | # End of set pre R3.14 environment variables | ||
514 | 118 | ################################################################## | ||
515 | diff --git a/startup/Site.profile b/startup/Site.profile | |||
516 | 119 | deleted file mode 100755 | 0 | deleted file mode 100755 |
517 | index 5cb9b02..0000000 | |||
518 | --- a/startup/Site.profile | |||
519 | +++ /dev/null | |||
520 | @@ -1,118 +0,0 @@ | |||
521 | 1 | #!/bin/sh | ||
522 | 2 | #************************************************************************* | ||
523 | 3 | # Copyright (c) 2002 The University of Chicago, as Operator of Argonne | ||
524 | 4 | # National Laboratory. | ||
525 | 5 | # Copyright (c) 2002 The Regents of the University of California, as | ||
526 | 6 | # Operator of Los Alamos National Laboratory. | ||
527 | 7 | # EPICS BASE Versions 3.13.7 | ||
528 | 8 | # and higher are distributed subject to a Software License Agreement found | ||
529 | 9 | # in file LICENSE that is included with this distribution. | ||
530 | 10 | #************************************************************************* | ||
531 | 11 | # Site-specific EPICS environment settings | ||
532 | 12 | # | ||
533 | 13 | # sites should modify these definitions | ||
534 | 14 | |||
535 | 15 | # Location of epics base | ||
536 | 16 | if [ -z "${MY_EPICS_BASE}" ] ; then | ||
537 | 17 | MY_EPICS_BASE=/usr/local/epics/base | ||
538 | 18 | fi | ||
539 | 19 | |||
540 | 20 | # Location of epics extensions (medm, msi, etc.) | ||
541 | 21 | if [ -z "${EPICS_EXTENSIONS}" ] ; then | ||
542 | 22 | EPICS_EXTENSIONS=/usr/local/epics/extensions | ||
543 | 23 | fi | ||
544 | 24 | |||
545 | 25 | # Postscript printer definition needed by some extensions (eg medm, dp, dm, ...) | ||
546 | 26 | if [ -z "${PSPRINTER}" ] ; then | ||
547 | 27 | export PSPRINTER=lp | ||
548 | 28 | fi | ||
549 | 29 | |||
550 | 30 | #Needed only by the idl and ezcaIDL extensions. | ||
551 | 31 | #export EPICS_EXTENSIONS | ||
552 | 32 | |||
553 | 33 | # Needed only by medm extension | ||
554 | 34 | #export EPICS_DISPLAY_PATH=/path/to/adl/files | ||
555 | 35 | export BROWSER=firefox | ||
556 | 36 | |||
557 | 37 | # Needed only by orbitscreen extension | ||
558 | 38 | #if [ -z "${ORBITSCREENHOME}" ] ; then | ||
559 | 39 | # export "ORBITSCREENHOME=${EPICS_EXTENSIONS/src/orbitscreen}" | ||
560 | 40 | #fi | ||
561 | 41 | |||
562 | 42 | # Needed only by adt extension | ||
563 | 43 | #if [ -z "${ADTHOME}" ] ; then | ||
564 | 44 | # ADTHOME= | ||
565 | 45 | # export ADTHOME | ||
566 | 46 | #fi | ||
567 | 47 | |||
568 | 48 | # Needed only by ar extension (archiver) | ||
569 | 49 | #EPICS_AR_PORT=7002 | ||
570 | 50 | #export EPICS_AR_PORT | ||
571 | 51 | |||
572 | 52 | # Needed for java extensions | ||
573 | 53 | if [ -z "${CLASSPATH}" ] ; then | ||
574 | 54 | CLASSPATH="${EPICS_EXTENSIONS}/javalib" | ||
575 | 55 | else | ||
576 | 56 | CLASSPATH="${CLASSPATH}:${EPICS_EXTENSIONS}/javalib" | ||
577 | 57 | fi | ||
578 | 58 | export CLASSPATH | ||
579 | 59 | |||
580 | 60 | # Allow private versions of extensions without a bin subdir | ||
581 | 61 | if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then | ||
582 | 62 | PATH="${PATH}:${EPICS_EXTENSIONS_PVT}" | ||
583 | 63 | fi | ||
584 | 64 | |||
585 | 65 | #--------------------------------------------------------------- | ||
586 | 66 | # Start of set R3.14 environment variables | ||
587 | 67 | # | ||
588 | 68 | EPICS_HOST_ARCH=`"${MY_EPICS_BASE}"/startup/EpicsHostArch.pl` | ||
589 | 69 | export EPICS_HOST_ARCH | ||
590 | 70 | |||
591 | 71 | # Allow private versions of base | ||
592 | 72 | if [ -n "${EPICS_BASE_PVT}" ] ; then | ||
593 | 73 | if [ -d "${EPICS_BASE_PVT}/bin/${EPICS_HOST_ARCH}" ]; then | ||
594 | 74 | PATH="${PATH}:${EPICS_BASE_PVT}/bin/${EPICS_HOST_ARCH}" | ||
595 | 75 | fi | ||
596 | 76 | fi | ||
597 | 77 | |||
598 | 78 | # Allow private versions of extensions | ||
599 | 79 | if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then | ||
600 | 80 | if [ -d "${EPICS_EXTENSIONS_PVT}/bin/${EPICS_HOST_ARCH}" ]; then | ||
601 | 81 | PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${EPICS_HOST_ARCH}" | ||
602 | 82 | fi | ||
603 | 83 | fi | ||
604 | 84 | PATH="${PATH}:${EPICS_EXTENSIONS}/bin/${EPICS_HOST_ARCH}" | ||
605 | 85 | |||
606 | 86 | # End of set R3.14 environment variables | ||
607 | 87 | |||
608 | 88 | #--------------------------------------------------------------- | ||
609 | 89 | # | ||
610 | 90 | ## Start of set pre R3.14 environment variables | ||
611 | 91 | # | ||
612 | 92 | ## Time service: | ||
613 | 93 | ## EPICS_TS_MIN_WEST the local time difference from GMT. | ||
614 | 94 | #EPICS_TS_MIN_WEST=360 | ||
615 | 95 | #export EPICS_TS_MIN_WEST | ||
616 | 96 | # | ||
617 | 97 | #HOST_ARCH=`"${MY_EPICS_BASE}"/startup/HostArch` | ||
618 | 98 | #export HOST_ARCH | ||
619 | 99 | # | ||
620 | 100 | ## Allow private versions of base | ||
621 | 101 | #if [ -n "${EPICS_BASE_PVT}" ] ; then | ||
622 | 102 | # if [ -d "${EPICS_BASE_PVT}/bin/${HOST_ARCH}" ]; then | ||
623 | 103 | # PATH="${PATH}:${EPICS_BASE_PVT}/bin/${HOST_ARCH}" | ||
624 | 104 | # fi | ||
625 | 105 | #fi | ||
626 | 106 | # | ||
627 | 107 | ## Allow private versions of extensions | ||
628 | 108 | #if [ -n "${EPICS_EXTENSIONS_PVT}" ] ; then | ||
629 | 109 | # if [ -d "${EPICS_EXTENSIONS_PVT}/bin/${HOST_ARCH}" ]; then | ||
630 | 110 | # PATH="${PATH}:${EPICS_EXTENSIONS_PVT}/bin/${HOST_ARCH}" | ||
631 | 111 | # fi | ||
632 | 112 | #fi | ||
633 | 113 | # | ||
634 | 114 | #PATH="${PATH}:${EPICS_EXTENSIONS}/lib/${HOST_ARCH}" | ||
635 | 115 | # | ||
636 | 116 | # End of set pre R3.14 environment variables | ||
637 | 117 | |||
638 | 118 | #--------------------------------------------------------------- | ||
639 | diff --git a/startup/cygwin.bat b/startup/cygwin.bat | |||
640 | 119 | deleted file mode 100755 | 0 | deleted file mode 100755 |
641 | index ff75b53..0000000 | |||
642 | --- a/startup/cygwin.bat | |||
643 | +++ /dev/null | |||
644 | @@ -1,122 +0,0 @@ | |||
645 | 1 | @ECHO OFF | ||
646 | 2 | REM ************************************************************************* | ||
647 | 3 | REM Copyright (c) 2002 The University of Chicago, as Operator of Argonne | ||
648 | 4 | REM National Laboratory. | ||
649 | 5 | REM Copyright (c) 2002 The Regents of the University of California, as | ||
650 | 6 | REM Operator of Los Alamos National Laboratory. | ||
651 | 7 | REM EPICS BASE Versions 3.13.7 | ||
652 | 8 | REM and higher are distributed subject to a Software License Agreement found | ||
653 | 9 | REM in file LICENSE that is included with this distribution. | ||
654 | 10 | REM ************************************************************************* | ||
655 | 11 | REM | ||
656 | 12 | REM Site-specific EPICS environment settings | ||
657 | 13 | REM | ||
658 | 14 | REM sites should modify these definitions | ||
659 | 15 | |||
660 | 16 | REM ====================================================== | ||
661 | 17 | REM ====== REQUIRED ENVIRONMENT VARIABLES FOLLOW ====== | ||
662 | 18 | REM ====================================================== | ||
663 | 19 | |||
664 | 20 | REM ====================================================== | ||
665 | 21 | REM ---------------- WINDOWS --------------------------- | ||
666 | 22 | REM ====================================================== | ||
667 | 23 | REM ----- WIN95 ----- | ||
668 | 24 | REM set PATH=C:\WINDOWS;C:\WINDOWS\COMMAND | ||
669 | 25 | REM ----- WINNT, WIN2000 ----- | ||
670 | 26 | REM set PATH=C:\WINNT;C:\WINNT\SYSTEM32 | ||
671 | 27 | REM ----- WINXP, Vista, Windows 7 ----- | ||
672 | 28 | set PATH=C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\SYSTEM32\Wbem | ||
673 | 29 | |||
674 | 30 | REM ====================================================== | ||
675 | 31 | REM ---------------- make and perl --------------------- | ||
676 | 32 | REM ====================================================== | ||
677 | 33 | |||
678 | 34 | REM --------------- ActiveState perl ------------------- | ||
679 | 35 | set PATH=C:\Perl\bin;%PATH% | ||
680 | 36 | |||
681 | 37 | REM --------------- mingw make ------------------------ | ||
682 | 38 | REM set PATH=C:\mingw-make\bin;%PATH% | ||
683 | 39 | REM set PATH=C:\mingw-make82-3\bin;%PATH% | ||
684 | 40 | |||
685 | 41 | REM --------------- gnuwin32 make ---------------------- | ||
686 | 42 | set PATH=C:\gnuwin32\bin;%PATH% | ||
687 | 43 | |||
688 | 44 | REM ====================================================== | ||
689 | 45 | REM ---------------- cygwin tools ------------------------ | ||
690 | 46 | REM ====================================================== | ||
691 | 47 | REM (make & perl if above perl and make are REMs) | ||
692 | 48 | REM Dont use cygwin GNU make and Perl! | ||
693 | 49 | REM cygwin contains tk/tcl, vim, perl, and many unix tools | ||
694 | 50 | REM need grep from here NOT from cvs directory | ||
695 | 51 | set PATH=%PATH%;.;.. | ||
696 | 52 | set PATH=%PATH%;c:\cygwin\bin | ||
697 | 53 | |||
698 | 54 | REM ====================================================== | ||
699 | 55 | REM --------------- EPICS -------------------------------- | ||
700 | 56 | REM ====================================================== | ||
701 | 57 | set EPICS_HOST_ARCH=cygwin-x86 | ||
702 | 58 | set PATH=%PATH%;G:\epics\base\bin\%EPICS_HOST_ARCH% | ||
703 | 59 | set PATH=%PATH%;G:\epics\extensions\bin\%EPICS_HOST_ARCH% | ||
704 | 60 | |||
705 | 61 | REM ====================================================== | ||
706 | 62 | REM ------- OPTIONAL ENVIRONMENT VARIABLES FOLLOW -------- | ||
707 | 63 | REM ====================================================== | ||
708 | 64 | |||
709 | 65 | REM ====================================================== | ||
710 | 66 | REM ----------------- remote CVS ------------------------- | ||
711 | 67 | REM ====================================================== | ||
712 | 68 | REM set CVS_RSH=c:/cygwin/bin/ssh.exe | ||
713 | 69 | REM set CVSROOT=:ext:jba@aps.anl.gov:/usr/local/epicsmgr/cvsroot | ||
714 | 70 | REM set HOME=c:/users/%USERNAME% | ||
715 | 71 | REM set HOME=c:/users/jba | ||
716 | 72 | |||
717 | 73 | REM ====================================================== | ||
718 | 74 | REM ------------------- Bazaar --------------------------- | ||
719 | 75 | REM ====================================================== | ||
720 | 76 | set PATH=%PATH%;C:\Program files\Bazaar | ||
721 | 77 | |||
722 | 78 | REM ====================================================== | ||
723 | 79 | REM ----------------- GNU make flags --------------------- | ||
724 | 80 | REM ====================================================== | ||
725 | 81 | set MAKEFLAGS=-w | ||
726 | 82 | |||
727 | 83 | REM ====================================================== | ||
728 | 84 | REM -------------- vim (use cygwin vim ) ----------------- | ||
729 | 85 | REM ====================================================== | ||
730 | 86 | REM HOME needed by vim to write .viminfo file. | ||
731 | 87 | REM VIM needed by vim to find _vimrc file. | ||
732 | 88 | REM set VIM=c:\cygwin | ||
733 | 89 | |||
734 | 90 | REM ====================================================== | ||
735 | 91 | REM --------------- Epics Channel Access ----------------- | ||
736 | 92 | REM Modify and uncomment the following lines | ||
737 | 93 | REM to override the base/configure/CONFIG_ENV defaults | ||
738 | 94 | REM ====================================================== | ||
739 | 95 | REM set EPICS_CA_ADDR_LIST=n.n.n.n n.n.n.n | ||
740 | 96 | REM set EPICS_CA_AUTO_ADDR_LIST=YES | ||
741 | 97 | |||
742 | 98 | REM set EPICS_CA_CONN_TMO=30.0 | ||
743 | 99 | REM set EPICS_CA_BEACON_PERIOD=15.0 | ||
744 | 100 | REM set EPICS_CA_REPEATER_PORT=5065 | ||
745 | 101 | REM set EPICS_CA_SERVER_PORT=5064 | ||
746 | 102 | REM set EPICS_TS_MIN_WEST=420 | ||
747 | 103 | |||
748 | 104 | REM ====================================================== | ||
749 | 105 | REM --------------- JAVA --------------------------------- | ||
750 | 106 | REM ====================================================== | ||
751 | 107 | REM Needed for java extensions | ||
752 | 108 | REM set CLASSPATH=G:\epics\extensions\javalib | ||
753 | 109 | REM set PATH=%PATH%;C:\j2sdk1.4.1_01\bin | ||
754 | 110 | REM set CLASSPATH=%CLASSPATH%;C:\j2sdk1.4.1_01\lib\tools.jar | ||
755 | 111 | |||
756 | 112 | REM ====================================================== | ||
757 | 113 | REM --------------- Exceed ------------------------------- | ||
758 | 114 | REM Needed for X11 extensions | ||
759 | 115 | REM ====================================================== | ||
760 | 116 | REM set EX_VER=7.10 | ||
761 | 117 | REM set EX_VER=12.00 | ||
762 | 118 | REM set EX_VER=14.00 | ||
763 | 119 | REM set PATH=%PATH%;C:\Exceed%EX_VER%\XDK\ | ||
764 | 120 | REM set PATH=%PATH%;C:\Program Files\Hummingbird\Connectivity\%EX_VER%\Exceed\ | ||
765 | 121 | |||
766 | 122 | |||
767 | diff --git a/startup/unix.csh b/startup/unix.csh | |||
768 | 123 | new file mode 100644 | 0 | new file mode 100644 |
769 | index 0000000..788a639 | |||
770 | --- /dev/null | |||
771 | +++ b/startup/unix.csh | |||
772 | @@ -0,0 +1,96 @@ | |||
773 | 1 | #************************************************************************* | ||
774 | 2 | # Copyright (c) 2002 The University of Chicago, as Operator of Argonne | ||
775 | 3 | # National Laboratory. | ||
776 | 4 | # Copyright (c) 2002 The Regents of the University of California, as | ||
777 | 5 | # Operator of Los Alamos National Laboratory. | ||
778 | 6 | # EPICS BASE Versions 3.13.7 | ||
779 | 7 | # and higher are distributed subject to a Software License Agreement found | ||
780 | 8 | # in file LICENSE that is included with this distribution. | ||
781 | 9 | #************************************************************************* | ||
782 | 10 | # | ||
783 | 11 | # Site-specific EPICS environment settings | ||
784 | 12 | # | ||
785 | 13 | # Attempts to set EPICS_HOST_ARCH. Optionally, adds the EPICS Base | ||
786 | 14 | # install host architecture bin directory to PATH. | ||
787 | 15 | # | ||
788 | 16 | |||
789 | 17 | #----------------------------------------------------------------------- | ||
790 | 18 | # Site serviceable parts (These definitions may be modified) | ||
791 | 19 | #----------------------------------------------------------------------- | ||
792 | 20 | |||
793 | 21 | # Automatically set up the environment when possible ("yes" or "no"). | ||
794 | 22 | # If set to yes, as much of the environment will be set up as possible. | ||
795 | 23 | # If set to no, just the minimum environment will be set up. More | ||
796 | 24 | # specific _auto_* definitions take precedence over this definition. | ||
797 | 25 | set _auto=no | ||
798 | 26 | |||
799 | 27 | # Automatically append to PATH ("yes" or "no"). If set to yes, the | ||
800 | 28 | # EPICS Base install host architecture bin directory will be added to | ||
801 | 29 | # PATH if possible. If set to no, the bin directory will not be added | ||
802 | 30 | # to PATH. | ||
803 | 31 | set _auto_path_append=$_auto | ||
804 | 32 | |||
805 | 33 | # The program used to run Perl scripts (pathname). | ||
806 | 34 | set _perl_prog=perl | ||
807 | 35 | |||
808 | 36 | # The EPICS host architecture specification for EPICS_HOST_ARCH | ||
809 | 37 | # (<os>-<arch>[-<toolset>] as defined in configure/CONFIG_SITE). If | ||
810 | 38 | # nonempty, the value will be used as the value of EPICS_HOST_ARCH. If | ||
811 | 39 | # empty, an attempt will be made to automatically determine the value | ||
812 | 40 | # with EpicsHostArch.pl. | ||
813 | 41 | set _epics_host_arch= | ||
814 | 42 | |||
815 | 43 | # The install location of EPICS Base (pathname). If nonempty, the | ||
816 | 44 | # EpicsHostArch.pl script from it, if it exists, will be used to | ||
817 | 45 | # determine EPICS_HOST_ARCH. If nonempty and EPICS_HOST_ARCH was | ||
818 | 46 | # determined successfully, it will be used to add the host architecture | ||
819 | 47 | # bin directory to PATH if _auto_path_append is yes. | ||
820 | 48 | set _epics_base= | ||
821 | 49 | |||
822 | 50 | # The source location of EPICS Base (pathname). If nonempty, the | ||
823 | 51 | # EpicsHostArch.pl script from it, if it exists and _epics_base is empty | ||
824 | 52 | # or it did not exist in the _epics_base location, will be used to | ||
825 | 53 | # determine EPICS_HOST_ARCH. | ||
826 | 54 | set _epics_base_src= | ||
827 | 55 | |||
828 | 56 | #----------------------------------------------------------------------- | ||
829 | 57 | # Internal parts (There is typically no need to modify these) | ||
830 | 58 | #----------------------------------------------------------------------- | ||
831 | 59 | |||
832 | 60 | # Define the possible locations of EpicsHostArch.pl | ||
833 | 61 | set _epics_host_arch_pl= | ||
834 | 62 | set _src_epics_host_arch_pl= | ||
835 | 63 | if ("$_epics_base" != '') then | ||
836 | 64 | set _epics_host_arch_pl="$_epics_base/lib/perl/EpicsHostArch.pl" | ||
837 | 65 | endif | ||
838 | 66 | if ("$_epics_base_src" != '') then | ||
839 | 67 | set _src_epics_host_arch_pl="$_epics_base_src/src/tools/EpicsHostArch.pl" | ||
840 | 68 | endif | ||
841 | 69 | |||
842 | 70 | # Set the EPICS host architecture specification | ||
843 | 71 | if ("$_epics_host_arch" != '') then | ||
844 | 72 | setenv EPICS_HOST_ARCH "$_epics_host_arch" | ||
845 | 73 | else if (-e "$_epics_host_arch_pl") then | ||
846 | 74 | set _epics_host_arch=`"$_perl_prog" "$_epics_host_arch_pl"` | ||
847 | 75 | setenv EPICS_HOST_ARCH "$_epics_host_arch" | ||
848 | 76 | else if (-e "$_src_epics_host_arch_pl") then | ||
849 | 77 | set _epics_host_arch=`"$_perl_prog" "$_src_epics_host_arch_pl"` | ||
850 | 78 | setenv EPICS_HOST_ARCH "$_epics_host_arch" | ||
851 | 79 | endif | ||
852 | 80 | |||
853 | 81 | # Add the EPICS Base host architecture bin directory to PATH | ||
854 | 82 | if ("$_auto_path_append" == yes) then | ||
855 | 83 | if ("$_epics_base" != '' && "$_epics_host_arch" != '') then | ||
856 | 84 | setenv PATH "${PATH}:$_epics_base/bin/$_epics_host_arch" | ||
857 | 85 | endif | ||
858 | 86 | endif | ||
859 | 87 | |||
860 | 88 | # Don't leak variables into the environment | ||
861 | 89 | unset _auto | ||
862 | 90 | unset _auto_path_append | ||
863 | 91 | unset _perl_prog | ||
864 | 92 | unset _epics_host_arch | ||
865 | 93 | unset _epics_base | ||
866 | 94 | unset _epics_base_src | ||
867 | 95 | unset _epics_host_arch_pl | ||
868 | 96 | unset _src_epics_host_arch_pl | ||
869 | diff --git a/startup/unix.sh b/startup/unix.sh | |||
870 | 0 | new file mode 100644 | 97 | new file mode 100644 |
871 | index 0000000..a8d8328 | |||
872 | --- /dev/null | |||
873 | +++ b/startup/unix.sh | |||
874 | @@ -0,0 +1,100 @@ | |||
875 | 1 | #************************************************************************* | ||
876 | 2 | # Copyright (c) 2002 The University of Chicago, as Operator of Argonne | ||
877 | 3 | # National Laboratory. | ||
878 | 4 | # Copyright (c) 2002 The Regents of the University of California, as | ||
879 | 5 | # Operator of Los Alamos National Laboratory. | ||
880 | 6 | # EPICS BASE Versions 3.13.7 | ||
881 | 7 | # and higher are distributed subject to a Software License Agreement found | ||
882 | 8 | # in file LICENSE that is included with this distribution. | ||
883 | 9 | #************************************************************************* | ||
884 | 10 | # | ||
885 | 11 | # Site-specific EPICS environment settings | ||
886 | 12 | # | ||
887 | 13 | # Attempts to set EPICS_HOST_ARCH. Optionally, adds the EPICS Base | ||
888 | 14 | # install host architecture bin directory to PATH. | ||
889 | 15 | # | ||
890 | 16 | |||
891 | 17 | #----------------------------------------------------------------------- | ||
892 | 18 | # Site serviceable parts (These definitions may be modified) | ||
893 | 19 | #----------------------------------------------------------------------- | ||
894 | 20 | |||
895 | 21 | # Automatically set up the environment when possible ("yes" or "no"). | ||
896 | 22 | # If set to yes, as much of the environment will be set up as possible. | ||
897 | 23 | # If set to no, just the minimum environment will be set up. More | ||
898 | 24 | # specific _auto_* definitions take precedence over this definition. | ||
899 | 25 | _auto=no | ||
900 | 26 | |||
901 | 27 | # Automatically append to PATH ("yes" or "no"). If set to yes, the | ||
902 | 28 | # EPICS Base install host architecture bin directory will be added to | ||
903 | 29 | # PATH if possible. If set to no, the bin directory will not be added | ||
904 | 30 | # to PATH. | ||
905 | 31 | _auto_path_append=$_auto | ||
906 | 32 | |||
907 | 33 | # The program used to run Perl scripts (pathname). | ||
908 | 34 | _perl_prog=perl | ||
909 | 35 | |||
910 | 36 | # The EPICS host architecture specification for EPICS_HOST_ARCH | ||
911 | 37 | # (<os>-<arch>[-<toolset>] as defined in configure/CONFIG_SITE). If | ||
912 | 38 | # nonempty, the value will be used as the value of EPICS_HOST_ARCH. If | ||
913 | 39 | # empty, an attempt will be made to automatically determine the value | ||
914 | 40 | # with EpicsHostArch.pl. | ||
915 | 41 | _epics_host_arch= | ||
916 | 42 | |||
917 | 43 | # The install location of EPICS Base (pathname). If nonempty, the | ||
918 | 44 | # EpicsHostArch.pl script from it, if it exists, will be used to | ||
919 | 45 | # determine EPICS_HOST_ARCH. If nonempty and EPICS_HOST_ARCH was | ||
920 | 46 | # determined successfully, it will be used to add the host architecture | ||
921 | 47 | # bin directory to PATH if _auto_path_append is yes. | ||
922 | 48 | _epics_base= | ||
923 | 49 | |||
924 | 50 | # The source location of EPICS Base (pathname). If nonempty, the | ||
925 | 51 | # EpicsHostArch.pl script from it, if it exists and _epics_base is empty | ||
926 | 52 | # or it did not exist in the _epics_base location, will be used to | ||
927 | 53 | # determine EPICS_HOST_ARCH. | ||
928 | 54 | _epics_base_src= | ||
929 | 55 | |||
930 | 56 | #----------------------------------------------------------------------- | ||
931 | 57 | # Internal parts (There is typically no need to modify these) | ||
932 | 58 | #----------------------------------------------------------------------- | ||
933 | 59 | |||
934 | 60 | # Define the possible locations of EpicsHostArch.pl | ||
935 | 61 | _epics_host_arch_pl= | ||
936 | 62 | _src_epics_host_arch_pl= | ||
937 | 63 | if [ -n "$_epics_base" ]; then | ||
938 | 64 | _epics_host_arch_pl="$_epics_base/lib/perl/EpicsHostArch.pl" | ||
939 | 65 | fi | ||
940 | 66 | if [ -n "$_epics_base_src" ]; then | ||
941 | 67 | _src_epics_host_arch_pl="$_epics_base_src/src/tools/EpicsHostArch.pl" | ||
942 | 68 | fi | ||
943 | 69 | |||
944 | 70 | # Set the EPICS host architecture specification | ||
945 | 71 | if [ -n "$_epics_host_arch" ]; then | ||
946 | 72 | EPICS_HOST_ARCH=$_epics_host_arch | ||
947 | 73 | export EPICS_HOST_ARCH | ||
948 | 74 | elif [ -e "$_epics_host_arch_pl" ]; then | ||
949 | 75 | _epics_host_arch=$("$_perl_prog" "$_epics_host_arch_pl") | ||
950 | 76 | EPICS_HOST_ARCH=$_epics_host_arch | ||
951 | 77 | export EPICS_HOST_ARCH | ||
952 | 78 | elif [ -e "$_src_epics_host_arch_pl" ]; then | ||
953 | 79 | _epics_host_arch=$("$_perl_prog" "$_src_epics_host_arch_pl") | ||
954 | 80 | EPICS_HOST_ARCH=$_epics_host_arch | ||
955 | 81 | export EPICS_HOST_ARCH | ||
956 | 82 | fi | ||
957 | 83 | |||
958 | 84 | # Add the EPICS Base host architecture bin directory to PATH | ||
959 | 85 | if [ "$_auto_path_append" = yes ]; then | ||
960 | 86 | if [ -n "$_epics_base" ] && [ -n "$_epics_host_arch" ]; then | ||
961 | 87 | PATH="$PATH:$_epics_base/bin/$_epics_host_arch" | ||
962 | 88 | export PATH | ||
963 | 89 | fi | ||
964 | 90 | fi | ||
965 | 91 | |||
966 | 92 | # Don't leak variables into the environment | ||
967 | 93 | unset _auto | ||
968 | 94 | unset _auto_path_append | ||
969 | 95 | unset _perl_prog | ||
970 | 96 | unset _epics_host_arch | ||
971 | 97 | unset _epics_base | ||
972 | 98 | unset _epics_base_src | ||
973 | 99 | unset _epics_host_arch_pl | ||
974 | 100 | unset _src_epics_host_arch_pl | ||
975 | diff --git a/startup/win32.bat b/startup/win32.bat | |||
976 | index af9155d..6652fc9 100644 | |||
977 | --- a/startup/win32.bat | |||
978 | +++ b/startup/win32.bat | |||
979 | @@ -1,147 +1,105 @@ | |||
1127 | 1 | @ECHO OFF | 1 | @echo off |
1128 | 2 | REM ************************************************************************* | 2 | rem ************************************************************************* |
1129 | 3 | REM Copyright (c) 2002 The University of Chicago, as Operator of Argonne | 3 | rem Copyright (c) 2017 UChicago Argonne LLC, as Operator of Argonne |
1130 | 4 | REM National Laboratory. | 4 | rem National Laboratory. |
1131 | 5 | REM Copyright (c) 2002 The Regents of the University of California, as | 5 | rem Copyright (c) 2002 The Regents of the University of California, as |
1132 | 6 | REM Operator of Los Alamos National Laboratory. | 6 | rem Operator of Los Alamos National Laboratory. |
1133 | 7 | REM EPICS BASE Versions 3.13.7 | 7 | rem EPICS BASE is distributed subject to a Software License Agreement found |
1134 | 8 | REM and higher are distributed subject to a Software License Agreement found | 8 | rem in file LICENSE that is included with this distribution. |
1135 | 9 | REM in file LICENSE that is included with this distribution. | 9 | rem ************************************************************************* |
1136 | 10 | REM ************************************************************************* | 10 | rem |
1137 | 11 | REM | 11 | rem Site-specific EPICS environment settings |
1138 | 12 | REM Site-specific EPICS environment settings | 12 | rem |
1139 | 13 | REM | 13 | rem Sets EPICS_HOST_ARCH and the environment for Microsoft Visual Studio. |
1140 | 14 | REM sites should modify these definitions | 14 | rem Optionally, resets PATH, adds Strawberry Perl to PATH, and adds the |
1141 | 15 | 15 | rem EPICS Base install host architecture bin directory to PATH. | |
1142 | 16 | REM ====================================================== | 16 | rem |
1143 | 17 | REM ====== REQUIRED ENVIRONMENT VARIABLES FOLLOW ====== | 17 | |
1144 | 18 | REM ====================================================== | 18 | rem ---------------------------------------------------------------------- |
1145 | 19 | 19 | rem Site serviceable parts (These definitions may be modified) | |
1146 | 20 | REM ====================================================== | 20 | rem ---------------------------------------------------------------------- |
1147 | 21 | REM ---------------- WINDOWS --------------------------- | 21 | |
1148 | 22 | REM ====================================================== | 22 | rem The values of the definitions in this section must not contain |
1149 | 23 | REM ----- WIN95 ----- | 23 | rem double-quotes. |
1150 | 24 | REM set PATH=C:\WINDOWS;C:\WINDOWS\COMMAND | 24 | rem |
1151 | 25 | REM ----- WINNT, WIN2000 ----- | 25 | rem * Right: set _foo=C:\foo |
1152 | 26 | REM set PATH=C:\WINNT;C:\WINNT\SYSTEM32 | 26 | rem * Right: set "_foo=C:\foo" |
1153 | 27 | REM ----- WINXP, Vista, Windows 7 ----- | 27 | rem * Wrong: set _foo="C:\foo" |
1154 | 28 | set PATH=C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\SYSTEM32\Wbem | 28 | |
1155 | 29 | 29 | rem Automatically set up the environment when possible ("yes" or "no"). | |
1156 | 30 | REM ====================================================== | 30 | rem If set to yes, as much of the environment will be set up as possible. |
1157 | 31 | REM ---------------- make and perl --------------------- | 31 | rem If set to no, just the minimum environment will be set up. More |
1158 | 32 | REM ====================================================== | 32 | rem specific _auto_* definitions take precedence over this definition. |
1159 | 33 | 33 | set _auto=no | |
1160 | 34 | REM --------------- ActiveState perl ------------------- | 34 | |
1161 | 35 | set PATH=C:\Perl\bin;%PATH% | 35 | rem Automatically reset PATH ("yes" or "no"). If set to yes, PATH will |
1162 | 36 | 36 | rem be reset to the value of _path_new. If set to no, PATH will not be | |
1163 | 37 | REM --------------- mingw make ------------------------ | 37 | rem reset. |
1164 | 38 | REM set PATH=C:\mingw-make\bin;%PATH% | 38 | set _auto_path_reset=%_auto% |
1165 | 39 | REM set PATH=C:\mingw-make82-3\bin;%PATH% | 39 | |
1166 | 40 | 40 | rem Automatically append to PATH ("yes" or "no"). If set to yes, the | |
1167 | 41 | REM --------------- gnuwin32 make ---------------------- | 41 | rem EPICS Base install host architecture bin directory will be added to |
1168 | 42 | set PATH=C:\gnuwin32\bin;%PATH% | 42 | rem PATH if possible. If set to no, the bin directory will not be added |
1169 | 43 | 43 | rem to PATH. | |
1170 | 44 | REM ====================================================== | 44 | set _auto_path_append=%_auto% |
1171 | 45 | REM ---------------- cygwin tools ------------------------ | 45 | |
1172 | 46 | REM ====================================================== | 46 | rem The new value for PATH. If _auto_path_reset is yes, PATH will be set |
1173 | 47 | REM (make & perl if above perl and make are REMs) | 47 | rem to it. |
1174 | 48 | REM Dont use cygwin GNU make and Perl! | 48 | set _path_new=C:\Windows\System32;C:\Windows;C:\Windows\System32\wbem |
1175 | 49 | REM cygwin contains tk/tcl, vim, perl, and many unix tools | 49 | |
1176 | 50 | REM need grep from here NOT from cvs directory | 50 | rem The location of Strawberry Perl (pathname). If empty, Strawberry Perl |
1177 | 51 | REM set PATH=%PATH%;.;.. | 51 | rem is assumed to already be in PATH and will not be added. If nonempty, |
1178 | 52 | REM set PATH=%PATH%;c:\cygwin\bin | 52 | rem Strawberry Perl will be added to PATH. |
1179 | 53 | 53 | set _strawberry_perl_home=C:\Strawberry | |
1180 | 54 | REM ====================================================== | 54 | |
1181 | 55 | REM --------------- Visual c++ ------------------------- | 55 | rem The location of Microsoft Visual Studio (pathname). |
1182 | 56 | REM ====================================================== | 56 | set _visual_studio_home=C:\Program Files (x86)\Microsoft Visual Studio 14.0 |
1183 | 57 | 57 | ||
1184 | 58 | REM ------ Microsoft Visual Studio 2005 ------ | 58 | rem The EPICS host architecture specification for EPICS_HOST_ARCH |
1185 | 59 | REM call "C:\Program files\Microsoft Visual Studio 8\VC\vcvarsall.bat" x86_amd64 | 59 | rem (<os>-<arch>[-<toolset>] as defined in configure/CONFIG_SITE). |
1186 | 60 | REM set PATH=%PATH%;C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin | 60 | set _epics_host_arch=win32-x86 |
1187 | 61 | REM set INCLUDE=%INCLUDE%;C:\Program Files\Microsoft SDKs\Windows\v6.0A\include | 61 | |
1188 | 62 | REM REM set LIBPATH=%LIBPATH%;C:\Program Files\Microsoft SDKs\Windows\v6.0A\lib | 62 | rem The install location of EPICS Base (pathname). If nonempty and |
1189 | 63 | REM set LIB=%LIB%;C:\Program Files\Microsoft SDKs\Windows\v6.0A\lib | 63 | rem _auto_path_append is yes, it will be used to add the host architecture |
1190 | 64 | 64 | rem bin directory to PATH. | |
1191 | 65 | REM ------ Microsoft Visual Studio 2008 ------ | 65 | set _epics_base= |
1192 | 66 | REM call "C:\Program files\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat" | 66 | |
1193 | 67 | REM call "C:\Program files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86_amd64 | 67 | rem ---------------------------------------------------------------------- |
1194 | 68 | REM set PATH=C:\Program Files\Microsoft SDKs\Windows\v7.0\bin;%PATH% | 68 | rem Internal parts (There is typically no need to modify these) |
1195 | 69 | REM set INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v7.0\include;%INCLUDE% | 69 | rem ---------------------------------------------------------------------- |
1196 | 70 | REM set LIBPATH=C:\Program Files\Microsoft SDKs\Windows\v7.0\lib;%LIBPATH% | 70 | |
1197 | 71 | REM set LIB=C:\Program Files\Microsoft SDKs\Windows\v7.0\lib;%LIB% | 71 | rem Reset PATH |
1198 | 72 | 72 | if "%_auto_path_reset%" == "yes" ( | |
1199 | 73 | REM ----- Visual Studion 2010 ----- | 73 | set "PATH=%_path_new%" |
1200 | 74 | REM -- windows-x64 --- | 74 | ) |
1201 | 75 | REM call "C:\Program files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x64 | 75 | |
1202 | 76 | REM -- win32-x86 --- | 76 | rem Add Strawberry Perl to PATH |
1203 | 77 | call "C:\Program files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 | 77 | if "%_strawberry_perl_home%" == "" goto after_add_strawberry_perl |
1204 | 78 | 78 | rem Can't do this inside parentheses because PATH would be read only once | |
1205 | 79 | REM ====================================================== | 79 | set "PATH=%PATH%;%_strawberry_perl_home%\c\bin" |
1206 | 80 | REM --------------- EPICS -------------------------------- | 80 | set "PATH=%PATH%;%_strawberry_perl_home%\perl\site\bin" |
1207 | 81 | REM ====================================================== | 81 | set "PATH=%PATH%;%_strawberry_perl_home%\perl\bin" |
1208 | 82 | REM set EPICS_HOST_ARCH=windows-x64 | 82 | :after_add_strawberry_perl |
1209 | 83 | set EPICS_HOST_ARCH=win32-x86 | 83 | |
1210 | 84 | set PATH=%PATH%;G:\epics\base\bin\%EPICS_HOST_ARCH% | 84 | rem Set the environment for Microsoft Visual Studio |
1211 | 85 | set PATH=%PATH%;G:\epics\extensions\bin\%EPICS_HOST_ARCH% | 85 | call "%_visual_studio_home%\VC\vcvarsall.bat" x86 |
1212 | 86 | 86 | ||
1213 | 87 | REM ====================================================== | 87 | rem Set the EPICS host architecture specification |
1214 | 88 | REM ------- OPTIONAL ENVIRONMENT VARIABLES FOLLOW -------- | 88 | set "EPICS_HOST_ARCH=%_epics_host_arch%" |
1215 | 89 | REM ====================================================== | 89 | |
1216 | 90 | 90 | rem Add the EPICS Base host architecture bin directory to PATH | |
1217 | 91 | REM ====================================================== | 91 | if "%_auto_path_append%" == "yes" ( |
1218 | 92 | REM ----------------- remote CVS ------------------------- | 92 | if not "%_epics_base%" == "" ( |
1219 | 93 | REM ====================================================== | 93 | set "PATH=%PATH%;%_epics_base%\bin\%_epics_host_arch%" |
1220 | 94 | REM set CVS_RSH=c:/cygwin/bin/ssh.exe | 94 | ) |
1221 | 95 | REM set CVSROOT=:ext:jba@aps.anl.gov:/usr/local/epicsmgr/cvsroot | 95 | ) |
1222 | 96 | REM set HOME=c:/users/%USERNAME% | 96 | |
1223 | 97 | REM set HOME=c:/users/jba | 97 | rem Don't leak variables into the environment |
1224 | 98 | 98 | set _auto= | |
1225 | 99 | REM ====================================================== | 99 | set _auto_path_reset= |
1226 | 100 | REM ------------------- Bazaar --------------------------- | 100 | set _auto_path_append= |
1227 | 101 | REM ====================================================== | 101 | set _path_new= |
1228 | 102 | set PATH=%PATH%;C:\Program files\Bazaar | 102 | set _strawberry_perl_home= |
1229 | 103 | 103 | set _visual_studio_home= | |
1230 | 104 | REM ====================================================== | 104 | set _epics_host_arch= |
1231 | 105 | REM ----------------- GNU make flags --------------------- | 105 | set _epics_base= |
1085 | 106 | REM ====================================================== | ||
1086 | 107 | set MAKEFLAGS=-w | ||
1087 | 108 | |||
1088 | 109 | REM ====================================================== | ||
1089 | 110 | REM -------------- vim (use cygwin vim ) ----------------- | ||
1090 | 111 | REM ====================================================== | ||
1091 | 112 | REM HOME needed by vim to write .viminfo file. | ||
1092 | 113 | REM VIM needed by vim to find _vimrc file. | ||
1093 | 114 | REM set VIM=c:\cygwin | ||
1094 | 115 | |||
1095 | 116 | REM ====================================================== | ||
1096 | 117 | REM --------------- Epics Channel Access ----------------- | ||
1097 | 118 | REM Modify and uncomment the following lines | ||
1098 | 119 | REM to override the base/configure/CONFIG_ENV defaults | ||
1099 | 120 | REM ====================================================== | ||
1100 | 121 | REM set EPICS_CA_ADDR_LIST=n.n.n.n n.n.n.n | ||
1101 | 122 | REM set EPICS_CA_AUTO_ADDR_LIST=YES | ||
1102 | 123 | |||
1103 | 124 | REM set EPICS_CA_CONN_TMO=30.0 | ||
1104 | 125 | REM set EPICS_CA_BEACON_PERIOD=15.0 | ||
1105 | 126 | REM set EPICS_CA_REPEATER_PORT=5065 | ||
1106 | 127 | REM set EPICS_CA_SERVER_PORT=5064 | ||
1107 | 128 | REM set EPICS_TS_MIN_WEST=420 | ||
1108 | 129 | |||
1109 | 130 | REM ====================================================== | ||
1110 | 131 | REM --------------- JAVA --------------------------------- | ||
1111 | 132 | REM ====================================================== | ||
1112 | 133 | REM Needed for java extensions | ||
1113 | 134 | REM set CLASSPATH=G:\epics\extensions\javalib | ||
1114 | 135 | REM set PATH=%PATH%;C:\j2sdk1.4.1_01\bin | ||
1115 | 136 | REM set CLASSPATH=%CLASSPATH%;C:\j2sdk1.4.1_01\lib\tools.jar | ||
1116 | 137 | |||
1117 | 138 | REM ====================================================== | ||
1118 | 139 | REM --------------- Exceed ------------------------------- | ||
1119 | 140 | REM Needed for X11 extensions | ||
1120 | 141 | REM ====================================================== | ||
1121 | 142 | REM set EX_VER=7.10 | ||
1122 | 143 | REM set EX_VER=12.00 | ||
1123 | 144 | REM set EX_VER=14.00 | ||
1124 | 145 | REM set PATH=%PATH%;C:\Exceed%EX_VER%\XDK\ | ||
1125 | 146 | REM set PATH=%PATH%;C:\Program Files\Hummingbird\Connectivity\%EX_VER%\Exceed\ | ||
1126 | 147 | |||
1232 | diff --git a/startup/windows.bat b/startup/windows.bat | |||
1233 | 148 | new file mode 100644 | 106 | new file mode 100644 |
1234 | index 0000000..877c0d5 | |||
1235 | --- /dev/null | |||
1236 | +++ b/startup/windows.bat | |||
1237 | @@ -0,0 +1,105 @@ | |||
1238 | 1 | @echo off | ||
1239 | 2 | rem ************************************************************************* | ||
1240 | 3 | rem Copyright (c) 2017 UChicago Argonne LLC, as Operator of Argonne | ||
1241 | 4 | rem National Laboratory. | ||
1242 | 5 | rem Copyright (c) 2002 The Regents of the University of California, as | ||
1243 | 6 | rem Operator of Los Alamos National Laboratory. | ||
1244 | 7 | rem EPICS BASE is distributed subject to a Software License Agreement found | ||
1245 | 8 | rem in file LICENSE that is included with this distribution. | ||
1246 | 9 | rem ************************************************************************* | ||
1247 | 10 | rem | ||
1248 | 11 | rem Site-specific EPICS environment settings | ||
1249 | 12 | rem | ||
1250 | 13 | rem Sets EPICS_HOST_ARCH and the environment for Microsoft Visual Studio. | ||
1251 | 14 | rem Optionally, resets PATH, adds Strawberry Perl to PATH, and adds the | ||
1252 | 15 | rem EPICS Base install host architecture bin directory to PATH. | ||
1253 | 16 | rem | ||
1254 | 17 | |||
1255 | 18 | rem ---------------------------------------------------------------------- | ||
1256 | 19 | rem Site serviceable parts (These definitions may be modified) | ||
1257 | 20 | rem ---------------------------------------------------------------------- | ||
1258 | 21 | |||
1259 | 22 | rem The values of the definitions in this section must not contain | ||
1260 | 23 | rem double-quotes. | ||
1261 | 24 | rem | ||
1262 | 25 | rem * Right: set _foo=C:\foo | ||
1263 | 26 | rem * Right: set "_foo=C:\foo" | ||
1264 | 27 | rem * Wrong: set _foo="C:\foo" | ||
1265 | 28 | |||
1266 | 29 | rem Automatically set up the environment when possible ("yes" or "no"). | ||
1267 | 30 | rem If set to yes, as much of the environment will be set up as possible. | ||
1268 | 31 | rem If set to no, just the minimum environment will be set up. More | ||
1269 | 32 | rem specific _auto_* definitions take precedence over this definition. | ||
1270 | 33 | set _auto=no | ||
1271 | 34 | |||
1272 | 35 | rem Automatically reset PATH ("yes" or "no"). If set to yes, PATH will | ||
1273 | 36 | rem be reset to the value of _path_new. If set to no, PATH will not be | ||
1274 | 37 | rem reset. | ||
1275 | 38 | set _auto_path_reset=%_auto% | ||
1276 | 39 | |||
1277 | 40 | rem Automatically append to PATH ("yes" or "no"). If set to yes, the | ||
1278 | 41 | rem EPICS Base install host architecture bin directory will be added to | ||
1279 | 42 | rem PATH if possible. If set to no, the bin directory will not be added | ||
1280 | 43 | rem to PATH. | ||
1281 | 44 | set _auto_path_append=%_auto% | ||
1282 | 45 | |||
1283 | 46 | rem The new value for PATH. If _auto_path_reset is yes, PATH will be set | ||
1284 | 47 | rem to it. | ||
1285 | 48 | set _path_new=C:\Windows\System32;C:\Windows;C:\Windows\System32\wbem | ||
1286 | 49 | |||
1287 | 50 | rem The location of Strawberry Perl (pathname). If empty, Strawberry Perl | ||
1288 | 51 | rem is assumed to already be in PATH and will not be added. If nonempty, | ||
1289 | 52 | rem Strawberry Perl will be added to PATH. | ||
1290 | 53 | set _strawberry_perl_home=C:\Strawberry | ||
1291 | 54 | |||
1292 | 55 | rem The location of Microsoft Visual Studio (pathname). | ||
1293 | 56 | set _visual_studio_home=C:\Program Files (x86)\Microsoft Visual Studio 14.0 | ||
1294 | 57 | |||
1295 | 58 | rem The EPICS host architecture specification for EPICS_HOST_ARCH | ||
1296 | 59 | rem (<os>-<arch>[-<toolset>] as defined in configure/CONFIG_SITE). | ||
1297 | 60 | set _epics_host_arch=windows-x64 | ||
1298 | 61 | |||
1299 | 62 | rem The install location of EPICS Base (pathname). If nonempty and | ||
1300 | 63 | rem _auto_path_append is yes, it will be used to add the host architecture | ||
1301 | 64 | rem bin directory to PATH. | ||
1302 | 65 | set _epics_base= | ||
1303 | 66 | |||
1304 | 67 | rem ---------------------------------------------------------------------- | ||
1305 | 68 | rem Internal parts (There is typically no need to modify these) | ||
1306 | 69 | rem ---------------------------------------------------------------------- | ||
1307 | 70 | |||
1308 | 71 | rem Reset PATH | ||
1309 | 72 | if "%_auto_path_reset%" == "yes" ( | ||
1310 | 73 | set "PATH=%_path_new%" | ||
1311 | 74 | ) | ||
1312 | 75 | |||
1313 | 76 | rem Add Strawberry Perl to PATH | ||
1314 | 77 | if "%_strawberry_perl_home%" == "" goto after_add_strawberry_perl | ||
1315 | 78 | rem Can't do this inside parentheses because PATH would be read only once | ||
1316 | 79 | set "PATH=%PATH%;%_strawberry_perl_home%\c\bin" | ||
1317 | 80 | set "PATH=%PATH%;%_strawberry_perl_home%\perl\site\bin" | ||
1318 | 81 | set "PATH=%PATH%;%_strawberry_perl_home%\perl\bin" | ||
1319 | 82 | :after_add_strawberry_perl | ||
1320 | 83 | |||
1321 | 84 | rem Set the environment for Microsoft Visual Studio | ||
1322 | 85 | call "%_visual_studio_home%\VC\vcvarsall.bat" x64 | ||
1323 | 86 | |||
1324 | 87 | rem Set the EPICS host architecture specification | ||
1325 | 88 | set "EPICS_HOST_ARCH=%_epics_host_arch%" | ||
1326 | 89 | |||
1327 | 90 | rem Add the EPICS Base host architecture bin directory to PATH | ||
1328 | 91 | if "%_auto_path_append%" == "yes" ( | ||
1329 | 92 | if not "%_epics_base%" == "" ( | ||
1330 | 93 | set "PATH=%PATH%;%_epics_base%\bin\%_epics_host_arch%" | ||
1331 | 94 | ) | ||
1332 | 95 | ) | ||
1333 | 96 | |||
1334 | 97 | rem Don't leak variables into the environment | ||
1335 | 98 | set _auto= | ||
1336 | 99 | set _auto_path_reset= | ||
1337 | 100 | set _auto_path_append= | ||
1338 | 101 | set _path_new= | ||
1339 | 102 | set _strawberry_perl_home= | ||
1340 | 103 | set _visual_studio_home= | ||
1341 | 104 | set _epics_host_arch= | ||
1342 | 105 | set _epics_base= |
@Martin: Thanks for reviewing this.