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

[SCons] Ensure paths use posix-style separators #1381

Merged
merged 3 commits into from
Aug 30, 2022

Conversation

ischoegl
Copy link
Member

@ischoegl ischoegl commented Aug 27, 2022

Changes proposed in this pull request

Ensure that paths use posix-style separators on all platforms. The post-install message becomes

*************** Cantera 3.0.0a2 has been successfully installed ****************

File locations:

  library files               C:/Users/ischo/miniconda3/envs/cantera-dev/Library/lib
  C++ headers                 C:/Users/ischo/miniconda3/envs/cantera-dev/Library/include
  samples                     C:/Users/ischo/miniconda3/envs/cantera-dev/share/cantera/samples
  data files                  C:/Users/ischo/miniconda3/envs/cantera-dev/share/cantera/data
  input file converters       C:/Users/ischo/miniconda3/envs/cantera-dev/Scripts
  Python package              C:/Users/ischo/miniconda3/envs/cantera-dev/Lib/site-packages
  Python examples             C:/Users/ischo/miniconda3/envs/cantera-dev/share/cantera/samples/python
  Matlab toolbox              C:/Users/ischo/miniconda3/envs/cantera-dev/share/cantera/matlab/toolbox
  Matlab samples              C:/Users/ischo/miniconda3/envs/cantera-dev/share/cantera/samples/matlab

An m-file to set the correct matlab path for Cantera is at:

  C:/Users/ischo/miniconda3/envs/cantera-dev/share/cantera/matlab/toolbox/ctpath.m

********************************************************************************

If applicable, fill in the issue number this pull request is fixing

Closes #1374

Checklist

  • The pull request includes a clear description of this code change
  • Commit messages have short titles and reference relevant issues
  • Build passes (scons build & scons test) and unit tests address code coverage
  • Style & formatting of contributed code follows contributing guidelines
  • The pull request is ready for review

@ischoegl ischoegl marked this pull request as ready for review August 27, 2022 23:23
@ischoegl ischoegl requested a review from a team August 27, 2022 23:23
@bryanwweber
Copy link
Member

Thanks! The only concern I have is for the Python package, see https://stackoverflow.com/a/31736631/2449192. I don't think we use PYTHONUSERBASE any more though?

@ischoegl
Copy link
Member Author

Thanks! The only concern I have is for the Python package, see https://stackoverflow.com/a/31736631/2449192.

My impression that all of this is handled by pip at this point, and it appears to be doing the right thing. You are probably a lot more knowledgeable on this than most.

I don't think we use PYTHONUSERBASE any more though?

I searched through the code, and there is no mention of PYTHONUSERBASE. Of course, it could be that SCons is picking up on that when set - but as we're not assigning it with forward slashes, it shouldn't be an issue?

Copy link
Member

@bryanwweber bryanwweber left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM!

@bryanwweber bryanwweber merged commit af7625e into Cantera:main Aug 30, 2022
@ischoegl ischoegl deleted the posix-style-paths branch August 30, 2022 17:54
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.

Escaped/mangled path separators on Windows
2 participants