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

Add dependencies as subtrees #12

Merged
merged 15 commits into from
Aug 10, 2018
Merged

Add dependencies as subtrees #12

merged 15 commits into from
Aug 10, 2018

Conversation

bpintea
Copy link
Collaborator

@bpintea bpintea commented Jul 23, 2018

Added the external code - ODBC-Specification, c-timestamp, curl and ujson4c - as subtrees of the ODBC project.

Forked ujson4c library under elastic (https://github.com/elastic/ujson4c.git), to patch the (long standing) bugs and add some light extra functionality.
To that end, I've also removed one function from ODBC's code, which I've added into ujson4c's.

Googletest remains a ExternalProject (cmake's lingo), pulled in only on request (i.e. building/running the unit tests).

bpintea added 12 commits July 20, 2018 19:44
git-subtree-dir: libs/ODBC-Specification
git-subtree-split: 51d4b3a197a9333a7c8a7685c17c462df5e29cc7
git-subtree-dir: libs/c-timestamp
git-subtree-split: b205c407ae6680d23d74359ac00444b80989792f
git-subtree-dir: libs/ujson4c
git-subtree-split: 65d3e35864ee501a2b21fe5af8a45667d36a42be
git-subtree-dir: libs/curl
git-subtree-split: d0924d0e03ef6ecc8da27d57f2f4994bcfb7af29
- this should simplify building and maintaining the project;
- libcurl is build at config stage now, as a prerequisite; (this will
also skip attempting to build it along with the driver.)
6c0831944 add function to return lenght of an array

git-subtree-dir: libs/ujson4c
git-subtree-split: 6c0831944229cadc6948c12833faad999fb6cd47
UJLengthArray() now provides the functionality of UJArraySize().
@bpintea bpintea requested review from edsavage and droberts195 July 23, 2018 12:10
@bpintea bpintea mentioned this pull request Jul 23, 2018
Closed
bpintea added 3 commits July 24, 2018 22:02
9f8383bff fix: don't export helper funcs JSON_XcodeObject

git-subtree-dir: libs/ujson4c
git-subtree-split: 9f8383bff7434cec7501d375ae0d6cef911f6095
UJSON4C exported one function inappropriately, likely a remnant of how
the library was assembled.
The export was removed in the library, so the partial workaround
(anonymizing the symbol) is no longer needed.
@bpintea
Copy link
Collaborator Author

bpintea commented Jul 24, 2018

Sorry for adding one more commit after requesting reviewing -- just discovered one more workaround for UJSON4C which could be now removed and I thought it would make sense to bundle it with this PR.
I believe this had been the last commit for the PR though, so it can be reviewed.

Copy link
Contributor

@droberts195 droberts195 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

One more thing that will need to be done before integrating with release manager is to add a script that returns the 3rd party details in CSV format - see elastic/release-manager#207

However, this does not need to be done in this PR.

@bpintea
Copy link
Collaborator Author

bpintea commented Jul 25, 2018

Thanks, Dave, added RM#207 to my TODOs.

@bpintea bpintea merged commit b5e999a into elastic:master Aug 10, 2018
@bpintea bpintea deleted the feature/deps_as_subtrees branch August 10, 2018 18:20
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.

2 participants