Merged
Conversation
AndreFavotto
force-pushed
the
andre/standardize-build
branch
2 times, most recently
from
74c5c3f to
3954677
Compare
tboegi
reviewed
Apr 1, 2026
tboegi
reviewed
Apr 1, 2026
tboegi
reviewed
Apr 1, 2026
In a default EPICS build, running "make" results in a bin/ folder with the binaries for the IOC to be ran (in here, adsExApp). At the moment, since we separate "build" and "install" steps, running make does not produce binaries. Fix that by setting "install" as the default target. One can still only build if needed by running "make build".
AndreFavotto
force-pushed
the
andre/standardize-build
branch
2 times, most recently
from
954f39d to
3d7fd95
Compare
This modules used an old e3 template when it was born. Different from the default module structure obtained from "makeBaseApp", we did not have a "iocBoot" folder, the startup script did not use the common binary shebang, and did not load the default dbd files. While this is possible to understand and workaround for people familiar with e3 system, it adds some extra steps for newcomers which are unnecessary, especially now that e3 is moving towards the default community, EPICS vanilla, format. This commit changes Makefiles and file structure to match the output from makeBaseApp.pl script. While there: two startup scripts named adsMotorRecord.cmd and adsMotorRecordOnly.cmd were present in the repo, but broken. They tried to load elements from [1], which is not part of this module, and were remainings of old versions [2] that used require. [1]: https://github.com/EuropeanSpallationSource/m-epics-ethercatmc [2]: https://github.com/epics-modules/twincat-ads/blob/e1ce7b81e2ed131f61fbccac20ada0b496015722/startup/adsMotorRecordOnly.cmd
AndreFavotto
force-pushed
the
andre/standardize-build
branch
from
3d7fd95 to
8277b38
Compare
Contributor
|
The stuff doesn't seem to compile ? |
Collaborator
Author
|
@tboegi which OS/arch are you on? The pipelines compiled successfully a series of times (you can check the logs), my local build also works fine. |
Contributor
|
@AndreFavotto This is under MacOS. The second time it compiled. Strange. I will merge. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Main changes:
1 - "install" is now the default target of "make" (i.e., produce binaries by default). This is the standard EPICS behaviour, but we did not have this here, so "make install" was always needed to get
bin/.2 - Make example IOC and other files in the default file structure (makeBaseApp.pl) instead of old e3 template.
3 - remove broken startup files that referenced ethercatmc
Details in the commit messages.