Merge ~epics-contrib/epics-base/+git/contrib:tidy-startup into epics-base: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-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:
|
|||
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 | # |
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
@Martin: Thanks for reviewing this.