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

Fix SAM #1918 and test on Windows 11 and MacOS 15.1.1 with MATLAB #1950

Merged
merged 6 commits into from
Dec 8, 2024

Conversation

sjanzou
Copy link
Collaborator

@sjanzou sjanzou commented Dec 6, 2024

To test, build SAM and SAM-private if you would like (delete build_windows folder in SAM-private) and run SAM and generate code for some language and check that latest sscapi.h and ssc.dll (or.so or .dylib) is included in the generated code folder.

@sjanzou sjanzou self-assigned this Dec 6, 2024
@sjanzou
Copy link
Collaborator Author

sjanzou commented Dec 6, 2024

Tested on widows 11
image

Tested on MacOS 15.1.1
image

src/codegenerator.cpp Outdated Show resolved Hide resolved
if (wxFileExists(f1)) {
f2 = m_folder + "/sscapi.h";
wxCopyFile(f1,f2);
}
else {
//else {
/* skip fallback per SAM issue 1918
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same question

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Removed commented code as requested - was initially left as a fallback position but more confusing and out of date. Thanks for the future maintenance request!

@sjanzou sjanzou merged commit 59e91c5 into develop Dec 8, 2024
8 checks passed
@sjanzou sjanzou deleted the SAM_1918 branch December 8, 2024 09:00
@cpaulgilman cpaulgilman added the added to release notes PR and/or issue has been added to release notes for a public release label Dec 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
added to release notes PR and/or issue has been added to release notes for a public release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Code Generator providing incorrect sscapi.h - Matlab code generation fails
3 participants