Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

Updates for source-code FMUs #2989

Closed
wants to merge 2 commits into from

Conversation

sjoelund
Copy link
Member

Make it possible to compile source-code FMUs without setting include-
directives to the preprocessor. This required changes to most files
since they assume preprocessor flags were set.

The generated FMU now contains a list of the files to compile (in the
XML structure), in case the user does not have access to a make system.

Still missing is a config-file containing number of linear systems, etc.
This would make it possible to compile without configure-script at all.
The configure script should also look for the standard FMI includes
which should not need to be present in a source-code FMU.

@sjoelund sjoelund requested review from lochel and adeas31 March 21, 2019 13:40
@OpenModelica-Hudson
Copy link
Member

The job failed to compile; for details, see OpenModelica_TEST_PULL_REQUEST 2019-03-21_14-40-45.

constant list<String> nlsFiles={NLS_FILESCMINPACK_FILES, "./external_solvers/cminpack.h", "./external_solvers/minpack.h"};
constant list<String> mixedFiles={MIXED_FILES};
annotation(__OpenModelica_Interface="backend");
end RuntimeSources;
Copy link
Member

Choose a reason for hiding this comment

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

What about the header files like model_literals.h, model_includes.h etc.? I don't see them being copied from somewhere.

Copy link
Member Author

Choose a reason for hiding this comment

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

They are generated directly in the correct location. Then they are put in the XML using defaultFileSuffixes

@OpenModelica-Hudson
Copy link
Member

The job failed to compile; for details, see OpenModelica_TEST_PULL_REQUEST 2019-03-25_16-38-59.

@OpenModelica-Hudson
Copy link
Member

The test suite is unstable according to OpenModelica_TEST_PULL_REQUEST 2019-03-25_16-43-49.

@OpenModelica-Hudson
Copy link
Member

The test suite is unstable according to OpenModelica_TEST_PULL_REQUEST 2019-03-26_13-13-45.

@OpenModelica-Hudson
Copy link
Member

The test suite is unstable according to OpenModelica_TEST_PULL_REQUEST 2019-03-26_14-45-10.

@OpenModelica-Hudson
Copy link
Member

The test suite is unstable according to OpenModelica_TEST_PULL_REQUEST 2019-03-27_08-07-16.

@OpenModelica-Hudson
Copy link
Member

The test suite is unstable according to OpenModelica_TEST_PULL_REQUEST 2019-03-27_08-26-30.

@OpenModelica-Hudson
Copy link
Member

The test suite is unstable according to OpenModelica_TEST_PULL_REQUEST 2019-03-27_14-51-32.

Make it possible to compile source-code FMUs without setting include-
directives to the preprocessor. This required changes to most files
since they assume preprocessor flags were set.

The generated FMU now contains a list of the files to compile (in the
XML structure), in case the user does not have access to a make system.

Still missing is a config-file containing number of linear systems, etc.
This would make it possible to compile without configure-script at all.
The configure script should also look for the standard FMI includes
which should not need to be present in a source-code FMU.

Use a settings file for FMUs instead of preprocessor, stored inside the
generated FMU.

This allows automatic compilation of the sources, by a tool agnostic of
OpenModelica.
@OpenModelica-Hudson
Copy link
Member

The tests run correctly according to OpenModelica_TEST_PULL_REQUEST 2019-03-27_15-42-04.

OpenModelica-Hudson pushed a commit that referenced this pull request Mar 27, 2019
Make it possible to compile source-code FMUs without setting include-
directives to the preprocessor. This required changes to most files
since they assume preprocessor flags were set.

The generated FMU now contains a list of the files to compile (in the
XML structure), in case the user does not have access to a make system.

Still missing is a config-file containing number of linear systems, etc.
This would make it possible to compile without configure-script at all.
The configure script should also look for the standard FMI includes
which should not need to be present in a source-code FMU.

Use a settings file for FMUs instead of preprocessor, stored inside the
generated FMU.

This allows automatic compilation of the sources, by a tool agnostic of
OpenModelica.

Belonging to [master]:
  - #2989
  - OpenModelica/OpenModelica-testsuite#1149
OpenModelica-Hudson pushed a commit to OpenModelica/OpenModelica-testsuite that referenced this pull request Mar 27, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants