Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Andor SDK 2.102.30034.0 #14

Merged
merged 11 commits into from Dec 13, 2017
Merged

Andor SDK 2.102.30034.0 #14

merged 11 commits into from Dec 13, 2017

Conversation

hinxx
Copy link
Contributor

@hinxx hinxx commented Dec 12, 2017

Adding Andor SDK 2.102.30034.0 for Linux.
Some changes to the handling of shamrock.

@MarkRivers
Copy link
Member

You have changed the softlinks in the .so files from linking to .so.2 to linking to the specific version.
Previously is was this:

lrwxrwxrwx 1 epics domain users       13 Feb 18  2014 libandor.so -> libandor.so.2
lrwxrwxrwx 1 epics domain users       31 Mar 12  2015 libandor.so.2 -> libandor-x86_64.so.2.99.30002.0
-rwxrwxr-x 1 epics domain users   355847 Nov 18  2014 libshamrockcif-stdc++6-x86_64.so.2.98.30000.0
-rwxrwxr-x 1 epics domain users   888794 Mar 12  2015 libshamrockcif-x86_64.so.2.99.30002.0
lrwxrwxrwx 1 epics domain users       19 Dec  3  2014 libshamrockcif.so -> libshamrockcif.so.2
lrwxrwxrwx 1 epics domain users       37 Mar 12  2015 libshamrockcif.so.2 -> libshamrockcif-x86_64.so.2.99.30002.0

Is there any reason to change libandor.so and libsharmrockcif.so? It seems like only the .so.2 files need to be changed? And the new library you added should be done the same?

@hinxx
Copy link
Contributor Author

hinxx commented Dec 13, 2017

It was not intentional, I've changed my PR.

@MarkRivers MarkRivers merged commit d9891d8 into areaDetector:master Dec 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants