Switch back to patch instead of git apply.

[clalancette]

There were two problems with the fix for the ogre vendor patch:

1. The downloaded ogre sources is not a git repository
2. The fix used Unix line endings instead of DOS ones

It seems that newer versions of git do not allow you to call
'git apply' on a directory that is not a git repository. Worse,
'git apply' silently fails to apply the patch in that case
(actually, in all cases). So switch back to using patch, which
does properly throw errors and does properly work in a non-git
repository. Patch fails to apply mixed Unix-style and DOS-style
line endings, so also fix the patch up to use only DOS.

Signed-off-by: Chris Lalancette clalancette@openrobotics.org

Reviewers note: the final hunk of change to pragma-patch.diff seems like a no-op, but it subtly changes things so that we use CR/LF at the end of lines so Windows is happier with it.

This should fix all of the compile warnings we are getting from the Windows nightly jobs, like: https://ci.ros2.org/view/nightly/job/nightly_win_deb/1401/warnings43Result/

[clalancette]

CI:

• Linux
• Linux-aarch64
• macOS
• Windows

[mjcarroll]

Unfortunate approval.

[mjcarroll]

I assume that this means that there will still be a need for an Administrator console on Windows for patch to succeed.

[clalancette]

I assume that this means that there will still be a need for an Administrator console on Windows for patch to succeed.

Unfortunately, yes. git apply doesn't seem to be the tool we want; we should look around for something else, but that will have to be outside the scope of this PR.

[allenh1]

git apply doesn't seem to be the tool we want; we should look around for something else, but that will have to be outside the scope of this PR.

That's quite unfortunate.

I was told by @mfriedrich74 (offline) that it is possible to add an xml somewhere to remove the administrator restriction.

[mfriedrich74]

See https://docs.microsoft.com/en-us/windows/win32/sbscs/application-manifests

If the MS linker is used, you can use this:
https://docs.microsoft.com/en-us/cpp/build/reference/manifestuac-embeds-uac-information-in-manifest?view=vs-2019
/MANIFESTUAC:level=asInvoker

if you want manually want to write the application manifest (its linked as a resource of type RT_MANIFEST):

manifest.xml

<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
    <security>
      <requestedPrivileges>
        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
      </requestedPrivileges>
    </security>
  </trustInfo>

</assembly>

app.rc

#include app_res.h

IDR_RT_APPMANIFEST      RT_MANIFEST             "manifest.xml"

app_res.h:

#define IDR_RT_APPMANIFEST              1

Then just compile app.rc and link the app.res into patch.exe.

[mfriedrich74]

If you can't (re)compile patch.exe, try creating a patch.exe.manifest file in the same folder as patch.exe.
patch.exe.manifest would need the same content as manifest.xml. I just do not know if this works only with executables create from MS compilers or with all.

[clalancette]

All right, I've now got it so that Windows doesn't show any warnings, builds are green, and I have an approval. I'll go ahead and merge this.

@mfriedrich74 Thanks for the tips. If we are going to move forward with patch.exe, then I think we'd have to do something like you suggest. Another potential option would be to use the 'patch.exe' that is shipped as part of the Windows Git installation, in C:\Program Files\Git\usr\bin\patch.exe; as far as I can tell, that doesn't require administrator privileges. In either case, we'd have to update our code (and potentially our installation instructions) to make sure we get what we expect. I'll leave that as an exercise for another day.