Make the directory layout match upstream MSYS

[sschuberth]

Currently we have "swapped" the MSYS and MinGW directory trees via a profile.xml to match what we had for msysgit. However, it makes more sense for us to simplify things by aligning the directory layout again with upstream MSYS.

[dscho]

👍

[dscho]

It would be enough for that profile.xml to lose its <system-map> section, yes? I.e.

<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<profile project="MinGW" application="mingw-get">
  <repository uri="http://prdownloads.sourceforge.net/mingw/%F.xml.lzma?download">
  </repository>
  <repository uri="https://github.com/git-for-windows/sdk-packages/blob/master/%F.xml.lzma?raw=true">
    <package-list catalogue="git-win-sdk-package-list" />
  </repository>
  <system-map id="default">
    <sysroot subsystem="mingw32" path="%R" />
    <sysroot subsystem="msys" path="%R/../" />
  </system-map>
</profile>

would become

<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<profile project="MinGW" application="mingw-get">
  <repository uri="http://prdownloads.sourceforge.net/mingw/%F.xml.lzma?download">
  </repository>
  <repository uri="https://github.com/git-for-windows/sdk-packages/blob/master/%F.xml.lzma?raw=true">
    <package-list catalogue="git-win-sdk-package-list" />
  </repository>
</profile>

... and then we have to identify all the places that still expect the msysGit layout... ;-)

[sschuberth]

Exactly. Your last sentence names the hard part.

[t-b]

Does that mean we have to tweak every mgwport file?

[sschuberth]

Probably not tweak every file, but we must ensure for every file that it still builds, and if not, then tweak it.

[t-b]

Just to understand the implications. In the curl mgwport file I would need to change

insinto /mingw/include/curl

to

insinto /include/curl

or?

And while we are at it, it might also make sense to use the generic commands like doinclude instead of the ones hardcoding the paths with insinto.

[sschuberth]

Correct.

[t-b]

And how are $__mpflavor_prefix and friends from mgwport effected?
Or to rephrase my question: Can we write mgwport files which are before and after the switch valid?

[sschuberth]

Can we write mgwport files which are before and after the switch valid?

Probably yes, I don't know and would have to research.

[dscho]

@sschuberth do you think we will have to switch all #!/bin/sh to #!/msys/1.0/bin/sh with this switch? If so, I think we should not switch.

[sschuberth]

No, I'm very sure we don't need to do that, as Shell scripts that come from upstream also don't have that.

[sschuberth]

Hmm, maybe we need to re-think this. In upstream MinGW / MSYS (installed to C:\MinGW), if you start C:\MinGW\msys\1.0\msys.bat, you get this:

$ cd /
$ pwd -W
C:/MinGW/msys/1.0

I.e., a cd / does not take you to the installation directory, but to the root of the MSYS directory. While this makes sense from an MSYS point of view, it makes it unnecessary hard to access files in C:\MinGW from the MSYS shell. So, what do you think, should we keep things as-is?