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

Removed chmod of script + added file separator for resourcePath #144

Merged
merged 3 commits into from
Oct 8, 2024
Merged

Removed chmod of script + added file separator for resourcePath #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b946b95
Removed chmod of script + added file separator for resources
modelonrobinandersson Oct 4, 2024
a728681
Added a comment
modelonrobinandersson Oct 4, 2024
8e50305
Added a release note entry
modelonrobinandersson Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Note that version 2.1 is the first version with release notes. Please see the co
### Bug fixes
- Fixed an issue where enum variables min/max attributes were incorrectly handled as `int32`, instead of `int64`.
- [BREAKING] Changed return types of `fmi3_import_get_enum_variable_min` and `fmi3_import_get_enum_variable_max` from `int` to `fmi3_int64_t`.
- For FMI3, added a missing trailing file separator to `resourcePath`.

### Improvements

Expand Down
1 change: 0 additions & 1 deletion build/config/ubuntu64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ CTEST_FLAGS_COMMON=--build-config $(BUILD_TYPE) --parallel $(shell nproc) --outp
TEST_COMMAND=ctest $(CTEST_FLAGS_COMMON) --tests-regex ctest_build_all \
&& ctest $(CTEST_FLAGS_COMMON) --exclude-regex ctest_build_all --label-exclude skip_memcheck --test-action memcheck \
&& ctest $(CTEST_FLAGS_COMMON) --exclude-regex ctest_build_all --label-regex skip_memcheck \
&& chmod +x ../Test/scripts/verify_memcheck_logs.sh \
&& ../Test/scripts/verify_memcheck_logs.sh Testing/Temporary

# FMILIB_...
Expand Down
3 changes: 2 additions & 1 deletion src/Import/src/FMI3/fmi3_import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ fmi3_import_t* fmi3_import_parse_xml(

if (jm_get_dir_abspath(context->callbacks, dirPath, absPath, FILENAME_MAX + 2)) {
size_t len = strlen(absPath);
strcpy(absPath + len, FMI_FILE_SEP "resources");
// Compared to FMI2, in FMI3 we need to add a trailing file separator below
strcpy(absPath + len, FMI_FILE_SEP "resources" FMI_FILE_SEP);
filip-stenstrom marked this conversation as resolved.
Show resolved Hide resolved
fmu->resourcePath = fmi_import_create_URL_from_abs_path(context->callbacks, absPath);
}
fmu->dirPath = context->callbacks->malloc(strlen(dirPath) + 1);
Expand Down