Make sure -E is used and fix scripts on unix

Signed-off-by: Jean-Christophe Morin <[email protected]>

Author: JeanChristopheMorinPerso

.github/workflows/wheel.yaml

@@ -29,7 +29,7 @@ jobs:
         cp distlib/PC/launcher.c launcher/
 
         cd launcher
-        patch -Np1 -i remote-appended.patch --binary
+        patch -Np1 -i rez.patch --binary
 
         mkdir build
         cd build
@@ -85,6 +85,8 @@ jobs:
         set -ex
         cat .venv/Scripts/rez/rez-script.py
         cat .venv/Scripts/rez/jctest-script.py
+
+        echo 'Running jctest with REZ_LAUNCHER_DEBUG=1'
         export REZ_LAUNCHER_DEBUG=1
 
         jctest

launcher/remote-appended.patch

@@ -0,0 +1,43 @@
+diff --git a/launcher.c b/launcher.c
+index 727f7916..a1a8768c 100644
+--- a/launcher.c
++++ b/launcher.c
+@@ -35,8 +35,6 @@
+ 
+ #pragma comment (lib, "Shlwapi.lib")
+ 
+-#define APPENDED_ARCHIVE
+-#define USE_ENVIRONMENT
+ #define SUPPORT_RELATIVE_PATH
+ 
+ #define MSGSIZE 1024
+@@ -822,6 +820,13 @@ run_child(wchar_t * cmdline)
+ #endif
+         si.dwFlags |= STARTF_USESTDHANDLES;
+     }
++
++    size_t rez_envvar_size = 0;
++    getenv_s(&rez_envvar_size, NULL, 0, "REZ_LAUNCHER_DEBUG");
++    if (rez_envvar_size > 0) {
++        printf("Launching: %ls\n", cmdline);
++    }
++
+     ok = CreateProcessW(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &child_process_info);
+     if (!ok) {
+         // Failed to create process. See if we can find out why.
+@@ -1027,11 +1032,12 @@ process(int argc, char * argv[])
+         wcp = pbuffer;
+     }
+ #endif
+-     /* 3 spaces + 4 quotes + NUL */
+-    len = wcslen(wcp) + wcslen(wp) + 8 + wcslen(psp) + wcslen(cmdline);
++     /* 4 spaces + 4 quotes + -E + NUL */
++    len = wcslen(wcp) + wcslen(wp) + 11 + wcslen(psp) + wcslen(cmdline);
+     cmdp = (wchar_t *) calloc(len, sizeof(wchar_t));
+     assert(cmdp != NULL, "Expected to be able to allocate command line memory");
+-    _snwprintf_s(cmdp, len, len, L"\"%ls\" %ls \"%ls\" %ls", wcp, wp, psp, cmdline);
++    // Note that we inject -E to make sure PYTHON* variables are not picked up.
++    _snwprintf_s(cmdp, len, len, L"\"%ls\" -E %ls \"%ls\" %ls", wcp, wp, psp, cmdline);
+     run_child(cmdp);  /* never actually returns */
+     free(cmdp);
+     return 0;

launcher/rez.patch

@@ -55,10 +55,22 @@ def find_files(pattern, path=None, root="rez"):
     long_description = f.read()
 
 
-SCRIPT_TEMPLATE = """#!/usr/bin/python -E
+SCRIPT_TEMPLATE = """#!/usr/bin/python
 # -*- coding: utf-8 -*-
+import os
 import re
 import sys
+import platform
+# If -E is not passed, then inject it and re-execute outself.
+# Note that this is not done on Windows because the Windows launcher
+# already does this.
+if not sys.flags.ignore_environment and platform.system() != 'Windows':
+    args = sys.orig_argv[:]
+    args[0] = sys.executable
+    args.insert(1, '-E')
+    if os.getenv('REZ_LAUNCHER_DEBUG'):
+        print('Launching:', ' '.join(args))
+    os.execvp(sys.executable, args)
 from rez.cli._entry_points import {0}
 if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\\.pyw|\\.exe)?$', '', sys.argv[0])
@@ -76,12 +88,12 @@ def run(self):
         scripts = []
         tmpdir = tempfile.mkdtemp("rez-scripts")
 
-        os.makedirs(self.build_dir)
+        os.makedirs(self.build_dir, exist_ok=True)
 
         for command in self.scripts:
             spec = get_specifications()[command]
 
-            filename = "{0}.py".format(command)
+            filename = command
             if platform.system() == "Windows":
                 filename = "{0}-script.py".format(command)
 

setup.py

@@ -65,7 +65,9 @@ def check_production_install():
 @register("jctest")
 def run_jctest():
     print("argv:", sys.argv)
+    print("orig_argv", sys.orig_argv)
     print("executable:", sys.executable)
+    print("sys.flags:", sys.flags)
     return 0