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

Platform include support #257

Merged
merged 2 commits into from
Jan 27, 2023
Merged

Platform include support #257

merged 2 commits into from
Jan 27, 2023

Conversation

JCash
Copy link
Contributor

@JCash JCash commented Jan 25, 2023

No description provided.

Comment on lines +484 to +491
includes.add( ExtenderUtil.getRelativePath(jobDirectory, new File(dir, "include" + File.separator + this.platform) ) );

String[] platformParts = this.platform.split("-");
if (platformParts.length == 2) {
includes.add( ExtenderUtil.getRelativePath(jobDirectory, new File(dir, "include" + File.separator + platformParts[1])));
}

includes.add( ExtenderUtil.getRelativePath(jobDirectory, new File(dir, "include") ) );
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Adds platform folders like so:

extension/include/x86_64-win32
extension/include/win32
extension/include

@JCash JCash requested a review from britzl January 25, 2023 16:10
Copy link
Contributor

@britzl britzl left a comment

Choose a reason for hiding this comment

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

Looks good

includes.add( ExtenderUtil.getRelativePath(jobDirectory, new File(buildDirectory, extDir.getName())) ); // where we generate source from protobuf files
includes.add( ExtenderUtil.getRelativePath(jobDirectory, uploadDirectory) );
includes.add( ExtenderUtil.getRelativePath(jobDirectory, uploadDirectory) ); //TODO: Do we ever put stuff here? Isn't it more useful to include the build folder?
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we ever put anything in the root of the upload folder no.

@JCash JCash merged commit f8225a7 into dev Jan 27, 2023
@JCash JCash deleted the platform-include-support branch January 27, 2023 07:38
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.

None yet

2 participants