Commits

Vinay Sajip committed 3b0d177 Draft

Minor corrections and version bump.

  • Participants
  • Parent commits 87d41c5

Comments (0)

Files changed (4)

CLILauncher/CLILauncher.rc

 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 0, 1, 2
- PRODUCTVERSION 1, 0, 1, 2
+ FILEVERSION 1, 0, 1, 4
+ PRODUCTVERSION 1, 0, 1, 4
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
             VALUE "Comments", "Python Launcher for Windows"
             VALUE "CompanyName", "Python Software Foundation"
             VALUE "FileDescription", "Python Launcher for Windows (Console)"
-            VALUE "FileVersion", "1, 0, 1, 2"
+            VALUE "FileVersion", "1, 0, 1, 4"
             VALUE "InternalName", "py"
             VALUE "LegalCopyright", "Copyright (C) 2011-2012 Python Software Foundation"
             VALUE "OriginalFilename", "py"
             VALUE "ProductName", "Python Launcher for Windows"
-            VALUE "ProductVersion", "1, 0, 1, 2"
+            VALUE "ProductVersion", "1, 0, 1, 4"
         END
     END
     BLOCK "VarFileInfo"

CLILauncher/launcher.c

 /*
- * Copyright (C) 2011-2012 Vinay Sajip. All rights reserved.
+ * Copyright (C) 2011-2013 Vinay Sajip. All rights reserved.
  *
  *
  * Redistribution and use in source and binary forms, with or without
 
     *command = NULL;    /* failure return */
     *suffix = NULL;
-    *search = 0;
+    *search = FALSE;
 
     if ((*shebang_line++ == L'#') && (*shebang_line++ == L'!')) {
         shebang_line = skip_whitespace(shebang_line);
                             error(RC_BAD_VIRTUAL_PATH, L"Unknown virtual \
 path '%s'", command);
                         command += 6;   /* skip past "python" */
-                        if (search && *command == L'\0') {
+                        if (search && ((*command == L'\0') || isspace(*command))) {
                             /* Command is eligible for path search, and there
                              * is no version specification.
                              */

GUILauncher/GUILauncher.rc

 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 0, 1, 2
- PRODUCTVERSION 1, 0, 1, 2
+ FILEVERSION 1, 0, 1, 4
+ PRODUCTVERSION 1, 0, 1, 4
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
             VALUE "Comments", "Python Launcher for Windows"
             VALUE "CompanyName", "Python Software Foundation"
             VALUE "FileDescription", "Python Launcher for Windows (GUI)"
-            VALUE "FileVersion", "1, 0, 1, 2"
+            VALUE "FileVersion", "1, 0, 1, 4"
             VALUE "InternalName", "GUILaunpyw"
             VALUE "LegalCopyright", "Copyright (C) 2011-2012 Python Software Foundation"
             VALUE "OriginalFilename", "pyw"
             VALUE "ProductName", "Python Launcher for Windows"
-            VALUE "ProductVersion", "1, 0, 1, 2"
+            VALUE "ProductVersion", "1, 0, 1, 4"
         END
     END
     BLOCK "VarFileInfo"
 import os
 import sys
 
-VERSION = 'Version=1.0.1.3'
+VERSION = 'Version=1.0.1.4'
 MANUFACTURER = 'Manufacturer=Vinay Sajip'
 X86 = 'Platform=x86'
 X64 = 'Platform=x64'