Skip to content

Move json.hpp to a peer folder of other third-party dependencies - Stage 1 - #1325

Merged
Tom Tan (ThomsonTan) merged 8 commits into
mainfrom
mkoscumb/MoveJsonHppStage1
Feb 6, 2025
Merged

Move json.hpp to a peer folder of other third-party dependencies - Stage 1#1325
Tom Tan (ThomsonTan) merged 8 commits into
mainfrom
mkoscumb/MoveJsonHppStage1

Conversation

@mkoscumb

@mkoscumb Matthew Koscumb (mkoscumb) commented Feb 3, 2025

Copy link
Copy Markdown
Contributor

Beyond being good dependency hygiene, this will also allow adopters which have their own copy of json.hpp to more easily use that when integrating the 1DS C++ SDK (via include path modification)

This work will be broken down into three PRs.

  1. #This PR# Copy json.hpp from lib\include\mat => nlohmann\ update include paths accordingly.
  2. Update include paths in the private modules repo.
  3. Remove lib\include\mat\json.hpp and update the private modules repo commit to the result of Stage 2.

@mkoscumb
Matthew Koscumb (mkoscumb) marked this pull request as ready for review February 4, 2025 18:50
@mkoscumb
Matthew Koscumb (mkoscumb) requested a review from a team as a code owner February 4, 2025 18:50
Comment thread CMakeLists.txt Outdated
@ThomsonTan

Copy link
Copy Markdown
Contributor

The new json.hpp file seems cannot be loaded into github for review because it has too much lines.

Can we download this json.hpp file from github during build instead of copying it?

@lalitb

Copy link
Copy Markdown
Contributor

Unfortunately, macOS build is still not working, it's on me. Hopefully, this doesn't break it. We should be able to force-merge it for now.

@lalitb

Lalit Kumar Bhasin (lalitb) commented Feb 4, 2025

Copy link
Copy Markdown
Contributor

The new json.hpp file seems cannot be loaded into github for review because it has too much lines.
Can we download this json.hpp file from github during build instead of copying it?

Tom Tan (@ThomsonTan) - It's actually copied from lib/mat directory to new location, so content needn't be reviewed. Because of 3 step process, it can't be moved from lib/mat to root directory. I think downloading from Github can be tracked separately.

@ThomsonTan

Copy link
Copy Markdown
Contributor

The new json.hpp file seems cannot be loaded into github for review because it has too much lines.
Can we download this json.hpp file from github during build instead of copying it?

Tom Tan (@ThomsonTan) - It's actually copied from lib/mat directory to new location, so content needn't be reviewed. Because of 3 step process, it can't be moved from lib/mat to root directory. I think downloading from Github can be tracked separately.

Ok, comparing large files is not very intuitive in the revie UI, but I've verified the file move.

@ThomsonTan Tom Tan (ThomsonTan) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:shipit:

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.

3 participants