mv api/unstable/*.h
-> api/s2n/unstable/*.h
#4825
Closed
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.
Issue:
External projects can always do:
#include <s2n.h>
But, for the unstable headers the path is either
#include <s2n/unstable/cleanup.h>
or
#include <unstable/cleanup.h>
...depending on whether
s2n
was installed before your project, or built at the same time as your project via CMake's add_subdirectory(s2n). CRT language bindings likeaws-crt-python
build s2n via add_subdirectory.Description of changes:
api/unstable/*.h
->api/s2n/unstable/*.h
#include <s2n/unstable/XYZ.h>
works regardless of how s2n was builtCall-outs:
I tried to use a symlink from
api/unstable
->api/s2n/unstable
, to keep the old paths working too, but it was confusing tools likecp -r
andzip
. See failed build here.An alternate fix was attempted here: #4826
It relies entirely on one symlink and changes very few files, but it's failing for the same reason as the symlink mentioned above.
Testing:
unstable/*.h
pathss2n/unstable/*.h
pathsBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.