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.

Sign up for GitHub

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

Jump to bottom

Refactor to use rapidjson and websocketpp #547

Merged
merged 30 commits into from
May 30, 2019
Merged

Refactor to use rapidjson and websocketpp #547

merged 30 commits into from
May 30, 2019

Conversation

nico-abram
Copy link
Member

Instead of jsoncpp and nlohmann json for modern C++, and uwebsockets(micro)

nico-abram added 30 commits May 26, 2019 05:18
@nico-abram
Add rapidjson as direct dependency
ace2912
@nico-abram
Squashed 'extern/rapidjson/' content from commit 2fb78f9cee
7938864 
git-subtree-dir: extern/rapidjson
git-subtree-split: 2fb78f9cee01996f020d5af7592b37c5a0693b31
@nico-abram
Merge commit '793886484281fcb471b391692fc744770d669b7f' as 'extern/ra…
6a92fd5 
…pidjson'
@nico-abram
Fix rapidjson cmake
63cc7d9
@nico-abram
Use rapidjson for top25,packlist and fav eo api responses
c8ee33f
@nico-abram
Finish rewriting dlman to use rapidjson
e3f1aef
@nico-abram
Remove jsoncpp
7b5c562
@nico-abram
Rewrite nsman to use rapidjson
d69e11a
@nico-abram
Remove nlohmann json from the build
2c5fbfe
@nico-abram
Remove nlohmann json from the repo
79f3d33
@nico-abram
Link rapidjson privately in discord-rpc
6ad7101 
Thanks @jameskr97
@nico-abram
Squashed 'extern/websocketpp/' content from commit 72e2760a4c
5a90e5b 
git-subtree-dir: extern/websocketpp
git-subtree-split: 72e2760a4cceef2d270450746ce90efce9374eb8
@nico-abram
Merge commit '5a90e5b7a1fc3ff04f1dcc054c26e9624b7eb75f' as 'extern/we…
4061353 
…bsocketpp'
@nico-abram
Add asio
f76b917
@nico-abram
Link websocketpp
4b47c4e
@nico-abram
Replace uws with wspp
a8b88f7
@nico-abram
Merge branch 'wspp' into rapidjson2
cf2e3e0
@nico-abram
Remove uws from the repo
af6ba96
@nico-abram
Actually remove uws
424e9ef
@nico-abram
Fix compiler error on clang/gcc
2979dc6
@nico-abram
Fix undetected conflict?
30e6a40
@nico-abram
God I hate namespacing
3d5e80d
@nico-abram
Fix string/char* typo
202910f
@nico-abram
Fix typo
2522802
@nico-abram
Fix undetected conflicts using old uws variable
9821e62
@nico-abram
Remove remaining reference to uws target in cmake
d61c5ec
@nico-abram
Add missing dependency on ssl for asio
df6411d
@nico-abram
Add missing INTERFACE keyword in asio cmake
72a7247
@nico-abram
Attempt to fix https://travis-ci.org/etternagame/etterna/jobs/538643…
1f14878 
…860#L2639
@nico-abram
Merge branch 'develop' into bloated
75c8637
@nico-abram nico-abram requested a review from jameskr97 May 30, 2019 00:58
jameskr97
jameskr97 approved these changes May 30, 2019
View reviewed changes
Copy link
Member

@jameskr97 jameskr97 left a comment

Choose a reason for hiding this comment

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

I tested this PR on macoS, and was able to sucessfully build and run. It's a simple change, and keeps the cleanliness of the CMake. This is OK for merge from me.

@jameskr97 jameskr97 mentioned this pull request May 30, 2019
Closed
@nico-abram nico-abram merged commit a9edc05 into develop May 30, 2019
@nico-abram nico-abram deleted the bloated branch May 31, 2019 02:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jameskr97 jameskr97 jameskr97 approved these changes

Assignees

@nico-abram nico-abram

Labels
Priority: Low Type: Enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nico-abram @jameskr97