-
-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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
Refactor/split it #700
Refactor/split it #700
Conversation
Well, looks like codacy wakes up a bit late! |
444b7b7
to
97ee19a
Compare
Wow, this is a big PR... I am not sure yet whether I will be able to find my way around in the code. Let's see. |
Don't worry, this is just code moving from Edit: The +50 000 lines are from the tools actually ... that might be a problem, we could move it from the repo (a submodule would do the job, even if I'm not very fond of them) |
I know - but I got used to that one large file! |
Ahah time to let it go! |
Let's see. Maybe I see the benefits soon. |
Well one very big advantage is that people can work on different areas of the code much more easily, before, rebasing was just impossible (I tried, and it hurt). Also, after phase 3, it will be possible for users to only include what they want (e.g. the file where It's not possible yet, I didn't touch at |
97ee19a
to
2e289f9
Compare
Do you have any idea on travis failure? I don't get why the By the way, do you know if I can cancel Travis build? They take soooo long, and if I repush twice in a row, I have to wait 2 full hours to know if my last commit passed... |
Apparently, |
I overworked the Travis configuration. With 21726d8, the sanitizier should work again. |
Great! I will trigger Travis once I arrive to work. As for Codacy, I'd rather fix its warnings after this PR, as they were introduced before. I'll also rename commits to reflect the actual paths (omitted |
5410be8
to
c9f38ad
Compare
Hmm, coveralls seems to be hanging, is there some configuration files to modify too? |
c9f38ad
to
749ac02
Compare
a3f3ea2
to
fb56321
Compare
I have no idea why VS2017 fails, I ran the same commands than AppVeyor on my laptop, and all tests pass... |
I have the same problems with AppVeyor in the develop branch. :-S |
This seems related: http://help.appveyor.com/discussions/problems/7450-build-error-on-vs-2017-image-suddenly I give it a try. |
Looks promising, thanks! |
AppVeyor works now. |
fb56321
to
e6d7ce7
Compare
Thanks, I don't know about Coveralls though, but I just moved code around, so I don't believe it would be relevant if it was up. As I mentioned earlier about Codacy, I'd like to fix its warnings after the PR, since they are related to previous commits. |
8dfc69c
to
7e4ee23
Compare
Thanks a lot!!! |
Here it is.
This PR is the follow-up of #643, and the second phase of my planned refactoring (there will likely be one more, but we shall discuss it in a separate thread, since it requires naming/structural changes).
I've added a tool to amalgamate the library into a single header (like Catch does), @nlohmann pointed out this was necessary.
There is a new rule in the Makefile:
single_include
, that builds, and executes the tool.The output is located in the
single_include
folder, at the root of the repo.The only requirement is that every included file that is part of the library must be with the following style:
Each include must be done with a path relative to the source folder:
I've also added one test for each source file (except
json.hpp
), to check that we didn't miss any include.This will be helpful for future refactoring.