Commit Graph

547 Commits

Author SHA1 Message Date
Thomas Heller 9f2e3be4e8 Running a bdist_wininst installer, built with Python 2.3, installing
for Python 2.4 caused a segfault when post_install_script was used.

The reason was that the file handle passed to PyRun_SimpleFile() was
created with MSVCRT.DLL, but Python 2.4 uses MSVCR71.DLL.

So, I replaced PyRun_SimpleFile() with PyRun_SimpleString().  The
segfault is gone, but the output of the postinstall script doesn't
show up, because still freopen() from MSVCRT is used.

Already backported.
2005-02-03 20:35:10 +00:00
Thomas Heller 8abe7bfb2f Set PYTHONHOME before loading Python, so that sys.path will be set correctly.
Already backported.
2005-02-03 20:11:28 +00:00
Andrew MacIntyre ff59f3c416 make thread stack size compile-time tunable on OS/2, increase main stack 2005-01-17 12:18:12 +00:00
Thomas Heller 54266fce8d cvsignore files generated by make_versioninfo. 2004-12-31 16:37:32 +00:00
Martin v. Löwis a2cc2695bb Update example to VC 7.1. Will backport to 2.4. 2004-12-29 14:15:58 +00:00
Thomas Heller 0f25b72228 Close stdout and stderr, which are redirected into a temp file, before
trying to remove this file - the file was never removed before.

Fixes [ 1067732 ] wininst --install-script leaves residual files

Already backported.
2004-12-22 17:24:14 +00:00
Andrew MacIntyre d0278ec97f OS/2 specific fixes related to SF bug # 1003471 2004-12-12 08:28:11 +00:00
Raymond Hettinger de7b99045d Update the MSC6 pythoncore projects to compile for Py2.5 2004-12-02 08:53:14 +00:00
Thomas Heller 8992b9bdf5 printf format code for integers is %d not %s.
Will backport.
2004-12-01 19:43:02 +00:00
Thomas Heller 6ad6ee6411 Update import library name on windows. 2004-12-01 19:39:52 +00:00
Thomas Heller 9cc5cb7c4b Running the pre-install or post-install script did not work when
Python was installed with the 'only for me' option. The registry key
had a hardcoded '2.3' in it where the python version chosen for
installation should be used instead.

Will backport myself.
2004-12-01 18:18:08 +00:00
Peter Astrand c1d6536d60 When using shell=True on Windows, don't display a shell window by default. Fixes #1057061. 2004-11-07 14:30:34 +00:00
Martin v. Löwis 919637afb0 Add _subprocess.c 2004-10-15 04:27:51 +00:00
Martin v. Löwis 15b23a083d Patch #1020042: Only define HAVE_UINTPTR_T for VC 7.x. 2004-10-15 04:26:18 +00:00
Tim Peters 4eb59782a8 Supply the _subprocess module under 7.1. I'm not sure what the status
of this should be on non-WIN32 Windows variants.
2004-10-12 21:48:57 +00:00
Tim Peters f3250b0b0b Before this turns into an unreadable mess, follow PEP 7 by using
hard tab indents in C code.
2004-10-12 21:38:22 +00:00
Fredrik Lundh 5b3687df2e Added Peter Astrand's subprocess module. 2004-10-12 15:26:28 +00:00
Tim Peters 7f468f29f4 SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick
Coghlan, for determining whether PyEval_InitThreads() has been called.
Also purged the undocumented+unused _PyThread_Started int.
2004-10-11 02:40:51 +00:00
Andrew MacIntyre fec1ce0b72 remove rotor module 2004-10-03 08:29:55 +00:00
Andrew MacIntyre 3dac89edaf note module removals, update on BitTorrent issue 2004-10-03 08:26:36 +00:00
Andrew MacIntyre 96b3725ca0 bring modules up to date, correct .DEF file version 2004-10-03 08:11:30 +00:00
Tim Peters 862f0593d8 Introduced a Py_IS_NAN macro, which probably works on the major platforms
today.  pyconfig.h can override it if not, and can also override
Py_IS_INFINITY now.  Py_IS_NAN and Py_IS_INFINITY are overridden now
for Microsoft compilers, using efficient MS-specific spellings.
2004-09-23 19:11:32 +00:00
Martin v. Löwis 5a6653cee1 Revert creation of launcher.exe 2004-09-08 15:57:36 +00:00
Martin v. Löwis 97329754f8 Add support for launcher.exe 2004-09-07 15:40:12 +00:00
Martin v. Löwis ab9351bf36 Add main program for icon file. 2004-09-03 13:32:57 +00:00
Raymond Hettinger 53e50cb6b3 Remove rotor from the build. 2004-08-31 19:33:47 +00:00
Raymond Hettinger 6ce6ef3e78 Remove rotor and xreadlines from VC 6 build. 2004-08-31 18:54:35 +00:00
Martin v. Löwis 7bbed946ea Fix installdir for Tix 2004-08-31 16:19:01 +00:00
Tim Peters adadc0f56f Remove rotor and xreadlines from VC 7.1 build. 2004-08-31 14:29:12 +00:00
Martin v. Löwis 89a0b7d93a Add patch for Tix 8.1.4. 2004-08-31 06:43:28 +00:00
Martin v. Löwis 08d786a608 Help compiling icons into an exe, for use with MSI advertisement. 2004-08-13 15:26:40 +00:00
Tim Peters 8484fbf0f6 SF bug 1003471: Python 1.5.2 security vulnerability
This was probably fixed in rev 1.32 of getpath.c, but there are so
many paths thru the code that invoke joinpath() it's not at all
obvious that it *is* fixed.  It doesn't help confidence that a crucial
precondition for calling joinpath() was neither documented nor verified.
It is now, and joinpath() will barf with a fatal error now rather than
overrun the buffer, if the precondition isn't met.

Note that this patch only changes the Windows flavor.  I attached another
patch to the bug report for the POSIX flavor (which I can't test
conveniently).
2004-08-07 19:12:27 +00:00
Raymond Hettinger cbcff93d49 Restore compilation on MSVC++ 6.0 2004-08-03 08:52:46 +00:00
Thomas Heller a18331de4e Use PyMODINIT_FUNC. 2004-07-28 20:02:52 +00:00
Hye-Shik Chang efdc16ffbb Remove unused source file from Windows project files. 2004-07-28 09:45:20 +00:00
Hye-Shik Chang 978d26256b Add missing _codecs_iso2022 module of cjkcodecs. I'll add unittest
for it soon.
2004-07-28 09:39:54 +00:00
Martin v. Löwis fe393f47c6 Use intptr_t/uintptr_t on Windows 2004-07-27 15:57:24 +00:00
Martin v. Löwis 512efb464b Properly check for Win64 compilers. 2004-07-27 14:16:14 +00:00
Thomas Heller 876d990ae0 The binary layout of cfgdata has changed, so the magic number has to
change as well.
Display an additional message box when a mismatch is detected.
2004-07-19 09:57:58 +00:00
Hye-Shik Chang 07e5dc8813 Teach VC6 project file about the new cjkcodecs structure. 2004-07-18 15:36:31 +00:00
Tim Peters 3d7d372ce3 Whitespace normalization, via reindent.py. 2004-07-18 06:25:50 +00:00
Tim Peters 6920e49e7e Woo hoo! All the encoding tests pass on Windows (& I downloaded the
14 input files needed to run all of them).
2004-07-18 05:06:31 +00:00
Tim Peters cc8f997543 More cjkcodecs recovery: Python at least compiles on Window again. 2004-07-18 04:30:37 +00:00
Thomas Heller 0062be26d8 Ignore some more build products. 2004-07-14 15:19:45 +00:00
Thomas Heller d1d92ea59a Add a warning so that it isn't forgotten to recreate the binaries AND
CHECK INTO CVS if these files are changed.
2004-07-14 15:17:04 +00:00
Thomas Heller 55a9864cb4 Don't complain that non-existant registry entries cannot be deleted. 2004-07-14 14:53:50 +00:00
Andrew MacIntyre 378d3c0e51 bring OS/2 EMX port build environment up to date 2004-07-07 13:55:25 +00:00
Thomas Heller ad6ce46f49 Remove the annoing and useless messagebox asking about overwriting files.
Fixes SF #984290.
2004-07-07 07:34:40 +00:00
Mark Hammond f9bfdd850c Patch [ 983775 ] Allow bdist_wininst to install for non-admin users
to address bugs:
[ 555812 ] installing extension w/o admin rights
[ 555810 ] removing extensions without admin rights

* When enumerating the Python versions found, also remember the HKEY
  they were found under.
* When installing, if Python was installed under HKCU, we will too.
  If Python was installed under HKLM, we check the permissions of
  the current user, and install where we can.
* The "root" key we use is a global variable - all registry setting and
  delete functions use this global rather than a hardcoded HKLM.
* A new entry is written to the install log, indicating the key we used.
  Uninstallation is based on this key.
* 'tempnam()' is used rather than 'tmpnam()' - 'tmpnam' creates a temp
  file on the root of the current drive, and if this is readonly would
  explain the 'freopen' errors occasionally reported. 'tempnam'
  creates the temp file in the %TEMP% directory.
2004-07-02 23:53:16 +00:00
Thomas Heller 32b8f8052a Fix for SF 982215: bdist_wininst - Next button not greyed out during file copy.
Patch from Mark Hammond.
Recompiled binary.

Already packported to the 2.3 branch.
2004-07-02 08:02:40 +00:00
Thomas Heller 74db40419e The wininst.exe is no longer compressed with UPX. 2004-06-18 18:29:46 +00:00
Thomas Heller 48340390ac When loading the Python dll to run the postinstall script, try to load
it from the install directory (as reported by the registry) in case it
is not found on the default Loadlibrary search path.

Fixes SF 935091: bdist_winist post-install script fails on non-admin Python

Already backported.
2004-06-18 17:03:38 +00:00
Tim Peters 2242fe84f9 Teach MSVC 6 about pystrtod.c. 2004-06-08 20:32:58 +00:00
Thomas Heller 9f5f056d75 Remove the pcre module. 2004-06-02 18:58:55 +00:00
Raymond Hettinger 19a02ece02 Add genobject.c to the MSVC++ 6.0 build. 2004-06-01 16:29:57 +00:00
Raymond Hettinger 97b6484dc4 Update the DLL example to work with Py2.4. 2004-05-15 07:39:00 +00:00
Tim Peters 07ce3b704b Changed company name to PSF. Added 2004 to copyright years. 2004-05-11 18:14:05 +00:00
Raymond Hettinger e898d1987e Complete perky's name change patch. 2004-04-27 04:52:47 +00:00
Thomas Heller 602472215b Remove the Modules/heaqmodule.c, and add Modules/_heapmodule.c, so
that the project compiles again with VC6.
2004-04-22 18:30:17 +00:00
Raymond Hettinger c46cb2a1a9 * Restore the pure python version of heapq.py.
* Mark the C version as private and only use when available.
2004-04-19 19:06:21 +00:00
Thomas Heller b4fb86243e The wininst-6.exe template binary for bdist_wininst is now linked
with zlib-1.2.1.
2004-04-16 18:49:35 +00:00
Thomas Heller 89adf0a601 The wininst-7.1.exe template binary for bdist_wininst is now linked
with zlib-1.2.1.

UPX needs the --force flag to be able to compress it.
2004-04-16 18:47:50 +00:00
Thomas Heller 9614219140 Minor reformatting. 2004-04-15 18:19:02 +00:00
Andrew MacIntyre b88820058f add AF_UNIX notes 2004-04-11 12:05:28 +00:00
Andrew MacIntyre da4d6cb573 OS/2 VACPP build updates/fixes 2004-03-29 11:53:38 +00:00
Tim Peters bd6850f6cb Ignore oodles of MSVC-generated files. 2004-03-20 05:00:56 +00:00
Tim Peters 4ae4f2658b A helper for rt.bat, copied (but with path adjustment) from PCbuild. 2004-03-20 04:57:32 +00:00
Thomas Heller 6837f6591b Solution and project file to build wininstXX.exe with MSVC7.1 (Visual
Studio .NET 2003).

The output files are named wininst-7.1.exe and wininst-7.1_d.exe.
2004-02-20 18:23:47 +00:00
Thomas Heller cad71d0a4a To avoid problems with conflicting dlls, the windows installers built
by bdist_wininst *must* use the same runtime libary as the Python
version.

Actually this means the Python version where the installer is run, not
the one which is used to build it.  Must think about that - for now I
assume MSVC6 is used up to Python 2.3, and MSVC7.1 is used starting at
Python 2.4.

So the filename for wininst.exe is now wininst-6.exe for the Release
version and wininst-6_d.exe for the Debug version, when built with
MSVC6.
2004-02-20 18:05:13 +00:00
Thomas Heller a19cdad6dc Patch #892660 from Mark Hammond, for distutils bdist_wininst command.
install.c: support for a 'pre-install-script', run before anything has
been installed. Provides a 'message_box' module function for use by
either the pre-install or post-install scripts.

bdist_wininst.py: support for pre-install script. Typo (build->built),
fixes so that --target-version can still work, even when the
distribution has extension modules - in this case, we insist on
--skip-build, as we still can't actually build other versions.
2004-02-20 14:43:21 +00:00
Skip Montanaro 7befb9966e remove support for missing ANSI C header files (limits.h, stddef.h, etc). 2004-02-10 16:50:21 +00:00
Skip Montanaro db6080507d Remove support for --without-universal-newlines (see PEP 11). 2004-02-07 13:53:46 +00:00
Skip Montanaro 7e11a016e6 Remove HAVE_STRPTIME - no longer necessary with the pure Python version of
time.strptime().
2004-02-07 12:55:46 +00:00
Raymond Hettinger 756b3f3c15 * Move collections.deque() in from the sandbox
* Add unittests, newsitem, and whatsnew
* Apply to Queue.py mutex.py threading.py pydoc.py and shlex.py
* Docs are forthcoming
2004-01-29 06:37:52 +00:00
Tim Peters a70e6d8e2a Added the cjkcodecs files to the MSVC 6 build. 2004-01-25 03:25:40 +00:00
Martin v. Löwis daea3e5032 Add cjkcodecs to build process 2004-01-21 07:54:02 +00:00
Skip Montanaro ce59c04127 Remove support for SunOS 4.
Remove BAD_EXEC_PROTOYPE (leftover from IRIX 4 demolition).
2004-01-17 14:19:44 +00:00
Skip Montanaro b9949dbe6c Remove support for DYNIX, IRIX 4, --with-sgi-dl, --with-dl-dld 2004-01-17 04:04:13 +00:00
Skip Montanaro b9820a3b77 Remove support for minix.
Remove unused and unnecessary checks for sizeof(char).
2004-01-17 00:16:12 +00:00
Raymond Hettinger 0c4102760c SF Patch #864863: Bisect C implementation
(Contributed by Dmitry Vasiliev.)
2004-01-05 10:13:35 +00:00
Tim Peters 71745802ec Update to record .pyd files removed for Python 2.4. 2004-01-04 03:00:51 +00:00
Tim Peters 12cfa6d662 That's it -- works as well under VC6 as it ever did now. 2004-01-04 02:51:36 +00:00
Tim Peters 055844ea80 The _tkinter subproject works with VC6 again. 2004-01-04 02:32:53 +00:00
Tim Peters 590de2c20c The bz2 subproject works with VC6 again. 2004-01-04 02:30:49 +00:00
Tim Peters f32b0271a9 The _ssl subproject may <heh> be working w/ VC6 again. 2004-01-04 02:27:33 +00:00
Tim Peters c844a03edf The _bsddb subproject works again under VC6. 2004-01-04 02:12:55 +00:00
Tim Peters caba60a752 Removed dead text about MS subprojects that no longer exist. 2004-01-04 02:04:35 +00:00
Tim Peters 28df74fc62 Getting closer (but not yet there) to being able to compile under VC6
again.  Removed the following subprojects and folded them into pythoncore,
to match what's being done under VC7.  We *can* build the core DLL
under VC6 again after this:

datetime.dsp
winreg.dsp
parser.dsp
_sre.dsp
_csv.dsp
mmap.dsp
_symtable.dsp
2004-01-04 02:00:47 +00:00
Tim Peters ff8505dc89 Tons of changes to get this closer to being buildable from this directory;
still far away, but a lot closer than it was.
2004-01-03 05:45:59 +00:00
Martin v. Löwis 203eec46c1 Move VC6 project files here. 2004-01-02 21:15:07 +00:00
Martin v. Löwis 48918f7109 Update build procedure to VC 7.1; make more modules builtin. 2004-01-02 21:14:37 +00:00
Andrew MacIntyre 4d04639380 add definitions required for expat 1.95.7 2003-12-25 13:25:20 +00:00
Andrew MacIntyre c2138af413 - add notes about os.link() emulation;
- various minor cleanups and updates.
2003-12-02 12:23:07 +00:00
Andrew MacIntyre 51578ae43d - add build support for curses extension to be a normal DLL as well as
a Python extension, so that the curses_panel extension works.
- minor compiler switch tweak.
2003-12-02 12:21:20 +00:00
Guido van Rossum a6a38ad55c Remove all uses of alloca() from this module. The alloca() return value
isn't checked, and it *is* possible that a very large alloca() call is
made, e.g. when a large registry value is being read.  I don't know if
alloca() in that case returns NULL or returns a pointer pointing outside
the stack, and I don't want to know -- I've simply replaced all calls to
alloca() with either PyMem_Malloc() or PyString_FromStringAndSize(NULL,)
as appropriate, followed by a size check.  This addresses SF buf 851056.
Will backport to 2.3 next.
2003-11-30 22:01:43 +00:00
Raymond Hettinger b3af1813eb Convert heapq.py to a C implementation. 2003-11-08 10:24:38 +00:00
Walter Dörwald f0dfc7ac5c Fix a bunch of typos in documentation, docstrings and comments.
(From SF patch #810751)
2003-10-20 14:01:56 +00:00
Thomas Heller 13dbabe46e To build on windows, the manual editing of the python_nt.rc file to
change the version number is no longer required.

Instead, a make_versioninfo.exe is compiled, which spits out an
include file for python_nt.rc.

Will backport to 2.3
2003-10-10 16:57:45 +00:00
Thomas Heller 6019f9a65d Remove a stray single quote.
Will backport to release23-maint.
2003-08-18 17:53:33 +00:00
Mark Hammond 67e5582dfc Complete move of windows builds to 2.4alpha 2003-07-31 02:06:22 +00:00