Merge branch 'hotfix/0.6.11.4'

Author: kayhayen

debian/changelog

@@ -1,3 +1,9 @@
+nuitka (0.6.11.4+ds-1) unstable; urgency=medium
+
+  * New upstream hotfix release.
+
+ -- Kay Hayen <kay.hayen@gmail.com>  Wed, 27 Jan 2021 17:09:48 +0100
+
 nuitka (0.6.11.3+ds-1) unstable; urgency=medium
 
   * New upstream hotfix release.

nuitka/Options.py

@@ -665,7 +665,9 @@ def getIconPaths():
             result.append(default_icon)
         else:
             Tracing.general.sysexit(
-                "Error, on the default icon '%s' does not exist, making --linux-onefile-icon required."
+                """\
+Error, the default icon %r does not exist, making --linux-onefile-icon required."""
+                % default_icon
             )
 
     return result

nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V0.6.11.3
+Nuitka V0.6.11.4
 Copyright (C) 2021 Kay Hayen."""
 
 

nuitka/build/Backend.scons

@@ -398,9 +398,17 @@ if the_compiler is None or getExecutablePath(the_compiler, env=env) is None:
 
 # Check if there is a WindowsSDK installed.
 if msvc_mode or clangcl_mode:
-    scons_details_logger.info("Using Windows SDK %r." % env["WindowsSDKVersion"])
+    if "WindowsSDKVersion" not in env:
+        if "WindowsSDKVersion" in os.environ:
+            windows_sdk_version = os.environ["WindowsSDKVersion"].rstrip("\\")
+        else:
+            windows_sdk_version = None
+    else:
+        windows_sdk_version = env["WindowsSDKVersion"]
+
+    scons_details_logger.info("Using Windows SDK %r." % windows_sdk_version)
 
-    if not env["WindowsSDKVersion"]:
+    if not windows_sdk_version:
         scons_logger.sysexit(
             "Error, the Windows SDK must be installed in Visual Studio."
         )

nuitka/build/SconsCaching.py

@@ -119,7 +119,7 @@ def _injectCcache(the_compiler, cc_path, env, python_prefix, assume_yes_for_down
         assert getExecutablePath(os.path.basename(the_compiler), env=env) == cc_path
 
         # We use absolute paths for CC, pass it like this, as ccache does not like absolute.
-        env["CXX"] = env["CC"] = "%s %s" % (ccache_binary, cc_path)
+        env["CXX"] = env["CC"] = '%s "%s"' % (ccache_binary, cc_path)
 
         # Spare ccache the detection of the compiler, seems it will also misbehave when it's
         # prefixed with "ccache" on old gcc versions in terms of detecting need for C++ linkage.

nuitka/build/static_src/CompiledCodeHelpers.c

@@ -1787,11 +1787,12 @@ wchar_t const *getBinaryDirectoryWideChars() {
         }
 
         binary_directory[0] = 0;
-        appendWStringSafeW(binary_directory, short_binary_directory, sizeof(binary_directory));
+        appendWStringSafeW(binary_directory, short_binary_directory, sizeof(binary_directory) / sizeof(wchar_t));
 
         free(short_binary_directory);
 #else
-        appendStringSafeW(binary_directory, getBinaryDirectoryHostEncoded(), sizeof(binary_directory));
+        appendStringSafeW(binary_directory, getBinaryDirectoryHostEncoded(),
+                          sizeof(binary_directory) / sizeof(wchar_t));
 #endif
 
         init_done = true;

nuitka/build/static_src/MetaPathBasedLoader.c

@@ -829,10 +829,10 @@ static PyObject *loadModule(PyObject *module, PyObject *module_name,
 #ifdef _WIN32
         wchar_t filename[MAXPATHLEN + 1] = {0};
 
-        appendWStringSafeW(filename, getBinaryDirectoryWideChars(), sizeof(filename));
-        appendCharSafeW(filename, SEP, sizeof(filename));
-        appendModulenameAsPathW(filename, entry->name, sizeof(filename));
-        appendStringSafeW(filename, ".pyd", sizeof(filename));
+        appendWStringSafeW(filename, getBinaryDirectoryWideChars(), sizeof(filename) / sizeof(wchar_t));
+        appendCharSafeW(filename, SEP, sizeof(filename) / sizeof(wchar_t));
+        appendModulenameAsPathW(filename, entry->name, sizeof(filename) / sizeof(wchar_t));
+        appendStringSafeW(filename, ".pyd", sizeof(filename) / sizeof(wchar_t));
 #else
         char filename[MAXPATHLEN + 1] = {0};
 

nuitka/build/static_src/WindowsOnefile.c

@@ -114,6 +114,16 @@ static unsigned long long readSizeValue(HANDLE exe_file) {
     return result;
 }
 
+static void printError(char const *message) {
+    LPCTSTR err_buffer;
+
+    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
+                  GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&err_buffer, 0, NULL);
+
+    puts(message);
+    puts(err_buffer);
+}
+
 #ifdef _NUITKA_WINMAIN_ENTRY_POINT
 int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, char *lpCmdLine, int nCmdShow) {
 #if defined(__MINGW32__) && !defined(_W64)
@@ -134,10 +144,11 @@ int main(int argc, char **argv) {
 
     static wchar_t exe_filename[4096] = {0};
 
-    DWORD res = GetModuleFileNameW(NULL, exe_filename, sizeof(exe_filename));
-    assert(res != 0);
-
-    // _putws(exe_filename);
+    DWORD res = GetModuleFileNameW(NULL, exe_filename, sizeof(exe_filename) / sizeof(wchar_t));
+    if (res == 0) {
+        printError("Error, failed to locate onefile filename.");
+        return 1;
+    }
 
     static wchar_t payload_path[4096] = {0};
 
@@ -166,24 +177,29 @@ int main(int argc, char **argv) {
             }
             printf("SHGetFolderPathW failed: %s\n", error_message);
         }
+
+        return 1;
     }
 
     // _putws(payload_path);
-    appendWCharSafeW(payload_path, L'\\', sizeof(payload_path));
-    appendWStringSafeW(payload_path, L"" ONEFILE_COMPANY, sizeof(payload_path));
+    appendWCharSafeW(payload_path, L'\\', sizeof(payload_path) / sizeof(wchar_t));
+    appendWStringSafeW(payload_path, L"" ONEFILE_COMPANY, sizeof(payload_path) / sizeof(wchar_t));
 
     bool_res = CreateDirectoryW(payload_path, NULL);
 
     appendWCharSafeW(payload_path, L'\\', sizeof(payload_path));
-    appendWStringSafeW(payload_path, L"" ONEFILE_PRODUCT, sizeof(payload_path));
+    appendWStringSafeW(payload_path, L"" ONEFILE_PRODUCT, sizeof(payload_path) / sizeof(wchar_t));
     bool_res = CreateDirectoryW(payload_path, NULL);
 
     appendWCharSafeW(payload_path, L'\\', sizeof(payload_path));
-    appendWStringSafeW(payload_path, L"" ONEFILE_VERSION, sizeof(payload_path));
+    appendWStringSafeW(payload_path, L"" ONEFILE_VERSION, sizeof(payload_path) / sizeof(wchar_t));
 
 #else
-    res = GetTempPathW(sizeof(payload_path), payload_path);
-    assert(res != 0);
+    res = GetTempPathW(sizeof(payload_path) / sizeof(wchar_t), payload_path);
+    if (res == 0) {
+        printError("Temporary path cannot be detected.");
+        return 1;
+    }
 
     // Best effort to make temp path unique by using PID and time.
     {
@@ -194,17 +210,16 @@ int main(int argc, char **argv) {
         GetSystemTimeAsFileTime((LPFILETIME)&time);
 
         swprintf(buffer, sizeof(buffer), L"\\onefile_%d_%lld", GetCurrentProcessId(), time);
-        appendWStringSafeW(payload_path, buffer, sizeof(payload_path));
+        appendWStringSafeW(payload_path, buffer, sizeof(payload_path) / sizeof(wchar_t));
     }
 #endif
-    // _putws(payload_path);
-
     bool_res = CreateDirectoryW(payload_path, NULL);
 
-    // _putws(payload_path);
-
     HANDLE exe_file = CreateFileW(exe_filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
-    assert(exe_file != INVALID_HANDLE_VALUE);
+    if (exe_file == INVALID_HANDLE_VALUE) {
+        printError("Error, failed to access unpacked executable.");
+        return 1;
+    }
 
     res = SetFilePointer(exe_file, -8, NULL, FILE_END);
     assert(res != INVALID_SET_FILE_POINTER);
@@ -254,9 +269,9 @@ int main(int argc, char **argv) {
                 *w = 0;
 
                 target_path[0] = 0;
-                appendWStringSafeW(target_path, payload_path, sizeof(target_path));
-                appendWCharSafeW(target_path, L'\\', sizeof(target_path));
-                appendWStringSafeW(target_path, filename, sizeof(target_path));
+                appendWStringSafeW(target_path, payload_path, sizeof(target_path) / sizeof(wchar_t));
+                appendWCharSafeW(target_path, L'\\', sizeof(target_path) / sizeof(wchar_t));
+                appendWStringSafeW(target_path, filename, sizeof(target_path) / sizeof(wchar_t));
 
                 *w = L'\\';
 
@@ -268,12 +283,12 @@ int main(int argc, char **argv) {
         }
 
         target_path[0] = 0;
-        appendWStringSafeW(target_path, payload_path, sizeof(target_path));
-        appendWCharSafeW(target_path, L'\\', sizeof(target_path));
-        appendWStringSafeW(target_path, filename, sizeof(target_path));
+        appendWStringSafeW(target_path, payload_path, sizeof(target_path) / sizeof(wchar_t));
+        appendWCharSafeW(target_path, L'\\', sizeof(target_path) / sizeof(wchar_t));
+        appendWStringSafeW(target_path, filename, sizeof(target_path) / sizeof(wchar_t));
 
         if (first_filename[0] == 0) {
-            appendWStringSafeW(first_filename, target_path, sizeof(target_path));
+            appendWStringSafeW(first_filename, target_path, sizeof(target_path) / sizeof(wchar_t));
         }
 
         // _putws(target_path);

nuitka/codegen/templates/CodeTemplatesModules.py

@@ -233,12 +233,12 @@
         flags_int,
         function_name,
         argnames,
+        NULL, // freevars
         arg_count_int,
         0, // TODO: Missing kw_only_count
         0 // TODO: Missing pos_only_count
     );
 
-    // TODO: More stuff needed for Python3, best to re-order arguments of MAKE_CODEOBJECT.
     struct Nuitka_FunctionObject *result = Nuitka_Function_New(
         functable_%(module_identifier)s[offset],
         code_object->co_name,

nuitka/plugins/standard/ImplicitImports.py

@@ -31,6 +31,7 @@
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 from nuitka.PythonVersions import python_version
 from nuitka.utils.FileOperations import getFileContentByLine
+from nuitka.utils.Importing import getSharedLibrarySuffix
 from nuitka.utils.ModuleNames import ModuleName
 from nuitka.utils.SharedLibraries import getPyWin32Dir, locateDLL
 from nuitka.utils.Utils import getOS, isWin32Windows
@@ -1489,6 +1490,18 @@ def considerExtraDlls(self, dist_dir, module):
 
             return result
 
+        elif full_name == "zmq.libzmq" and isWin32Windows():
+            # TODO: Very strange thing for zmq on Windows, needs the .pyd file in wrong dir too. Have
+            # this done in a dedicated form somewhere.
+            shutil.copyfile(
+                os.path.join(dist_dir, "zmq\\libzmq.pyd"),
+                os.path.join(
+                    dist_dir, "libzmq" + getSharedLibrarySuffix(preferred=True)
+                ),
+            )
+
+            return ()
+
         return ()
 
     unworthy_namespaces = (

nuitka/utils/FileOperations.py

@@ -40,7 +40,7 @@
 
 from .Importing import importFromInlineCopy
 from .ThreadedExecutor import RLock, getThreadIdent
-from .Utils import getOS
+from .Utils import getOS, isWin32Windows
 
 # Locking seems to be only required for Windows mostly, but we can keep
 # it for all.
@@ -470,10 +470,21 @@ def copyTree(source_path, dest_path):
     copy_tree(source_path, dest_path)
 
 
+def getWindowsDrive(path):
+    """Windows drive for a given path."""
+
+    drive, _ = os.path.splitdrive(os.path.abspath(path))
+    return os.path.normcase(drive)
+
+
 def isPathBelow(path, filename):
     path = os.path.abspath(path)
     filename = os.path.abspath(filename)
 
+    if isWin32Windows():
+        if getWindowsDrive(path) != getWindowsDrive(filename):
+            return False
+
     return os.path.relpath(filename, path).split(os.path.sep)[0] != ".."
 
 

tests/standalone/run_all.py

@@ -311,6 +311,9 @@ def main():
             if loaded_filename.startswith("/etc/"):
                 continue
 
+            if loaded_filename.startswith("/usr/etc/"):
+                continue
+
             if loaded_filename.startswith("/proc/") or loaded_filename == "/proc":
                 continue