mirror of
https://github.com/python/cpython.git
synced 2025-10-27 16:57:08 +00:00
which unfortunately means the errors from the bytes type change somewhat: bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a TypeError (either that, or bytes(1.0) also raises a ValueError -- PyNumber_AsSsize_t() can only raise one type of exception.) Merged revisions 51188-51433 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines Retrieval of previous shell command was not always preserving indentation since 1.2a1) Patch 1528468 Tal Einat. ........ r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. SF bug #1112549. ........ r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines News item for SF bug 1112549. ........ r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines Fix title -- it's rc1, not beta3. ........ r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines Update dangling references to the 3.2 database to mention that this is UCD 4.1 now. ........ r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines Followup to bug #1069160. PyThreadState_SetAsyncExc(): internal correctness changes wrt refcount safety and deadlock avoidance. Also added a basic test case (relying on ctypes) and repaired the docs. ........ r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines Whitespace normalization. ........ r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines Whitespace normalization broke test_cgi, because a line of quoted test data relied on preserving a single trailing blank. Changed the string from raw to regular, and forced in the trailing blank via an explicit \x20 escape. ........ r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines test_PyThreadState_SetAsyncExc(): This is failing on some 64-bit boxes. I have no idea what the ctypes docs mean by "integers", and blind-guessing here that it intended to mean the signed C "int" type, in which case perhaps I can repair this by feeding the thread id argument to type ctypes.c_long(). Also made the worker thread daemonic, so it doesn't hang Python shutdown if the test continues to fail. ........ r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines force_test_exit(): This has been completely ineffective at stopping test_signal from hanging forever on the Tru64 buildbot. That could be because there's no such thing as signal.SIGALARM. Changed to the idiotic (but standard) signal.SIGALRM instead, and added some more debug output. ........ r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines Fix the failures on cygwin (2006-08-10 fixed the actual locking issue). The first hunk changes the colon to an ! like other Windows variants. We need to always wait on the child so the lock gets released and no other tests fail. This is the try/finally in the second hunk. ........ r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines Add Chris McDonough (latest cgi.py patch) ........ r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines logging's atexit hook now runs even if the rest of the module has already been cleaned up. ........ r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines Add ignore of *.pyc and *.pyo to Lib/xml/etree/. ........ r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines When a ctypes C callback function is called, zero out the result storage before converting the result to C data. See the comment in the code for details. Provide a better context for errors when the conversion of a callback function's result cannot be converted. ........ r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines Klocwork made another run and found a bunch more problems. This is the first batch of fixes that should be easy to verify based on context. This fixes problem numbers: 220 (ast), 323-324 (symtable), 321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree). ........ r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines Even though _Py_Mangle() isn't truly public anyone can call it and there was no verification that privateobj was a PyString. If it wasn't a string, this could have allowed a NULL pointer to creep in below and crash. I wonder if this should be PyString_CheckExact? Must identifiers be strings or can they be subclasses? Klocwork #275 ........ r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines It's highly unlikely, though possible for PyEval_Get*() to return NULLs. So be safe and do an XINCREF. Klocwork # 221-222. ........ r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines This code is actually not used unless WITHOUT_COMPLEX is defined. However, there was no error checking that PyFloat_FromDouble returned a valid pointer. I believe this change is correct as it seemed to follow other code in the area. Klocwork # 292. ........ r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines Handle NULL nodes while parsing. I'm not entirely sure this is correct. There might be something else that needs to be done to setup the error. Klocwork #295. ........ r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines If _stat_float_times is false, we will try to INCREF ival which could be NULL. Return early in that case. The caller checks for PyErr_Occurred so this should be ok. Klocwork #297 ........ r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines Move the assert which checks for a NULL pointer first. Klocwork #274. ........ r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines Try to handle a malloc failure. I'm not entirely sure this is correct. There might be something else we need to do to handle the exception. Klocwork # 212-213 ........ r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines I'm not sure why this code allocates this string for the error message. I think it would be better to always use snprintf and have the format limit the size of the name appropriately (like %.200s). Klocwork #340 ........ r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines Check returned pointer is valid. Klocwork #233 ........ r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed ........ r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines Don't deref v if it's NULL. Klocwork #214 ........ r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines Check return of PyMem_MALLOC (garbage) is non-NULL. Check seq in both portions of if/else. Klocwork #289-290. ........ r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines PyModule_GetDict() can fail, produce fatal errors if this happens on startup. Klocwork #298-299. ........ r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines Verify verdat which is returned from malloc is not NULL. Ensure we don't pass NULL to free. Klocwork #306 (at least the first part, checking malloc) ........ r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines test_signal: Signal handling on the Tru64 buildbot appears to be utterly insane. Plug some theoretical insecurities in the test script: - Verify that the SIGALRM handler was actually installed. - Don't call alarm() before the handler is installed. - Move everything that can fail inside the try/finally, so the test cleans up after itself more often. - Try sending all the expected signals in force_test_exit(), not just SIGALRM. Since that was fixed to actually send SIGALRM (instead of invisibly dying with an AttributeError), we've seen that sending SIGALRM alone does not stop this from hanging. - Move the "kill the child" business into the finally clause, so the child doesn't survive test failure to send SIGALRM to other tests later (there are also baffling SIGALRM-related failures in test_socket). - Cancel the alarm in the finally clause -- if the test dies early, we again don't want SIGALRM showing up to confuse a later test. Alas, this still relies on timing luck wrt the spawned script that sends the test signals, but it's hard to see how waiting for seconds can so often be so unlucky. test_threadedsignals: curiously, this test never fails on Tru64, but doesn't normally signal SIGALRM. Anyway, fixed an obvious (but probably inconsequential) logic error. ........ r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines Ah, fudge. One of the prints here actually "shouldn't be" protected by "if verbose:", which caused the test to fail on all non-Windows boxes. Note that I deliberately didn't convert this to unittest yet, because I expect it would be even harder to debug this on Tru64 after conversion. ........ r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines Repair logging test spew caused by rev. 51206. ........ r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines Patch #1538606, Patch to fix __index__() clipping. I modified this patch some by fixing style, some error checking, and adding XXX comments. This patch requires review and some changes are to be expected. I'm checking in now to get the greatest possible review and establish a baseline for moving forward. I don't want this to hold up release if possible. ........ r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots were failing due to inappropriate clipping of numbers larger than 2**31 with new-style classes. (typeobject.c) In reviewing the code for classic classes, there were 2 problems. Any negative value return could be returned. Always return -1 if there was an error. Also make the checks similar with the new-style classes. I believe this is correct for 32 and 64 bit boxes, including Windows64. Add a test of classic classes too. ........ r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line SF bug #1539336, distutils example code missing ........ r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines Move/copy assert for tstate != NULL before first use. Verify that PyEval_Get{Globals,Locals} returned valid pointers. Klocwork 231-232 ........ r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines Handle a whole lot of failures from PyString_FromInternedString(). Should fix most of Klocwork 234-272. ........ r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines cpathname could be NULL if it was longer than MAXPATHLEN. Don't try to write the .pyc to NULL. Check results of PyList_GetItem() and PyModule_GetDict() are not NULL. Klocwork 282, 283, 285 ........ r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines Fix segfault when doing string formatting on subclasses of long if __oct__, __hex__ don't return a string. Klocwork 308 ........ r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines Check return result of PyModule_GetDict(). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines Handle malloc and fopen failures more gracefully. Klocwork 180-181 ........ r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines It's very unlikely, though possible that source is not a string. Verify that PyString_AsString() returns a valid pointer. (The problem can arise when zlib.decompress doesn't return a string.) Klocwork 346 ........ r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines Handle failures from lookup. Klocwork 341-342 ........ r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines Handle failure from PyModule_GetDict() (Klocwork 208). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines Really address the issue of where to place the assert for leftblock. (Followup of Klocwork 274) ........ r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines Handle malloc failure. Klocwork 281 ........ r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines Handle alloca failures. Klocwork 225-228 ........ r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line Get rid of compiler warning ........ r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line Ignore pgen.exe and kill_python.exe for cygwin ........ r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines Can't return NULL from a void function. If there is a memory error, about the best we can do is call PyErr_WriteUnraisable and go on. We won't be able to do the call below either, so verify delstr is valid. ........ r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line Update purify doc some. ........ r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines Remove unused, buggy test function. Fixes klockwork issue #207. ........ r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value from new_CArgObject(). Fixes klockwork issues #183, #184, #185. ........ r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value of GenericCData_new(). Fixes klockwork issues #188, #189. ........ r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines Revert the change that tries to zero out a closure's result storage area because the size if unknown in source/callproc.c. ........ r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines Slightly revised version of patch #1538956: Replace UnicodeDecodeErrors raised during == and != compares of Unicode and other objects with a new UnicodeWarning. All other comparisons continue to raise exceptions. Exceptions other than UnicodeDecodeErrors are also left untouched. ........ r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines Apply the patch #1532975 plus ideas from the patch #1533481. ctypes instances no longer have the internal and undocumented '_as_parameter_' attribute which was used to adapt them to foreign function calls; this mechanism is replaced by a function pointer in the type's stgdict. In the 'from_param' class methods, try the _as_parameter_ attribute if other conversions are not possible. This makes the documented _as_parameter_ mechanism work as intended. Change the ctypes version number to 1.0.1. ........ r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines Readd NEWS items that were accidentally removed by r51276. ........ r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines Improve markup in PyUnicode_RichCompare. ........ r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines Correct an accidentally removed previous patch. ........ r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536908: Add support for AMD64 / OpenBSD. Remove the -no-stack-protector compiler flag for OpenBSD as it has been reported to be unneeded. ........ r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line News item for rev 51281. ........ r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines Fix refleak introduced in rev. 51248. ........ r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines Make tabnanny recognize IndentationErrors raised by tokenize. Add a test to test_inspect to make sure indented source is recognized correctly. (fixes #1224621) ........ r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1535500: fix segfault in BZ2File.writelines and make sure it raises the correct exceptions. ........ r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines Add an additional test: BZ2File write methods should raise IOError when file is read-only. ........ r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536071: trace.py should now find the full module name of a file correctly even on Windows. ........ r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines Cookie.py shouldn't "bogusly" use string._idmap. ........ r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines Patch #1511317: don't crash on invalid hostname info ........ r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines Whitespace normalization. ........ r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries. Now we're even. :-) ........ r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines Fix the test for SocketServer so it should pass on cygwin and not fail sporadically on other platforms. This is really a band-aid that doesn't fix the underlying issue in SocketServer. It's not clear if it's worth it to fix SocketServer, however, I opened a bug to track it: http://python.org/sf/1540386 ........ r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines Update the docstring to use a version a little newer than 1999. This was taken from a Debian patch. Should we update the version for each release? ........ r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines Subclasses of int/long are allowed to define an __index__. ........ r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line Check for NULL return value from new_CArgObject calls. ........ r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines The 'with' statement is now a Code Context block opener ........ r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 ........ r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 - no, really this time ........ r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines Patch #1540892: site.py Quitter() class attempts to close sys.stdin before raising SystemExit, allowing IDLE to honor quit() and exit(). M Lib/site.py M Lib/idlelib/PyShell.py M Lib/idlelib/CREDITS.txt M Lib/idlelib/NEWS.txt M Misc/NEWS ........ r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines Update code and tests to support the 'bytes_le' attribute (for little-endian byte order on Windows), and to work around clocks with low resolution yielding duplicate UUIDs. Anthony Baxter has approved this change. ........ r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines Get quit() and exit() to work cleanly when not using subprocess. ........ r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines Revert to having static version numbers again. ........ r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines Build _hashlib on Windows. Build OpenSSL with masm assembler code. Fixes #1535502. ........ r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines Add commented assert statements to check that the result of PyObject_stgdict() and PyType_stgdict() calls are non-NULL before dereferencing the result. Hopefully this fixes what klocwork is complaining about. Fix a few other nits as well. ........ r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line news entry for 51307 ........ r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line Add UnicodeWarning ........ r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line Bump document version to 1.0; remove pystone paragraph ........ r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line Link to docs; remove an XXX comment ........ r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line Make cl build step compile-only (/c). Remove libs from source list. ........ r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines The __repr__ method of a NULL py_object does no longer raise an exception. Remove a stray '?' character from the exception text when the value is retrieved of such an object. Includes tests. ........ r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line Update bug/patch counts ........ r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line Wording/typo fixes ........ r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines Remove the special casing of Py_None when converting the return value of the Python part of a callback function to C. If it cannot be converted, call PyErr_WriteUnraisable with the exception we got. Before, arbitrary data has been passed to the calling C code in this case. (I'm not really sure the NEWS entry is understandable, but I cannot find better words) ........ r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines Add NEWS item mentioning the reverted distutils version number patch. ........ r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines SF#1534630 ignore data that arrives before the opening start tag ........ r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line Grammar fix ........ r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines Tutorial: Clarify somewhat how parameters are passed to functions (especially explain what integer means). Correct the table - Python integers and longs can both be used. Further clarification to the table comparing ctypes types, Python types, and C types. Reference: Replace integer by C ``int`` where it makes sense. ........ r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines File menu hotkeys: there were three 'p' assignments. Reassign the 'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the Shell menu hotkey from 's' to 'l'. M Bindings.py M PyShell.py M NEWS.txt ........ r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines Fix a bug in the ``compiler`` package that caused invalid code to be generated for generator expressions. ........ r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines Merge 51340 and 51341 from 2.5 branch: Leave tk build directory to restore original path. Invoke debug mk1mf.pl after running Configure. ........ r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines Bug #1541863: uuid.uuid1 failed to generate unique identifiers on systems with low clock resolution. ........ r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line Add template for 2.6 on HEAD ........ r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line More post-release wibble ........ r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again ........ r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again. Take 2 ........ r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Unix bots install working again. ........ r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line Set version to 2.6a0, seems more consistent. ........ r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line More version wibble ........ r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines Bug #1541682: Fix example in the "Refcount details" API docs. Additionally, remove a faulty example showing PySequence_SetItem applied to a newly created list object and add notes that this isn't a good idea. ........ r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines Updating IDLE's version number to match Python's (as per python-dev discussion). ........ r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line RPM specfile updates ........ r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines Typo in tp_clear docs. ........ r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line Minor edits ........ r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines Add asserts to check for 'impossible' NULL values, with comments. In one place where I'n not 1000% sure about the non-NULL, raise a RuntimeError for safety. This should fix the klocwork issues that Neal sent me. If so, it should be applied to the release25-maint branch also. ........ r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines Move initialization of interned strings to before allocating the object so we don't leak op. (Fixes an earlier patch to this code) Klockwork #350 ........ r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines Move assert to after NULL check, otherwise we deref NULL in the assert. Klocwork #307 ........ r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro ........ r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines Move initialization to after the asserts for non-NULL values. Klocwork 286-287. (I'm not backporting this, but if someone wants to, feel free.) ........ r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines Handle PyString_FromInternedString() failing (unlikely, but possible). Klocwork #325 (I'm not backporting this, but if someone wants to, feel free.) ........ r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines Patch #1542948: fix urllib2 header casing issue. With new test. ........ r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines Move peephole optimizer to separate file. ........ r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines Move peephole optimizer to separate file. (Forgot .h in previous checkin.) ........ r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines Fix bug #1543303, tarfile adds padding that breaks gunzip. Patch # 1543897. Will backport to 2.5 ........ r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines Add assert to make Klocwork happy (#276) ........
1194 lines
52 KiB
Python
1194 lines
52 KiB
Python
# Python MSI Generator
|
|
# (C) 2003 Martin v. Loewis
|
|
# See "FOO" in comments refers to MSDN sections with the title FOO.
|
|
import msilib, schema, sequence, os, glob, time, re
|
|
from msilib import Feature, CAB, Directory, Dialog, Binary, add_data
|
|
import uisample
|
|
from win32com.client import constants
|
|
from distutils.spawn import find_executable
|
|
from uuids import product_codes
|
|
|
|
# Settings can be overridden in config.py below
|
|
# 0 for official python.org releases
|
|
# 1 for intermediate releases by anybody, with
|
|
# a new product code for every package.
|
|
snapshot = 1
|
|
# 1 means that file extension is px, not py,
|
|
# and binaries start with x
|
|
testpackage = 0
|
|
# Location of build tree
|
|
srcdir = os.path.abspath("../..")
|
|
# Text to be displayed as the version in dialogs etc.
|
|
# goes into file name and ProductCode. Defaults to
|
|
# current_version.day for Snapshot, current_version otherwise
|
|
full_current_version = None
|
|
# Is Tcl available at all?
|
|
have_tcl = True
|
|
# Where is sqlite3.dll located, relative to srcdir?
|
|
sqlite_dir = "../sqlite-source-3.3.4"
|
|
|
|
try:
|
|
from config import *
|
|
except ImportError:
|
|
pass
|
|
|
|
# Extract current version from Include/patchlevel.h
|
|
lines = open(srcdir + "/Include/patchlevel.h").readlines()
|
|
major = minor = micro = level = serial = None
|
|
levels = {
|
|
'PY_RELEASE_LEVEL_ALPHA':0xA,
|
|
'PY_RELEASE_LEVEL_BETA': 0xB,
|
|
'PY_RELEASE_LEVEL_GAMMA':0xC,
|
|
'PY_RELEASE_LEVEL_FINAL':0xF
|
|
}
|
|
for l in lines:
|
|
if not l.startswith("#define"):
|
|
continue
|
|
l = l.split()
|
|
if len(l) != 3:
|
|
continue
|
|
_, name, value = l
|
|
if name == 'PY_MAJOR_VERSION': major = value
|
|
if name == 'PY_MINOR_VERSION': minor = value
|
|
if name == 'PY_MICRO_VERSION': micro = value
|
|
if name == 'PY_RELEASE_LEVEL': level = levels[value]
|
|
if name == 'PY_RELEASE_SERIAL': serial = value
|
|
|
|
short_version = major+"."+minor
|
|
# See PC/make_versioninfo.c
|
|
FIELD3 = 1000*int(micro) + 10*level + int(serial)
|
|
current_version = "%s.%d" % (short_version, FIELD3)
|
|
|
|
# This should never change. The UpgradeCode of this package can be
|
|
# used in the Upgrade table of future packages to make the future
|
|
# package replace this one. See "UpgradeCode Property".
|
|
upgrade_code_snapshot='{92A24481-3ECB-40FC-8836-04B7966EC0D5}'
|
|
upgrade_code='{65E6DE48-A358-434D-AA4F-4AF72DB4718F}'
|
|
|
|
if snapshot:
|
|
current_version = "%s.%s.%s" % (major, minor, int(time.time()/3600/24))
|
|
product_code = msilib.gen_uuid()
|
|
else:
|
|
product_code = product_codes[current_version]
|
|
|
|
if full_current_version is None:
|
|
full_current_version = current_version
|
|
|
|
extensions = [
|
|
'bz2.pyd',
|
|
'pyexpat.pyd',
|
|
'select.pyd',
|
|
'unicodedata.pyd',
|
|
'winsound.pyd',
|
|
'_elementtree.pyd',
|
|
'_bsddb.pyd',
|
|
'_socket.pyd',
|
|
'_ssl.pyd',
|
|
'_testcapi.pyd',
|
|
'_tkinter.pyd',
|
|
'_msi.pyd',
|
|
'_ctypes.pyd',
|
|
'_ctypes_test.pyd',
|
|
'_sqlite3.pyd',
|
|
'_hashlib.pyd'
|
|
]
|
|
|
|
# Well-known component UUIDs
|
|
# These are needed for SharedDLLs reference counter; if
|
|
# a different UUID was used for each incarnation of, say,
|
|
# python24.dll, an upgrade would set the reference counter
|
|
# from 1 to 2 (due to what I consider a bug in MSI)
|
|
# Using the same UUID is fine since these files are versioned,
|
|
# so Installer will always keep the newest version.
|
|
msvcr71_uuid = "{8666C8DD-D0B4-4B42-928E-A69E32FA5D4D}"
|
|
pythondll_uuid = {
|
|
"24":"{9B81E618-2301-4035-AC77-75D9ABEB7301}",
|
|
"25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}"
|
|
} [major+minor]
|
|
|
|
# Build the mingw import library, libpythonXY.a
|
|
# This requires 'nm' and 'dlltool' executables on your PATH
|
|
def build_mingw_lib(lib_file, def_file, dll_file, mingw_lib):
|
|
warning = "WARNING: %s - libpythonXX.a not built"
|
|
nm = find_executable('nm')
|
|
dlltool = find_executable('dlltool')
|
|
|
|
if not nm or not dlltool:
|
|
print warning % "nm and/or dlltool were not found"
|
|
return False
|
|
|
|
nm_command = '%s -Cs %s' % (nm, lib_file)
|
|
dlltool_command = "%s --dllname %s --def %s --output-lib %s" % \
|
|
(dlltool, dll_file, def_file, mingw_lib)
|
|
export_match = re.compile(r"^_imp__(.*) in python\d+\.dll").match
|
|
|
|
f = open(def_file,'w')
|
|
print >>f, "LIBRARY %s" % dll_file
|
|
print >>f, "EXPORTS"
|
|
|
|
nm_pipe = os.popen(nm_command)
|
|
for line in nm_pipe.readlines():
|
|
m = export_match(line)
|
|
if m:
|
|
print >>f, m.group(1)
|
|
f.close()
|
|
exit = nm_pipe.close()
|
|
|
|
if exit:
|
|
print warning % "nm did not run successfully"
|
|
return False
|
|
|
|
if os.system(dlltool_command) != 0:
|
|
print warning % "dlltool did not run successfully"
|
|
return False
|
|
|
|
return True
|
|
|
|
# Target files (.def and .a) go in PCBuild directory
|
|
lib_file = os.path.join(srcdir, "PCBuild", "python%s%s.lib" % (major, minor))
|
|
def_file = os.path.join(srcdir, "PCBuild", "python%s%s.def" % (major, minor))
|
|
dll_file = "python%s%s.dll" % (major, minor)
|
|
mingw_lib = os.path.join(srcdir, "PCBuild", "libpython%s%s.a" % (major, minor))
|
|
|
|
have_mingw = build_mingw_lib(lib_file, def_file, dll_file, mingw_lib)
|
|
|
|
# Determine the target architechture
|
|
dll_path = os.path.join(srcdir, "PCBuild", dll_file)
|
|
msilib.set_arch_from_file(dll_path)
|
|
if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"):
|
|
raise SystemError, "msisupport.dll for incorrect architecture"
|
|
|
|
if testpackage:
|
|
ext = 'px'
|
|
testprefix = 'x'
|
|
else:
|
|
ext = 'py'
|
|
testprefix = ''
|
|
|
|
if msilib.Win64:
|
|
SystemFolderName = "[SystemFolder64]"
|
|
else:
|
|
SystemFolderName = "[SystemFolder]"
|
|
|
|
msilib.reset()
|
|
|
|
# condition in which to install pythonxy.dll in system32:
|
|
# a) it is Windows 9x or
|
|
# b) it is NT, the user is privileged, and has chosen per-machine installation
|
|
sys32cond = "(Windows9x or (Privileged and ALLUSERS))"
|
|
|
|
def build_database():
|
|
"""Generate an empty database, with just the schema and the
|
|
Summary information stream."""
|
|
if snapshot:
|
|
uc = upgrade_code_snapshot
|
|
else:
|
|
uc = upgrade_code
|
|
# schema represents the installer 2.0 database schema.
|
|
# sequence is the set of standard sequences
|
|
# (ui/execute, admin/advt/install)
|
|
db = msilib.init_database("python-%s%s.msi" % (full_current_version, msilib.arch_ext),
|
|
schema, ProductName="Python "+full_current_version,
|
|
ProductCode=product_code,
|
|
ProductVersion=current_version,
|
|
Manufacturer=u"Martin v. L\xf6wis")
|
|
# The default sequencing of the RemoveExistingProducts action causes
|
|
# removal of files that got just installed. Place it after
|
|
# InstallInitialize, so we first uninstall everything, but still roll
|
|
# back in case the installation is interrupted
|
|
msilib.change_sequence(sequence.InstallExecuteSequence,
|
|
"RemoveExistingProducts", 1510)
|
|
msilib.add_tables(db, sequence)
|
|
# We cannot set ALLUSERS in the property table, as this cannot be
|
|
# reset if the user choses a per-user installation. Instead, we
|
|
# maintain WhichUsers, which can be "ALL" or "JUSTME". The UI manages
|
|
# this property, and when the execution starts, ALLUSERS is set
|
|
# accordingly.
|
|
add_data(db, "Property", [("UpgradeCode", uc),
|
|
("WhichUsers", "ALL"),
|
|
("ProductLine", "Python%s%s" % (major, minor)),
|
|
])
|
|
db.Commit()
|
|
return db
|
|
|
|
def remove_old_versions(db):
|
|
"Fill the upgrade table."
|
|
start = "%s.%s.0" % (major, minor)
|
|
# This requests that feature selection states of an older
|
|
# installation should be forwarded into this one. Upgrading
|
|
# requires that both the old and the new installation are
|
|
# either both per-machine or per-user.
|
|
migrate_features = 1
|
|
# See "Upgrade Table". We remove releases with the same major and
|
|
# minor version. For an snapshot, we remove all earlier snapshots. For
|
|
# a release, we remove all snapshots, and all earlier releases.
|
|
if snapshot:
|
|
add_data(db, "Upgrade",
|
|
[(upgrade_code_snapshot, start,
|
|
current_version,
|
|
None, # Ignore language
|
|
migrate_features,
|
|
None, # Migrate ALL features
|
|
"REMOVEOLDSNAPSHOT")])
|
|
props = "REMOVEOLDSNAPSHOT"
|
|
else:
|
|
add_data(db, "Upgrade",
|
|
[(upgrade_code, start, current_version,
|
|
None, migrate_features, None, "REMOVEOLDVERSION"),
|
|
(upgrade_code_snapshot, start, "%s.%d.0" % (major, int(minor)+1),
|
|
None, migrate_features, None, "REMOVEOLDSNAPSHOT")])
|
|
props = "REMOVEOLDSNAPSHOT;REMOVEOLDVERSION"
|
|
# Installer collects the product codes of the earlier releases in
|
|
# these properties. In order to allow modification of the properties,
|
|
# they must be declared as secure. See "SecureCustomProperties Property"
|
|
add_data(db, "Property", [("SecureCustomProperties", props)])
|
|
|
|
class PyDialog(Dialog):
|
|
"""Dialog class with a fixed layout: controls at the top, then a ruler,
|
|
then a list of buttons: back, next, cancel. Optionally a bitmap at the
|
|
left."""
|
|
def __init__(self, *args, **kw):
|
|
"""Dialog(database, name, x, y, w, h, attributes, title, first,
|
|
default, cancel, bitmap=true)"""
|
|
Dialog.__init__(self, *args)
|
|
ruler = self.h - 36
|
|
bmwidth = 152*ruler/328
|
|
if kw.get("bitmap", True):
|
|
self.bitmap("Bitmap", 0, 0, bmwidth, ruler, "PythonWin")
|
|
self.line("BottomLine", 0, ruler, self.w, 0)
|
|
|
|
def title(self, title):
|
|
"Set the title text of the dialog at the top."
|
|
# name, x, y, w, h, flags=Visible|Enabled|Transparent|NoPrefix,
|
|
# text, in VerdanaBold10
|
|
self.text("Title", 135, 10, 220, 60, 0x30003,
|
|
r"{\VerdanaBold10}%s" % title)
|
|
|
|
def back(self, title, next, name = "Back", active = 1):
|
|
"""Add a back button with a given title, the tab-next button,
|
|
its name in the Control table, possibly initially disabled.
|
|
|
|
Return the button, so that events can be associated"""
|
|
if active:
|
|
flags = 3 # Visible|Enabled
|
|
else:
|
|
flags = 1 # Visible
|
|
return self.pushbutton(name, 180, self.h-27 , 56, 17, flags, title, next)
|
|
|
|
def cancel(self, title, next, name = "Cancel", active = 1):
|
|
"""Add a cancel button with a given title, the tab-next button,
|
|
its name in the Control table, possibly initially disabled.
|
|
|
|
Return the button, so that events can be associated"""
|
|
if active:
|
|
flags = 3 # Visible|Enabled
|
|
else:
|
|
flags = 1 # Visible
|
|
return self.pushbutton(name, 304, self.h-27, 56, 17, flags, title, next)
|
|
|
|
def next(self, title, next, name = "Next", active = 1):
|
|
"""Add a Next button with a given title, the tab-next button,
|
|
its name in the Control table, possibly initially disabled.
|
|
|
|
Return the button, so that events can be associated"""
|
|
if active:
|
|
flags = 3 # Visible|Enabled
|
|
else:
|
|
flags = 1 # Visible
|
|
return self.pushbutton(name, 236, self.h-27, 56, 17, flags, title, next)
|
|
|
|
def xbutton(self, name, title, next, xpos):
|
|
"""Add a button with a given title, the tab-next button,
|
|
its name in the Control table, giving its x position; the
|
|
y-position is aligned with the other buttons.
|
|
|
|
Return the button, so that events can be associated"""
|
|
return self.pushbutton(name, int(self.w*xpos - 28), self.h-27, 56, 17, 3, title, next)
|
|
|
|
def add_ui(db):
|
|
x = y = 50
|
|
w = 370
|
|
h = 300
|
|
title = "[ProductName] Setup"
|
|
|
|
# see "Dialog Style Bits"
|
|
modal = 3 # visible | modal
|
|
modeless = 1 # visible
|
|
track_disk_space = 32
|
|
|
|
add_data(db, 'ActionText', uisample.ActionText)
|
|
add_data(db, 'UIText', uisample.UIText)
|
|
|
|
# Bitmaps
|
|
if not os.path.exists(srcdir+r"\PC\python_icon.exe"):
|
|
raise "Run icons.mak in PC directory"
|
|
add_data(db, "Binary",
|
|
[("PythonWin", msilib.Binary(srcdir+r"\PCbuild\installer.bmp")), # 152x328 pixels
|
|
("py.ico",msilib.Binary(srcdir+r"\PC\py.ico")),
|
|
])
|
|
add_data(db, "Icon",
|
|
[("python_icon.exe", msilib.Binary(srcdir+r"\PC\python_icon.exe"))])
|
|
|
|
# Scripts
|
|
# CheckDir sets TargetExists if TARGETDIR exists.
|
|
# UpdateEditIDLE sets the REGISTRY.tcl component into
|
|
# the installed/uninstalled state according to both the
|
|
# Extensions and TclTk features.
|
|
if os.system("nmake /nologo /c /f msisupport.mak") != 0:
|
|
raise "'nmake /f msisupport.mak' failed"
|
|
add_data(db, "Binary", [("Script", msilib.Binary("msisupport.dll"))])
|
|
# See "Custom Action Type 1"
|
|
if msilib.Win64:
|
|
CheckDir = "CheckDir"
|
|
UpdateEditIDLE = "UpdateEditIDLE"
|
|
else:
|
|
CheckDir = "_CheckDir@4"
|
|
UpdateEditIDLE = "_UpdateEditIDLE@4"
|
|
add_data(db, "CustomAction",
|
|
[("CheckDir", 1, "Script", CheckDir)])
|
|
if have_tcl:
|
|
add_data(db, "CustomAction",
|
|
[("UpdateEditIDLE", 1, "Script", UpdateEditIDLE)])
|
|
|
|
# UI customization properties
|
|
add_data(db, "Property",
|
|
# See "DefaultUIFont Property"
|
|
[("DefaultUIFont", "DlgFont8"),
|
|
# See "ErrorDialog Style Bit"
|
|
("ErrorDialog", "ErrorDlg"),
|
|
("Progress1", "Install"), # modified in maintenance type dlg
|
|
("Progress2", "installs"),
|
|
("MaintenanceForm_Action", "Repair")])
|
|
|
|
# Fonts, see "TextStyle Table"
|
|
add_data(db, "TextStyle",
|
|
[("DlgFont8", "Tahoma", 9, None, 0),
|
|
("DlgFontBold8", "Tahoma", 8, None, 1), #bold
|
|
("VerdanaBold10", "Verdana", 10, None, 1),
|
|
("VerdanaRed9", "Verdana", 9, 255, 0),
|
|
])
|
|
|
|
compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x bad_coding|badsyntax|site-packages "[TARGETDIR]Lib"'
|
|
# See "CustomAction Table"
|
|
add_data(db, "CustomAction", [
|
|
# msidbCustomActionTypeFirstSequence + msidbCustomActionTypeTextData + msidbCustomActionTypeProperty
|
|
# See "Custom Action Type 51",
|
|
# "Custom Action Execution Scheduling Options"
|
|
("InitialTargetDir", 307, "TARGETDIR",
|
|
"[WindowsVolume]Python%s%s" % (major, minor)),
|
|
("SetDLLDirToTarget", 307, "DLLDIR", "[TARGETDIR]"),
|
|
("SetDLLDirToSystem32", 307, "DLLDIR", SystemFolderName),
|
|
# msidbCustomActionTypeExe + msidbCustomActionTypeSourceFile
|
|
# See "Custom Action Type 18"
|
|
("CompilePyc", 18, "python.exe", compileargs),
|
|
("CompilePyo", 18, "python.exe", "-O "+compileargs),
|
|
])
|
|
|
|
# UI Sequences, see "InstallUISequence Table", "Using a Sequence Table"
|
|
# Numbers indicate sequence; see sequence.py for how these action integrate
|
|
add_data(db, "InstallUISequence",
|
|
[("PrepareDlg", "Not Privileged or Windows9x or Installed", 140),
|
|
("WhichUsersDlg", "Privileged and not Windows9x and not Installed", 141),
|
|
("InitialTargetDir", 'TARGETDIR=""', 750),
|
|
# In the user interface, assume all-users installation if privileged.
|
|
("SetDLLDirToSystem32", 'DLLDIR="" and ' + sys32cond, 751),
|
|
("SetDLLDirToTarget", 'DLLDIR="" and not ' + sys32cond, 752),
|
|
("SelectDirectoryDlg", "Not Installed", 1230),
|
|
# XXX no support for resume installations yet
|
|
#("ResumeDlg", "Installed AND (RESUME OR Preselected)", 1240),
|
|
("MaintenanceTypeDlg", "Installed AND NOT RESUME AND NOT Preselected", 1250),
|
|
("ProgressDlg", None, 1280)])
|
|
add_data(db, "AdminUISequence",
|
|
[("InitialTargetDir", 'TARGETDIR=""', 750),
|
|
("SetDLLDirToTarget", 'DLLDIR=""', 751),
|
|
])
|
|
|
|
# Execute Sequences
|
|
add_data(db, "InstallExecuteSequence",
|
|
[("InitialTargetDir", 'TARGETDIR=""', 750),
|
|
("SetDLLDirToSystem32", 'DLLDIR="" and ' + sys32cond, 751),
|
|
("SetDLLDirToTarget", 'DLLDIR="" and not ' + sys32cond, 752),
|
|
("UpdateEditIDLE", None, 1050),
|
|
("CompilePyc", "COMPILEALL", 6800),
|
|
("CompilePyo", "COMPILEALL", 6801),
|
|
])
|
|
add_data(db, "AdminExecuteSequence",
|
|
[("InitialTargetDir", 'TARGETDIR=""', 750),
|
|
("SetDLLDirToTarget", 'DLLDIR=""', 751),
|
|
("CompilePyc", "COMPILEALL", 6800),
|
|
("CompilePyo", "COMPILEALL", 6801),
|
|
])
|
|
|
|
#####################################################################
|
|
# Standard dialogs: FatalError, UserExit, ExitDialog
|
|
fatal=PyDialog(db, "FatalError", x, y, w, h, modal, title,
|
|
"Finish", "Finish", "Finish")
|
|
fatal.title("[ProductName] Installer ended prematurely")
|
|
fatal.back("< Back", "Finish", active = 0)
|
|
fatal.cancel("Cancel", "Back", active = 0)
|
|
fatal.text("Description1", 135, 70, 220, 80, 0x30003,
|
|
"[ProductName] setup ended prematurely because of an error. Your system has not been modified. To install this program at a later time, please run the installation again.")
|
|
fatal.text("Description2", 135, 155, 220, 20, 0x30003,
|
|
"Click the Finish button to exit the Installer.")
|
|
c=fatal.next("Finish", "Cancel", name="Finish")
|
|
# See "ControlEvent Table". Parameters are the event, the parameter
|
|
# to the action, and optionally the condition for the event, and the order
|
|
# of events.
|
|
c.event("EndDialog", "Exit")
|
|
|
|
user_exit=PyDialog(db, "UserExit", x, y, w, h, modal, title,
|
|
"Finish", "Finish", "Finish")
|
|
user_exit.title("[ProductName] Installer was interrupted")
|
|
user_exit.back("< Back", "Finish", active = 0)
|
|
user_exit.cancel("Cancel", "Back", active = 0)
|
|
user_exit.text("Description1", 135, 70, 220, 80, 0x30003,
|
|
"[ProductName] setup was interrupted. Your system has not been modified. "
|
|
"To install this program at a later time, please run the installation again.")
|
|
user_exit.text("Description2", 135, 155, 220, 20, 0x30003,
|
|
"Click the Finish button to exit the Installer.")
|
|
c = user_exit.next("Finish", "Cancel", name="Finish")
|
|
c.event("EndDialog", "Exit")
|
|
|
|
exit_dialog = PyDialog(db, "ExitDialog", x, y, w, h, modal, title,
|
|
"Finish", "Finish", "Finish")
|
|
exit_dialog.title("Completing the [ProductName] Installer")
|
|
exit_dialog.back("< Back", "Finish", active = 0)
|
|
exit_dialog.cancel("Cancel", "Back", active = 0)
|
|
exit_dialog.text("Acknowledgements", 135, 95, 220, 120, 0x30003,
|
|
"Special Windows thanks to:\n"
|
|
" Mark Hammond, without whose years of freely \n"
|
|
" shared Windows expertise, Python for Windows \n"
|
|
" would still be Python for DOS.")
|
|
|
|
c = exit_dialog.text("warning", 135, 200, 220, 40, 0x30003,
|
|
"{\\VerdanaRed9}Warning: Python 2.5.x is the last "
|
|
"Python release for Windows 9x.")
|
|
c.condition("Hide", "NOT Version9X")
|
|
|
|
exit_dialog.text("Description", 135, 235, 220, 20, 0x30003,
|
|
"Click the Finish button to exit the Installer.")
|
|
c = exit_dialog.next("Finish", "Cancel", name="Finish")
|
|
c.event("EndDialog", "Return")
|
|
|
|
#####################################################################
|
|
# Required dialog: FilesInUse, ErrorDlg
|
|
inuse = PyDialog(db, "FilesInUse",
|
|
x, y, w, h,
|
|
19, # KeepModeless|Modal|Visible
|
|
title,
|
|
"Retry", "Retry", "Retry", bitmap=False)
|
|
inuse.text("Title", 15, 6, 200, 15, 0x30003,
|
|
r"{\DlgFontBold8}Files in Use")
|
|
inuse.text("Description", 20, 23, 280, 20, 0x30003,
|
|
"Some files that need to be updated are currently in use.")
|
|
inuse.text("Text", 20, 55, 330, 50, 3,
|
|
"The following applications are using files that need to be updated by this setup. Close these applications and then click Retry to continue the installation or Cancel to exit it.")
|
|
inuse.control("List", "ListBox", 20, 107, 330, 130, 7, "FileInUseProcess",
|
|
None, None, None)
|
|
c=inuse.back("Exit", "Ignore", name="Exit")
|
|
c.event("EndDialog", "Exit")
|
|
c=inuse.next("Ignore", "Retry", name="Ignore")
|
|
c.event("EndDialog", "Ignore")
|
|
c=inuse.cancel("Retry", "Exit", name="Retry")
|
|
c.event("EndDialog","Retry")
|
|
|
|
|
|
# See "Error Dialog". See "ICE20" for the required names of the controls.
|
|
error = Dialog(db, "ErrorDlg",
|
|
50, 10, 330, 101,
|
|
65543, # Error|Minimize|Modal|Visible
|
|
title,
|
|
"ErrorText", None, None)
|
|
error.text("ErrorText", 50,9,280,48,3, "")
|
|
error.control("ErrorIcon", "Icon", 15, 9, 24, 24, 5242881, None, "py.ico", None, None)
|
|
error.pushbutton("N",120,72,81,21,3,"No",None).event("EndDialog","ErrorNo")
|
|
error.pushbutton("Y",240,72,81,21,3,"Yes",None).event("EndDialog","ErrorYes")
|
|
error.pushbutton("A",0,72,81,21,3,"Abort",None).event("EndDialog","ErrorAbort")
|
|
error.pushbutton("C",42,72,81,21,3,"Cancel",None).event("EndDialog","ErrorCancel")
|
|
error.pushbutton("I",81,72,81,21,3,"Ignore",None).event("EndDialog","ErrorIgnore")
|
|
error.pushbutton("O",159,72,81,21,3,"Ok",None).event("EndDialog","ErrorOk")
|
|
error.pushbutton("R",198,72,81,21,3,"Retry",None).event("EndDialog","ErrorRetry")
|
|
|
|
#####################################################################
|
|
# Global "Query Cancel" dialog
|
|
cancel = Dialog(db, "CancelDlg", 50, 10, 260, 85, 3, title,
|
|
"No", "No", "No")
|
|
cancel.text("Text", 48, 15, 194, 30, 3,
|
|
"Are you sure you want to cancel [ProductName] installation?")
|
|
cancel.control("Icon", "Icon", 15, 15, 24, 24, 5242881, None,
|
|
"py.ico", None, None)
|
|
c=cancel.pushbutton("Yes", 72, 57, 56, 17, 3, "Yes", "No")
|
|
c.event("EndDialog", "Exit")
|
|
|
|
c=cancel.pushbutton("No", 132, 57, 56, 17, 3, "No", "Yes")
|
|
c.event("EndDialog", "Return")
|
|
|
|
#####################################################################
|
|
# Global "Wait for costing" dialog
|
|
costing = Dialog(db, "WaitForCostingDlg", 50, 10, 260, 85, modal, title,
|
|
"Return", "Return", "Return")
|
|
costing.text("Text", 48, 15, 194, 30, 3,
|
|
"Please wait while the installer finishes determining your disk space requirements.")
|
|
costing.control("Icon", "Icon", 15, 15, 24, 24, 5242881, None,
|
|
"py.ico", None, None)
|
|
c = costing.pushbutton("Return", 102, 57, 56, 17, 3, "Return", None)
|
|
c.event("EndDialog", "Exit")
|
|
|
|
#####################################################################
|
|
# Preparation dialog: no user input except cancellation
|
|
prep = PyDialog(db, "PrepareDlg", x, y, w, h, modeless, title,
|
|
"Cancel", "Cancel", "Cancel")
|
|
prep.text("Description", 135, 70, 220, 40, 0x30003,
|
|
"Please wait while the Installer prepares to guide you through the installation.")
|
|
prep.title("Welcome to the [ProductName] Installer")
|
|
c=prep.text("ActionText", 135, 110, 220, 20, 0x30003, "Pondering...")
|
|
c.mapping("ActionText", "Text")
|
|
c=prep.text("ActionData", 135, 135, 220, 30, 0x30003, None)
|
|
c.mapping("ActionData", "Text")
|
|
prep.back("Back", None, active=0)
|
|
prep.next("Next", None, active=0)
|
|
c=prep.cancel("Cancel", None)
|
|
c.event("SpawnDialog", "CancelDlg")
|
|
|
|
#####################################################################
|
|
# Target directory selection
|
|
seldlg = PyDialog(db, "SelectDirectoryDlg", x, y, w, h, modal, title,
|
|
"Next", "Next", "Cancel")
|
|
seldlg.title("Select Destination Directory")
|
|
c = seldlg.text("Existing", 135, 25, 235, 30, 0x30003,
|
|
"{\VerdanaRed9}This update will replace your existing [ProductLine] installation.")
|
|
c.condition("Hide", 'REMOVEOLDVERSION="" and REMOVEOLDSNAPSHOT=""')
|
|
seldlg.text("Description", 135, 50, 220, 40, 0x30003,
|
|
"Please select a directory for the [ProductName] files.")
|
|
|
|
seldlg.back("< Back", None, active=0)
|
|
c = seldlg.next("Next >", "Cancel")
|
|
c.event("DoAction", "CheckDir", "TargetExistsOk<>1", order=1)
|
|
# If the target exists, but we found that we are going to remove old versions, don't bother
|
|
# confirming that the target directory exists. Strictly speaking, we should determine that
|
|
# the target directory is indeed the target of the product that we are going to remove, but
|
|
# I don't know how to do that.
|
|
c.event("SpawnDialog", "ExistingDirectoryDlg", 'TargetExists=1 and REMOVEOLDVERSION="" and REMOVEOLDSNAPSHOT=""', 2)
|
|
c.event("SetTargetPath", "TARGETDIR", 'TargetExists=0 or REMOVEOLDVERSION<>"" or REMOVEOLDSNAPSHOT<>""', 3)
|
|
c.event("SpawnWaitDialog", "WaitForCostingDlg", "CostingComplete=1", 4)
|
|
c.event("NewDialog", "SelectFeaturesDlg", 'TargetExists=0 or REMOVEOLDVERSION<>"" or REMOVEOLDSNAPSHOT<>""', 5)
|
|
|
|
c = seldlg.cancel("Cancel", "DirectoryCombo")
|
|
c.event("SpawnDialog", "CancelDlg")
|
|
|
|
seldlg.control("DirectoryCombo", "DirectoryCombo", 135, 70, 172, 80, 393219,
|
|
"TARGETDIR", None, "DirectoryList", None)
|
|
seldlg.control("DirectoryList", "DirectoryList", 135, 90, 208, 136, 3, "TARGETDIR",
|
|
None, "PathEdit", None)
|
|
seldlg.control("PathEdit", "PathEdit", 135, 230, 206, 16, 3, "TARGETDIR", None, "Next", None)
|
|
c = seldlg.pushbutton("Up", 306, 70, 18, 18, 3, "Up", None)
|
|
c.event("DirectoryListUp", "0")
|
|
c = seldlg.pushbutton("NewDir", 324, 70, 30, 18, 3, "New", None)
|
|
c.event("DirectoryListNew", "0")
|
|
|
|
#####################################################################
|
|
# SelectFeaturesDlg
|
|
features = PyDialog(db, "SelectFeaturesDlg", x, y, w, h, modal|track_disk_space,
|
|
title, "Tree", "Next", "Cancel")
|
|
features.title("Customize [ProductName]")
|
|
features.text("Description", 135, 35, 220, 15, 0x30003,
|
|
"Select the way you want features to be installed.")
|
|
features.text("Text", 135,45,220,30, 3,
|
|
"Click on the icons in the tree below to change the way features will be installed.")
|
|
|
|
c=features.back("< Back", "Next")
|
|
c.event("NewDialog", "SelectDirectoryDlg")
|
|
|
|
c=features.next("Next >", "Cancel")
|
|
c.mapping("SelectionNoItems", "Enabled")
|
|
c.event("SpawnDialog", "DiskCostDlg", "OutOfDiskSpace=1", order=1)
|
|
c.event("EndDialog", "Return", "OutOfDiskSpace<>1", order=2)
|
|
|
|
c=features.cancel("Cancel", "Tree")
|
|
c.event("SpawnDialog", "CancelDlg")
|
|
|
|
# The browse property is not used, since we have only a single target path (selected already)
|
|
features.control("Tree", "SelectionTree", 135, 75, 220, 95, 7, "_BrowseProperty",
|
|
"Tree of selections", "Back", None)
|
|
|
|
#c=features.pushbutton("Reset", 42, 243, 56, 17, 3, "Reset", "DiskCost")
|
|
#c.mapping("SelectionNoItems", "Enabled")
|
|
#c.event("Reset", "0")
|
|
|
|
features.control("Box", "GroupBox", 135, 170, 225, 90, 1, None, None, None, None)
|
|
|
|
c=features.xbutton("DiskCost", "Disk &Usage", None, 0.10)
|
|
c.mapping("SelectionNoItems","Enabled")
|
|
c.event("SpawnDialog", "DiskCostDlg")
|
|
|
|
c=features.xbutton("Advanced", "Advanced", None, 0.30)
|
|
c.event("SpawnDialog", "AdvancedDlg")
|
|
|
|
c=features.text("ItemDescription", 140, 180, 210, 30, 3,
|
|
"Multiline description of the currently selected item.")
|
|
c.mapping("SelectionDescription","Text")
|
|
|
|
c=features.text("ItemSize", 140, 210, 210, 45, 3,
|
|
"The size of the currently selected item.")
|
|
c.mapping("SelectionSize", "Text")
|
|
|
|
#####################################################################
|
|
# Disk cost
|
|
cost = PyDialog(db, "DiskCostDlg", x, y, w, h, modal, title,
|
|
"OK", "OK", "OK", bitmap=False)
|
|
cost.text("Title", 15, 6, 200, 15, 0x30003,
|
|
"{\DlgFontBold8}Disk Space Requirements")
|
|
cost.text("Description", 20, 20, 280, 20, 0x30003,
|
|
"The disk space required for the installation of the selected features.")
|
|
cost.text("Text", 20, 53, 330, 60, 3,
|
|
"The highlighted volumes (if any) do not have enough disk space "
|
|
"available for the currently selected features. You can either "
|
|
"remove some files from the highlighted volumes, or choose to "
|
|
"install less features onto local drive(s), or select different "
|
|
"destination drive(s).")
|
|
cost.control("VolumeList", "VolumeCostList", 20, 100, 330, 150, 393223,
|
|
None, "{120}{70}{70}{70}{70}", None, None)
|
|
cost.xbutton("OK", "Ok", None, 0.5).event("EndDialog", "Return")
|
|
|
|
#####################################################################
|
|
# WhichUsers Dialog. Only available on NT, and for privileged users.
|
|
# This must be run before FindRelatedProducts, because that will
|
|
# take into account whether the previous installation was per-user
|
|
# or per-machine. We currently don't support going back to this
|
|
# dialog after "Next" was selected; to support this, we would need to
|
|
# find how to reset the ALLUSERS property, and how to re-run
|
|
# FindRelatedProducts.
|
|
# On Windows9x, the ALLUSERS property is ignored on the command line
|
|
# and in the Property table, but installer fails according to the documentation
|
|
# if a dialog attempts to set ALLUSERS.
|
|
whichusers = PyDialog(db, "WhichUsersDlg", x, y, w, h, modal, title,
|
|
"AdminInstall", "Next", "Cancel")
|
|
whichusers.title("Select whether to install [ProductName] for all users of this computer.")
|
|
# A radio group with two options: allusers, justme
|
|
g = whichusers.radiogroup("AdminInstall", 135, 60, 160, 50, 3,
|
|
"WhichUsers", "", "Next")
|
|
g.add("ALL", 0, 5, 150, 20, "Install for all users")
|
|
g.add("JUSTME", 0, 25, 150, 20, "Install just for me")
|
|
|
|
whichusers.back("Back", None, active=0)
|
|
|
|
c = whichusers.next("Next >", "Cancel")
|
|
c.event("[ALLUSERS]", "1", 'WhichUsers="ALL"', 1)
|
|
c.event("EndDialog", "Return", order = 2)
|
|
|
|
c = whichusers.cancel("Cancel", "AdminInstall")
|
|
c.event("SpawnDialog", "CancelDlg")
|
|
|
|
#####################################################################
|
|
# Advanced Dialog.
|
|
advanced = PyDialog(db, "AdvancedDlg", x, y, w, h, modal, title,
|
|
"CompilePyc", "Next", "Cancel")
|
|
advanced.title("Advanced Options for [ProductName]")
|
|
# A radio group with two options: allusers, justme
|
|
advanced.checkbox("CompilePyc", 135, 60, 230, 50, 3,
|
|
"COMPILEALL", "Compile .py files to byte code after installation", "Next")
|
|
|
|
c = advanced.next("Finish", "Cancel")
|
|
c.event("EndDialog", "Return")
|
|
|
|
c = advanced.cancel("Cancel", "CompilePyc")
|
|
c.event("SpawnDialog", "CancelDlg")
|
|
|
|
#####################################################################
|
|
# Existing Directory dialog
|
|
dlg = Dialog(db, "ExistingDirectoryDlg", 50, 30, 200, 80, modal, title,
|
|
"No", "No", "No")
|
|
dlg.text("Title", 10, 20, 180, 40, 3,
|
|
"[TARGETDIR] exists. Are you sure you want to overwrite existing files?")
|
|
c=dlg.pushbutton("Yes", 30, 60, 55, 17, 3, "Yes", "No")
|
|
c.event("[TargetExists]", "0", order=1)
|
|
c.event("[TargetExistsOk]", "1", order=2)
|
|
c.event("EndDialog", "Return", order=3)
|
|
c=dlg.pushbutton("No", 115, 60, 55, 17, 3, "No", "Yes")
|
|
c.event("EndDialog", "Return")
|
|
|
|
#####################################################################
|
|
# Installation Progress dialog (modeless)
|
|
progress = PyDialog(db, "ProgressDlg", x, y, w, h, modeless, title,
|
|
"Cancel", "Cancel", "Cancel", bitmap=False)
|
|
progress.text("Title", 20, 15, 200, 15, 0x30003,
|
|
"{\DlgFontBold8}[Progress1] [ProductName]")
|
|
progress.text("Text", 35, 65, 300, 30, 3,
|
|
"Please wait while the Installer [Progress2] [ProductName]. "
|
|
"This may take several minutes.")
|
|
progress.text("StatusLabel", 35, 100, 35, 20, 3, "Status:")
|
|
|
|
c=progress.text("ActionText", 70, 100, w-70, 20, 3, "Pondering...")
|
|
c.mapping("ActionText", "Text")
|
|
|
|
#c=progress.text("ActionData", 35, 140, 300, 20, 3, None)
|
|
#c.mapping("ActionData", "Text")
|
|
|
|
c=progress.control("ProgressBar", "ProgressBar", 35, 120, 300, 10, 65537,
|
|
None, "Progress done", None, None)
|
|
c.mapping("SetProgress", "Progress")
|
|
|
|
progress.back("< Back", "Next", active=False)
|
|
progress.next("Next >", "Cancel", active=False)
|
|
progress.cancel("Cancel", "Back").event("SpawnDialog", "CancelDlg")
|
|
|
|
# Maintenance type: repair/uninstall
|
|
maint = PyDialog(db, "MaintenanceTypeDlg", x, y, w, h, modal, title,
|
|
"Next", "Next", "Cancel")
|
|
maint.title("Welcome to the [ProductName] Setup Wizard")
|
|
maint.text("BodyText", 135, 63, 230, 42, 3,
|
|
"Select whether you want to repair or remove [ProductName].")
|
|
g=maint.radiogroup("RepairRadioGroup", 135, 108, 230, 60, 3,
|
|
"MaintenanceForm_Action", "", "Next")
|
|
g.add("Change", 0, 0, 200, 17, "&Change [ProductName]")
|
|
g.add("Repair", 0, 18, 200, 17, "&Repair [ProductName]")
|
|
g.add("Remove", 0, 36, 200, 17, "Re&move [ProductName]")
|
|
|
|
maint.back("< Back", None, active=False)
|
|
c=maint.next("Finish", "Cancel")
|
|
# Change installation: Change progress dialog to "Change", then ask
|
|
# for feature selection
|
|
c.event("[Progress1]", "Change", 'MaintenanceForm_Action="Change"', 1)
|
|
c.event("[Progress2]", "changes", 'MaintenanceForm_Action="Change"', 2)
|
|
|
|
# Reinstall: Change progress dialog to "Repair", then invoke reinstall
|
|
# Also set list of reinstalled features to "ALL"
|
|
c.event("[REINSTALL]", "ALL", 'MaintenanceForm_Action="Repair"', 5)
|
|
c.event("[Progress1]", "Repairing", 'MaintenanceForm_Action="Repair"', 6)
|
|
c.event("[Progress2]", "repairs", 'MaintenanceForm_Action="Repair"', 7)
|
|
c.event("Reinstall", "ALL", 'MaintenanceForm_Action="Repair"', 8)
|
|
|
|
# Uninstall: Change progress to "Remove", then invoke uninstall
|
|
# Also set list of removed features to "ALL"
|
|
c.event("[REMOVE]", "ALL", 'MaintenanceForm_Action="Remove"', 11)
|
|
c.event("[Progress1]", "Removing", 'MaintenanceForm_Action="Remove"', 12)
|
|
c.event("[Progress2]", "removes", 'MaintenanceForm_Action="Remove"', 13)
|
|
c.event("Remove", "ALL", 'MaintenanceForm_Action="Remove"', 14)
|
|
|
|
# Close dialog when maintenance action scheduled
|
|
c.event("EndDialog", "Return", 'MaintenanceForm_Action<>"Change"', 20)
|
|
c.event("NewDialog", "SelectFeaturesDlg", 'MaintenanceForm_Action="Change"', 21)
|
|
|
|
maint.cancel("Cancel", "RepairRadioGroup").event("SpawnDialog", "CancelDlg")
|
|
|
|
|
|
# See "Feature Table". The feature level is 1 for all features,
|
|
# and the feature attributes are 0 for the DefaultFeature, and
|
|
# FollowParent for all other features. The numbers are the Display
|
|
# column.
|
|
def add_features(db):
|
|
# feature attributes:
|
|
# msidbFeatureAttributesFollowParent == 2
|
|
# msidbFeatureAttributesDisallowAdvertise == 8
|
|
# Features that need to be installed with together with the main feature
|
|
# (i.e. additional Python libraries) need to follow the parent feature.
|
|
# Features that have no advertisement trigger (e.g. the test suite)
|
|
# must not support advertisement
|
|
global default_feature, tcltk, htmlfiles, tools, testsuite, ext_feature
|
|
default_feature = Feature(db, "DefaultFeature", "Python",
|
|
"Python Interpreter and Libraries",
|
|
1, directory = "TARGETDIR")
|
|
# We don't support advertisement of extensions
|
|
ext_feature = Feature(db, "Extensions", "Register Extensions",
|
|
"Make this Python installation the default Python installation", 3,
|
|
parent = default_feature, attributes=2|8)
|
|
if have_tcl:
|
|
tcltk = Feature(db, "TclTk", "Tcl/Tk", "Tkinter, IDLE, pydoc", 5,
|
|
parent = default_feature, attributes=2)
|
|
htmlfiles = Feature(db, "Documentation", "Documentation",
|
|
"Python HTMLHelp File", 7, parent = default_feature)
|
|
tools = Feature(db, "Tools", "Utility Scripts",
|
|
"Python utility scripts (Tools/", 9,
|
|
parent = default_feature, attributes=2)
|
|
testsuite = Feature(db, "Testsuite", "Test suite",
|
|
"Python test suite (Lib/test/)", 11,
|
|
parent = default_feature, attributes=2|8)
|
|
|
|
def extract_msvcr71():
|
|
import _winreg
|
|
# Find the location of the merge modules
|
|
k = _winreg.OpenKey(
|
|
_winreg.HKEY_LOCAL_MACHINE,
|
|
r"Software\Microsoft\VisualStudio\7.1\Setup\VS")
|
|
dir = _winreg.QueryValueEx(k, "MSMDir")[0]
|
|
_winreg.CloseKey(k)
|
|
files = glob.glob1(dir, "*CRT71*")
|
|
assert len(files) == 1
|
|
file = os.path.join(dir, files[0])
|
|
# Extract msvcr71.dll
|
|
m = msilib.MakeMerge2()
|
|
m.OpenModule(file, 0)
|
|
m.ExtractFiles(".")
|
|
m.CloseModule()
|
|
# Find the version/language of msvcr71.dll
|
|
installer = msilib.MakeInstaller()
|
|
return installer.FileVersion("msvcr71.dll", 0), \
|
|
installer.FileVersion("msvcr71.dll", 1)
|
|
|
|
class PyDirectory(Directory):
|
|
"""By default, all components in the Python installer
|
|
can run from source."""
|
|
def __init__(self, *args, **kw):
|
|
if not kw.has_key("componentflags"):
|
|
kw['componentflags'] = 2 #msidbComponentAttributesOptional
|
|
Directory.__init__(self, *args, **kw)
|
|
|
|
# See "File Table", "Component Table", "Directory Table",
|
|
# "FeatureComponents Table"
|
|
def add_files(db):
|
|
cab = CAB("python")
|
|
tmpfiles = []
|
|
# Add all executables, icons, text files into the TARGETDIR component
|
|
root = PyDirectory(db, cab, None, srcdir, "TARGETDIR", "SourceDir")
|
|
default_feature.set_current()
|
|
if not msilib.Win64:
|
|
root.add_file("PCBuild/w9xpopen.exe")
|
|
root.add_file("README.txt", src="README")
|
|
root.add_file("NEWS.txt", src="Misc/NEWS")
|
|
root.add_file("LICENSE.txt", src="LICENSE")
|
|
root.start_component("python.exe", keyfile="python.exe")
|
|
root.add_file("PCBuild/python.exe")
|
|
root.start_component("pythonw.exe", keyfile="pythonw.exe")
|
|
root.add_file("PCBuild/pythonw.exe")
|
|
|
|
# msidbComponentAttributesSharedDllRefCount = 8, see "Component Table"
|
|
dlldir = PyDirectory(db, cab, root, srcdir, "DLLDIR", ".")
|
|
pydll = "python%s%s.dll" % (major, minor)
|
|
pydllsrc = srcdir + "/PCBuild/" + pydll
|
|
dlldir.start_component("DLLDIR", flags = 8, keyfile = pydll, uuid = pythondll_uuid)
|
|
installer = msilib.MakeInstaller()
|
|
pyversion = installer.FileVersion(pydllsrc, 0)
|
|
if not snapshot:
|
|
# For releases, the Python DLL has the same version as the
|
|
# installer package.
|
|
assert pyversion.split(".")[:3] == current_version.split(".")
|
|
dlldir.add_file("PCBuild/python%s%s.dll" % (major, minor),
|
|
version=pyversion,
|
|
language=installer.FileVersion(pydllsrc, 1))
|
|
# XXX determine dependencies
|
|
version, lang = extract_msvcr71()
|
|
dlldir.start_component("msvcr71", flags=8, keyfile="msvcr71.dll", uuid=msvcr71_uuid)
|
|
dlldir.add_file("msvcr71.dll", src=os.path.abspath("msvcr71.dll"),
|
|
version=version, language=lang)
|
|
tmpfiles.append("msvcr71.dll")
|
|
|
|
# Add all .py files in Lib, except lib-tk, test
|
|
dirs={}
|
|
pydirs = [(root,"Lib")]
|
|
while pydirs:
|
|
parent, dir = pydirs.pop()
|
|
if dir == ".svn" or dir.startswith("plat-"):
|
|
continue
|
|
elif dir in ["lib-tk", "idlelib", "Icons"]:
|
|
if not have_tcl:
|
|
continue
|
|
tcltk.set_current()
|
|
elif dir in ['test', 'tests', 'data', 'output']:
|
|
# test: Lib, Lib/email, Lib/bsddb, Lib/ctypes, Lib/sqlite3
|
|
# tests: Lib/distutils
|
|
# data: Lib/email/test
|
|
# output: Lib/test
|
|
testsuite.set_current()
|
|
else:
|
|
default_feature.set_current()
|
|
lib = PyDirectory(db, cab, parent, dir, dir, "%s|%s" % (parent.make_short(dir), dir))
|
|
# Add additional files
|
|
dirs[dir]=lib
|
|
lib.glob("*.txt")
|
|
if dir=='site-packages':
|
|
lib.add_file("README.txt", src="README")
|
|
continue
|
|
files = lib.glob("*.py")
|
|
files += lib.glob("*.pyw")
|
|
if files:
|
|
# Add an entry to the RemoveFile table to remove bytecode files.
|
|
lib.remove_pyc()
|
|
if dir.endswith('.egg-info'):
|
|
lib.add_file('entry_points.txt')
|
|
lib.add_file('PKG-INFO')
|
|
lib.add_file('top_level.txt')
|
|
lib.add_file('zip-safe')
|
|
continue
|
|
if dir=='test' and parent.physical=='Lib':
|
|
lib.add_file("185test.db")
|
|
lib.add_file("audiotest.au")
|
|
lib.add_file("cfgparser.1")
|
|
lib.add_file("test.xml")
|
|
lib.add_file("test.xml.out")
|
|
lib.add_file("testtar.tar")
|
|
lib.add_file("test_difflib_expect.html")
|
|
lib.add_file("check_soundcard.vbs")
|
|
lib.add_file("empty.vbs")
|
|
lib.glob("*.uue")
|
|
lib.add_file("readme.txt", src="README")
|
|
if dir=='decimaltestdata':
|
|
lib.glob("*.decTest")
|
|
if dir=='output':
|
|
lib.glob("test_*")
|
|
if dir=='idlelib':
|
|
lib.glob("*.def")
|
|
lib.add_file("idle.bat")
|
|
if dir=="Icons":
|
|
lib.glob("*.gif")
|
|
lib.add_file("idle.icns")
|
|
if dir=="command" and parent.physical=="distutils":
|
|
lib.add_file("wininst-6.exe")
|
|
lib.add_file("wininst-7.1.exe")
|
|
if dir=="setuptools":
|
|
lib.add_file("cli.exe")
|
|
lib.add_file("gui.exe")
|
|
if dir=="data" and parent.physical=="test" and parent.basedir.physical=="email":
|
|
# This should contain all non-.svn files listed in subversion
|
|
for f in os.listdir(lib.absolute):
|
|
if f.endswith(".txt") or f==".svn":continue
|
|
if f.endswith(".au") or f.endswith(".gif"):
|
|
lib.add_file(f)
|
|
else:
|
|
print "WARNING: New file %s in email/test/data" % f
|
|
for f in os.listdir(lib.absolute):
|
|
if os.path.isdir(os.path.join(lib.absolute, f)):
|
|
pydirs.append((lib, f))
|
|
# Add DLLs
|
|
default_feature.set_current()
|
|
lib = PyDirectory(db, cab, root, srcdir+"/PCBuild", "DLLs", "DLLS|DLLs")
|
|
lib.add_file("py.ico", src="../PC/py.ico")
|
|
lib.add_file("pyc.ico", src="../PC/pyc.ico")
|
|
dlls = []
|
|
tclfiles = []
|
|
for f in extensions:
|
|
if f=="_tkinter.pyd":
|
|
continue
|
|
if not os.path.exists(srcdir+"/PCBuild/"+f):
|
|
print "WARNING: Missing extension", f
|
|
continue
|
|
dlls.append(f)
|
|
lib.add_file(f)
|
|
# Add sqlite
|
|
if msilib.msi_type=="Intel64;1033":
|
|
sqlite_arch = "/ia64"
|
|
elif msilib.msi_type=="x64;1033":
|
|
sqlite_arch = "/amd64"
|
|
else:
|
|
sqlite_arch = ""
|
|
lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll")
|
|
if have_tcl:
|
|
if not os.path.exists(srcdir+"/PCBuild/_tkinter.pyd"):
|
|
print "WARNING: Missing _tkinter.pyd"
|
|
else:
|
|
lib.start_component("TkDLLs", tcltk)
|
|
lib.add_file("_tkinter.pyd")
|
|
dlls.append("_tkinter.pyd")
|
|
tcldir = os.path.normpath(srcdir+"/../tcltk/bin")
|
|
for f in glob.glob1(tcldir, "*.dll"):
|
|
lib.add_file(f, src=os.path.join(tcldir, f))
|
|
# check whether there are any unknown extensions
|
|
for f in glob.glob1(srcdir+"/PCBuild", "*.pyd"):
|
|
if f.endswith("_d.pyd"): continue # debug version
|
|
if f in dlls: continue
|
|
print "WARNING: Unknown extension", f
|
|
|
|
# Add headers
|
|
default_feature.set_current()
|
|
lib = PyDirectory(db, cab, root, "include", "include", "INCLUDE|include")
|
|
lib.glob("*.h")
|
|
lib.add_file("pyconfig.h", src="../PC/pyconfig.h")
|
|
# Add import libraries
|
|
lib = PyDirectory(db, cab, root, "PCBuild", "libs", "LIBS|libs")
|
|
for f in dlls:
|
|
lib.add_file(f.replace('pyd','lib'))
|
|
lib.add_file('python%s%s.lib' % (major, minor))
|
|
# Add the mingw-format library
|
|
if have_mingw:
|
|
lib.add_file('libpython%s%s.a' % (major, minor))
|
|
if have_tcl:
|
|
# Add Tcl/Tk
|
|
tcldirs = [(root, '../tcltk/lib', 'tcl')]
|
|
tcltk.set_current()
|
|
while tcldirs:
|
|
parent, phys, dir = tcldirs.pop()
|
|
lib = PyDirectory(db, cab, parent, phys, dir, "%s|%s" % (parent.make_short(dir), dir))
|
|
if not os.path.exists(lib.absolute):
|
|
continue
|
|
for f in os.listdir(lib.absolute):
|
|
if os.path.isdir(os.path.join(lib.absolute, f)):
|
|
tcldirs.append((lib, f, f))
|
|
else:
|
|
lib.add_file(f)
|
|
# Add tools
|
|
tools.set_current()
|
|
tooldir = PyDirectory(db, cab, root, "Tools", "Tools", "TOOLS|Tools")
|
|
for f in ['i18n', 'pynche', 'Scripts', 'versioncheck', 'webchecker']:
|
|
lib = PyDirectory(db, cab, tooldir, f, f, "%s|%s" % (tooldir.make_short(f), f))
|
|
lib.glob("*.py")
|
|
lib.glob("*.pyw", exclude=['pydocgui.pyw'])
|
|
lib.remove_pyc()
|
|
lib.glob("*.txt")
|
|
if f == "pynche":
|
|
x = PyDirectory(db, cab, lib, "X", "X", "X|X")
|
|
x.glob("*.txt")
|
|
if os.path.exists(os.path.join(lib.absolute, "README")):
|
|
lib.add_file("README.txt", src="README")
|
|
if f == 'Scripts':
|
|
if have_tcl:
|
|
lib.start_component("pydocgui.pyw", tcltk, keyfile="pydocgui.pyw")
|
|
lib.add_file("pydocgui.pyw")
|
|
# Add documentation
|
|
htmlfiles.set_current()
|
|
lib = PyDirectory(db, cab, root, "Doc", "Doc", "DOC|Doc")
|
|
lib.start_component("documentation", keyfile="Python%s%s.chm" % (major,minor))
|
|
lib.add_file("Python%s%s.chm" % (major, minor))
|
|
|
|
cab.commit(db)
|
|
|
|
for f in tmpfiles:
|
|
os.unlink(f)
|
|
|
|
# See "Registry Table", "Component Table"
|
|
def add_registry(db):
|
|
# File extensions, associated with the REGISTRY.def component
|
|
# IDLE verbs depend on the tcltk feature.
|
|
# msidbComponentAttributesRegistryKeyPath = 4
|
|
# -1 for Root specifies "dependent on ALLUSERS property"
|
|
tcldata = []
|
|
if have_tcl:
|
|
tcldata = [
|
|
("REGISTRY.tcl", msilib.gen_uuid(), "TARGETDIR", 4, None,
|
|
"py.IDLE")]
|
|
add_data(db, "Component",
|
|
# msidbComponentAttributesRegistryKeyPath = 4
|
|
[("REGISTRY", msilib.gen_uuid(), "TARGETDIR", 4, None,
|
|
"InstallPath"),
|
|
("REGISTRY.doc", msilib.gen_uuid(), "TARGETDIR", 4, None,
|
|
"Documentation"),
|
|
("REGISTRY.def", msilib.gen_uuid(), "TARGETDIR", 4,
|
|
None, None)] + tcldata)
|
|
# See "FeatureComponents Table".
|
|
# The association between TclTk and pythonw.exe is necessary to make ICE59
|
|
# happy, because the installer otherwise believes that the IDLE and PyDoc
|
|
# shortcuts might get installed without pythonw.exe being install. This
|
|
# is not true, since installing TclTk will install the default feature, which
|
|
# will cause pythonw.exe to be installed.
|
|
# REGISTRY.tcl is not associated with any feature, as it will be requested
|
|
# through a custom action
|
|
tcldata = []
|
|
if have_tcl:
|
|
tcldata = [(tcltk.id, "pythonw.exe")]
|
|
add_data(db, "FeatureComponents",
|
|
[(default_feature.id, "REGISTRY"),
|
|
(htmlfiles.id, "REGISTRY.doc"),
|
|
(ext_feature.id, "REGISTRY.def")] +
|
|
tcldata
|
|
)
|
|
# Extensions are not advertised. For advertised extensions,
|
|
# we would need separate binaries that install along with the
|
|
# extension.
|
|
pat = r"Software\Classes\%sPython.%sFile\shell\%s\command"
|
|
ewi = "Edit with IDLE"
|
|
pat2 = r"Software\Classes\%sPython.%sFile\DefaultIcon"
|
|
pat3 = r"Software\Classes\%sPython.%sFile"
|
|
tcl_verbs = []
|
|
if have_tcl:
|
|
tcl_verbs=[
|
|
("py.IDLE", -1, pat % (testprefix, "", ewi), "",
|
|
r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"',
|
|
"REGISTRY.tcl"),
|
|
("pyw.IDLE", -1, pat % (testprefix, "NoCon", ewi), "",
|
|
r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"',
|
|
"REGISTRY.tcl"),
|
|
]
|
|
add_data(db, "Registry",
|
|
[# Extensions
|
|
("py.ext", -1, r"Software\Classes\."+ext, "",
|
|
"Python.File", "REGISTRY.def"),
|
|
("pyw.ext", -1, r"Software\Classes\."+ext+'w', "",
|
|
"Python.NoConFile", "REGISTRY.def"),
|
|
("pyc.ext", -1, r"Software\Classes\."+ext+'c', "",
|
|
"Python.CompiledFile", "REGISTRY.def"),
|
|
("pyo.ext", -1, r"Software\Classes\."+ext+'o', "",
|
|
"Python.CompiledFile", "REGISTRY.def"),
|
|
# MIME types
|
|
("py.mime", -1, r"Software\Classes\."+ext, "Content Type",
|
|
"text/plain", "REGISTRY.def"),
|
|
("pyw.mime", -1, r"Software\Classes\."+ext+'w', "Content Type",
|
|
"text/plain", "REGISTRY.def"),
|
|
#Verbs
|
|
("py.open", -1, pat % (testprefix, "", "open"), "",
|
|
r'"[TARGETDIR]python.exe" "%1" %*', "REGISTRY.def"),
|
|
("pyw.open", -1, pat % (testprefix, "NoCon", "open"), "",
|
|
r'"[TARGETDIR]pythonw.exe" "%1" %*', "REGISTRY.def"),
|
|
("pyc.open", -1, pat % (testprefix, "Compiled", "open"), "",
|
|
r'"[TARGETDIR]python.exe" "%1" %*', "REGISTRY.def"),
|
|
] + tcl_verbs + [
|
|
#Icons
|
|
("py.icon", -1, pat2 % (testprefix, ""), "",
|
|
r'[DLLs]py.ico', "REGISTRY.def"),
|
|
("pyw.icon", -1, pat2 % (testprefix, "NoCon"), "",
|
|
r'[DLLs]py.ico', "REGISTRY.def"),
|
|
("pyc.icon", -1, pat2 % (testprefix, "Compiled"), "",
|
|
r'[DLLs]pyc.ico', "REGISTRY.def"),
|
|
# Descriptions
|
|
("py.txt", -1, pat3 % (testprefix, ""), "",
|
|
"Python File", "REGISTRY.def"),
|
|
("pyw.txt", -1, pat3 % (testprefix, "NoCon"), "",
|
|
"Python File (no console)", "REGISTRY.def"),
|
|
("pyc.txt", -1, pat3 % (testprefix, "Compiled"), "",
|
|
"Compiled Python File", "REGISTRY.def"),
|
|
])
|
|
|
|
# Registry keys
|
|
prefix = r"Software\%sPython\PythonCore\%s" % (testprefix, short_version)
|
|
add_data(db, "Registry",
|
|
[("InstallPath", -1, prefix+r"\InstallPath", "", "[TARGETDIR]", "REGISTRY"),
|
|
("InstallGroup", -1, prefix+r"\InstallPath\InstallGroup", "",
|
|
"Python %s" % short_version, "REGISTRY"),
|
|
("PythonPath", -1, prefix+r"\PythonPath", "",
|
|
r"[TARGETDIR]Lib;[TARGETDIR]DLLs;[TARGETDIR]Lib\lib-tk", "REGISTRY"),
|
|
("Documentation", -1, prefix+r"\Help\Main Python Documentation", "",
|
|
r"[TARGETDIR]Doc\Python%s%s.chm" % (major, minor), "REGISTRY.doc"),
|
|
("Modules", -1, prefix+r"\Modules", "+", None, "REGISTRY"),
|
|
("AppPaths", -1, r"Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe",
|
|
"", r"[TARGETDIR]Python.exe", "REGISTRY.def")
|
|
])
|
|
# Shortcuts, see "Shortcut Table"
|
|
add_data(db, "Directory",
|
|
[("ProgramMenuFolder", "TARGETDIR", "."),
|
|
("MenuDir", "ProgramMenuFolder", "PY%s%s|%sPython %s.%s" % (major,minor,testprefix,major,minor))])
|
|
add_data(db, "RemoveFile",
|
|
[("MenuDir", "TARGETDIR", None, "MenuDir", 2)])
|
|
tcltkshortcuts = []
|
|
if have_tcl:
|
|
tcltkshortcuts = [
|
|
("IDLE", "MenuDir", "IDLE|IDLE (Python GUI)", "pythonw.exe",
|
|
tcltk.id, r'"[TARGETDIR]Lib\idlelib\idle.pyw"', None, None, "python_icon.exe", 0, None, "TARGETDIR"),
|
|
("PyDoc", "MenuDir", "MODDOCS|Module Docs", "pythonw.exe",
|
|
tcltk.id, r'"[TARGETDIR]Tools\scripts\pydocgui.pyw"', None, None, "python_icon.exe", 0, None, "TARGETDIR"),
|
|
]
|
|
add_data(db, "Shortcut",
|
|
tcltkshortcuts +
|
|
[# Advertised shortcuts: targets are features, not files
|
|
("Python", "MenuDir", "PYTHON|Python (command line)", "python.exe",
|
|
default_feature.id, None, None, None, "python_icon.exe", 2, None, "TARGETDIR"),
|
|
# Advertising the Manual breaks on (some?) Win98, and the shortcut lacks an
|
|
# icon first.
|
|
#("Manual", "MenuDir", "MANUAL|Python Manuals", "documentation",
|
|
# htmlfiles.id, None, None, None, None, None, None, None),
|
|
## Non-advertised shortcuts: must be associated with a registry component
|
|
("Manual", "MenuDir", "MANUAL|Python Manuals", "REGISTRY.doc",
|
|
"[#Python%s%s.chm]" % (major,minor), None,
|
|
None, None, None, None, None, None),
|
|
("Uninstall", "MenuDir", "UNINST|Uninstall Python", "REGISTRY",
|
|
SystemFolderName+"msiexec", "/x%s" % product_code,
|
|
None, None, None, None, None, None),
|
|
])
|
|
db.Commit()
|
|
|
|
db = build_database()
|
|
try:
|
|
add_features(db)
|
|
add_ui(db)
|
|
add_files(db)
|
|
add_registry(db)
|
|
remove_old_versions(db)
|
|
db.Commit()
|
|
finally:
|
|
del db
|