Fix windows and cantera-matlab builds

[ischoegl]

While #33 fixes conda packages on macOS and linux, the windows build still fails for cantera, while all builds fail for cantera-matlab.

Fixes #20

Some paths require updates based on the SCons option layout=conda going back to Cantera/cantera#1191, which is not completely consistent with choices in conda-recipes.

Among others, the MATLAB toolbox is installed in share/cantera/lib (all platforms), which is different from lib/cantera/matlab (macOS/Linux) and Library\lib\cantera\matlab (win). I am suggesting to keep conda-recipes consistent with layout=conda (as matlab is not a Unix-style library). As paths are automatically set with startup.m, this change is likely inconsequential for end users.

Fwiw, the current layout=conda configuration looks as follows on Windows:

*************** 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


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

[ischoegl]

@bryanwweber / @speth ... I believe all packages are now fixed for the current main branch on Cantera/cantera - I checked that things import correctly (macOS / Win10 / Fedora), and it looks good. Didn't check MATLAB on Linux, but I don't see why it wouldn't work (I did check on Win10 and macOS).

As an aside, #20 is finally fixed! 😅 … which should make Cantera/cantera-website#180 much simpler.

[bryanwweber]

Thanks again for taking this on! One minor thing

[ischoegl]

@bryanwweber ... thank you for the review! If you're ok with the fixes, please merge (without squashing?). The next CI job can presumably upload to conda? I don't think replacing ESC_PREFIX by PREFIX changes anything ...

[bryanwweber]

please merge (without squashing?)

Any reason to avoid squash merge?

[ischoegl]

please merge (without squashing?)

Any reason to avoid squash merge?

In #33, the MKL "fix" could have easily been reverted by providing the commit hash e8aa1be, i.e.

$ git revert e8aa1be885fcf07bbd9adee7b500d12e73a7a87a

(I don't think that this is possible after a squash merge, although I may be mistaken).

[bryanwweber]

In #33, the MKL "fix" could have easily been reverted by providing the commit hash e8aa1be

Ah, fair enough... so it's a one-off thing rather than a philosophical objection. Ah well, it wasn't an extensive change anyways.