Commit Graph

206 Commits

Author SHA1 Message Date
Tim Peters ae5262ef32 + Turn off patch creation (this isn't a patch release! got turned on by
mistake).
+ Arrange for Win2K Add/Remove to show a Python icon.

I think this "does it" -- a full install/uninstall can now be done on a
Win2K box from an ordinary (not Admin, not Power User) user acct, incl.
file extension registration, Start Menu entries, and full Add/Remove.
2001-08-06 20:01:19 +00:00
Tim Peters 223ec936f1 + Made installer more reluctant to overwrite MS C runtime DLLs -- it's
been overwriting them even if they have the same version, not just if
  they're an older version (and our installers have always done this).
+ Added an "Advanced Options" subdialog to "Select Components".  Allows
  to do a non-admin install even if you have Administrator rights, and
  to skip registering file extensions and/or creating Start Menu
  shortcuts.  Since so far these installers have been tested only by me,
  and Win2K has been full of surprises, I want those options available
  out in the field.
Lots of web searching turned up what should have been obvious:  Because
Windows Installer is a native Win2K service, it can run at a higher
privilege level than the user invoking it.  So MSI installs don't bash
into these permission gotchas on Win2K, but Wise 8.1 does (it's just
another app to Win2K, and we're not alone in wrestling with this; but,
like changing int division in Python, Win2K is doing a right thing <wink>).
2001-08-05 13:58:48 +00:00
Tim Peters 45e5e72eb8 Rename pydoc.pyw to pydocgui.pyw: Since we changed Python to allow .pyw
files to satisfy imports, pydoc.pyw was just importing itself!
2001-08-05 05:43:20 +00:00
Tim Peters b39fa0e0fa + Redid file associations on Win2K in what I believe is "the right way".
Can't test it until getting to a Win2K box, because the non-Admin way
  of setting file associations on Win2K doesn't work on any other flavor
  of Windows (and other flavors of Windows never need Admin privs to
  do it the old way).
+ Consequently got rid of the "Register file associations" Component and
  associated GUI.
+ Added a line to the summary saying whether or not this is an Admin-level
  install (I fear that will be an important clue someday).
+ Minor fiddling to the summary to reduce the # of lines.  Added a
  horizontal scrollbar in case the install path is very long.
+ Reworked the way the Main and Tools components share pydoc.pyw; cleaner
  and simpler.
2001-08-05 05:19:15 +00:00
Tim Peters 67b9adaa87 New runtime vrbl DOADMIN. When false, we never try to write under HKLM,
and install the Python and MS runtime DLLs into the Python dir instead of
a system dir.
Initial value is taken from new compiler vrbl _DOADMIN_ (default true),
and forced to false if the user doesn't have admin privs.
This makes it possible to *test* non-admin installs on machines where the
distinction doesn't exist (like my home box), via just changing _DOADMIN_.
It may also be useful for users who don't *want* an installer to
scribble into their system dir (for example, me(! most days)), but that
would require adding more GUI to let them get at it.
2001-08-05 04:12:30 +00:00
Tim Peters 4de219d511 + Add version info to Win2K add/remove.
+ Fiddle vrbls so Win2K add/remove can display version w/o future manual
  script fiddling.
+ Break apart the mysterious wizard-generated Win2K "Edit 3 Registry Keys"
  script items by hand into 3 separate items, so you can see what the heck
  they're doing in the script view.
+ pydoc.pyw was a problem:  it's installed by both the Main and Tools
  components.  So when both were selected, the second time it got
  installed Wise figured it was overwriting a pre-existing version, and
  made a backup copy in BACKUP.  A rollback-uninstall then restored that,
  leaving the Tools/Scripts/ directory non-empty, and so Wise couldn't
  remove that directory (or any above it).  Fixed by installing pydoc.pyw
  at most once.
+ Rearranged and commented the "register file extensions" section, because
  it was confusing and needs more work:  turns out it's not true that
  Win2K requires Admin privs to register file extensions, BUT, if you
  don't have Admin privs, Win2K requires a new way to register file
  extensions, and a way that doesn't blow up but doesn't do any good either
  on earlier Windows flavors.  I think I know how to get this done, but am
  too depressed to do it right now <0.7 wink>.
2001-08-04 23:23:27 +00:00
Tim Peters a0a7706916 + Moved IDLE from the "tools" component to the main component.
+ Ditto pydoc.
  (IMO, both should have been done long ago -- simply didn't occur to
   me before)
+ Build the summary text into a vrbl instead of a temp file.  Doh!  Less
  fiddling, and should avoid another class of Win2K permission problems.
Bug:  the "auto vertical scrollbar" control on the summary page doesn't
work (never creates a scrollbar, no matter how much text).  So forced a
vertical scrollbar there.
2001-08-03 19:04:13 +00:00
Tim Peters 2aadd36641 No more Inno Envy: the "Start Installation" dialog now displays a nice
summary of the preceding choices.  No idea if this is "the right way" to
do it, but it's exactly painful enough to make me suspect it's the only
way <wink>.
2001-08-03 11:11:35 +00:00
Tim Peters 6d6c1a35e0 Merge of descr-branch back into trunk. 2001-08-02 04:15:00 +00:00
Tim Peters a7f6de7691 Just changes to comments. 2001-08-01 18:42:54 +00:00
Tim Peters 60515573ba Repair more ways in which the "backup files" dialog differed from all the
others (wrong title, inconsistent layout).  Also tried to make the dialog
text clearer, and spelled out what the "yes" and "no" buttons *mean*.
2001-08-01 18:33:33 +00:00
Tim Peters 5a99e0ca0c We always wrote a pair of lines to the Wise install.log telling it to
delete the Tools and Lib directories at uninstall time.  However,
under the old version of Wise, they didn't actually do anything.  Under
the new version, they work as advertised, and even delete files users
added.
Got rid of those, and replaced them with similar uninstall cmds that
get rid of all .pyc and .pyo files (whether or not the installer created
them).  This works nicely!  It still tears down the directory structure,
except for those directories needed to get to any non-.pyc/o file(s) the
user may have added.
2001-08-01 06:29:56 +00:00
Tim Peters b8b3291152 Hmm. The Backup/Replace dialog also had back/next buttons three pixels
narrower than all the other Wise dialogs, and offset by a few pixels in
the vertical direction too.  Made these things consistent across dialogs
too.
2001-08-01 03:42:27 +00:00
Tim Peters bbeb69e357 Aha! Finally figured out something else that's been driving me nuts:
turns out the canned new "backup directory" dialog put its "back" and
"next" buttons at a different relative horizontal position than all the
other canned dialogs.  This explains why you had to keep moving the
mouse around if you wanted to do a straight all-default install -- the
Next button kept moving around.  Now the back/next buttons are in exactly
the same place on all dialogs, and you can click straight thru to the end.
2001-08-01 03:36:20 +00:00
Tim Peters 4951a980ad The "Select Destination Directory" dialog didn't ask for confirmation
about installing into a pre-existing directory *unless* you hit the
Browse button first.  At least while testing, this screwed me repeatedly.
Plus I really liked the Inno Setup scheme of giving you a list box in
its "select directory" dialog without needing a distinct browse button
to ask for that.

So I redid this dialog from scratch:  now gives a list box at once, the
browse button is gone, it asks for confirmation if the directory already
exists, and, since this is the first dialog in the set now, also removed
its "Back" button.
2001-08-01 03:29:59 +00:00
Tim Peters 1f7862ec56 Remove useless Back button from Finished dialog. 2001-08-01 02:36:21 +00:00
Tim Peters aa6111fc93 Add mysnprintf.c to Windows build, + squash compiler wngs in mysnprintf.c. 2001-07-31 22:10:29 +00:00
Tim Peters ce5f13ae41 I hope this irons out the Add/Remove kinks on Win2K for users w/o Admin
privs, but haven't tested that yet.  Doesn't hurt on Win98SE, anyway.
2001-07-31 03:24:55 +00:00
Tim Peters 85a5bae452 Remove oodles of pointless file date and size stamps. I caught the Wise
GUI inserting those once before shortly after I started using it, but
don't know what triggers it -- presumably something in the "expert" view
(which is, suitably enough, unsuited to experts <wink>).
2001-07-30 23:26:41 +00:00
Tim Peters 96e1d2f206 Massive fiddling to get the install to work at all on a Win2K box under a
plain unprivileged User acct:
+ Had to duplicate Wise's Uninstal.wse script, in order to change the line
  at its end that unconditionally tries to write uninstall info under HKLM.
  This is our new file Uninstal.wse, which must be included by python20.wse
  instead of using Wise's version.
+ In every other case we write to HKLM, also write to HKCU instead (we
  were already doing that in *most* places, but not quite all).
+ If the user doesn't have admin privs, the DLLs we usually write to the
  system dir are written to the root of the Python installation instead.
  That's python22.dll, plus the two MSVC runtime DLLs.
+ Added a new component "Register file extensions".  Registering .py etc
  is done under HKEY_CLASSES_ROOT, and that also requires admin privs;
  i.e., AFAICT it's impossible for an unprivileged user to accomplish this.
  In the component selection dialog, if the user doesn't have admin privs
  I gray out this new component so the user knows they aren't getting file
  extensions.
After all that, Python installs, the Start Menu entries are OK, it runs
its test suite to completion, and the uninstaller works too.  Only known
problem so far is that the integration with Win2K's Add/Remove subsystem
isn't quite right yet in this irritating case.
2001-07-30 23:06:21 +00:00
Tim Peters a1fd0505af Add a dialog for the backup directory (default "yes I want one, and
make it MyPythonDirectory\BACKUP\").
2001-07-30 07:30:56 +00:00
Tim Peters 6ea8baa5ee Now stop distutils and xml from getting *too* much (like .pyc files). 2001-07-29 22:12:28 +00:00
Tim Peters 8e02fb15e6 Repair long-standing mistakes in the distutils and xml installations:
1. Only .py files were getting installed.
2. Empty CVS directories were getting created.
Both were due to trying to get away with "recursively copy *.py" one-
liner scripting.
2001-07-29 21:36:58 +00:00
Tim Peters 412e458495 Remove Lib\plat-win from PYTHONPATH; that directory went away a year ago. 2001-07-29 21:04:09 +00:00
Tim Peters d8c7da4bf0 Don't prompt for the doc (HTML) directory anymore (just assume ..\html). 2001-07-29 19:57:07 +00:00
Tim Peters 4670b3a2ee Whew -- I *think* this completes folding in all the new-in-8.1 stuff.
Still need to test it in pathological scenarios.
2001-07-29 19:48:44 +00:00
Tim Peters 4e9a00e3c2 Ewwww -- the 8.1 support for rolling back changes in case the user aborts
the installation was hiding in a part of the GUI I never saw before.  Add
it.
2001-07-29 19:31:03 +00:00
Tim Peters 0097bae32d Add oodles more 8.1 Wizard boilerplate. This creates lots of vrbls we
don't use directly, but the Wise utility scripts we invoke (like
uninstal.wse) sometimes need them.
2001-07-29 19:27:23 +00:00
Tim Peters 386b7a3a68 Add version resource info to installer .exe. 2001-07-29 19:02:52 +00:00
Tim Peters 6307bb8b7d Folding some Wizard boilerplate back in, created in new Wise projects but
not in the stuff we inherited from Wise 5.0 -- better safe than sorry.
2001-07-29 18:55:06 +00:00
Tim Peters e7b2a27d47 Updated to Wise 8.14 (web update).
Got rid of useless "Welcome" screen.
Folded Tcl/Tk into the main Python component.
Bug introduced during upgrade:  Start Menu entries didn't work if
    installation was to a path with an embedded space, because the
    enclosing quotes somehow got dropped on the cmdline args.  Repaired.
Years of wizard-generated code blocks left this script hard to read.
    Added many more comments, blank lines, and rearranged related code
    into related blocks where they had drifted apart.
Added %_PYMAJOR_% and %_PYMINOR_% compiler vrbls, and reworked script
    items to use them as appropriate.  This should slash the amount of
    hand-fiddling needed when version numbers change.  Indeed, in the
    body of the script, only the first line should need changing now.
Deleted unreferenced wizard-generated compiler vrbls.
2001-07-29 09:28:37 +00:00
Tim Peters db642c66a8 Woo hoo! Relative paths! This is, alas, partly braindead: When the new
"relative paths" option is enabled, 8.1 rewrites *every* path to be
relative to PCbuild (the dir containing the .wse script), even absolute
paths you type in by hand, paths to the Wise installation itself, and even
paths to the Windows directories (sheesh).  Only way to stop it is to
start a path with a variable reference, and we screwed ourselves before
by not using the predefined %_WISE_% vrbl to point to the Wise
installation.  Repaired that old, repeated and well-hidden mistake.
Also:
+ Got rid of the %_SRC_% vrbl (such paths always relative to PCBuild now).
+ Changed the %_DOC_% vrbl to prompt for the location of the unzipped
  HTML files (defaults to ..\html, cuz that's where I put them, but I
  expect I'll change that later cuz I always hated mixing the generated
  docs into the CVS tree ... Guido, if you're reading this, where did you
  unpack the docs when building a Windows installer?  Happy to oblige.).
+ Stopped the generated installer from filling up the entire screen (got
  rid of the massive blue background gradient -- new option).
+ Added the helpful app publisher and app URL registry entries that Win2K
  displays in its version of Add/Remove.
2001-07-29 02:04:20 +00:00
Tim Peters 50e278ecfc Convert from Wise version 5.0 to 8.1. Gotta hand it to 'em! 8.1 imported
the old script without any complaints, didn't demand any manual changes,
and built a working installer from it that acts very much like the old one.
It did add a few script items, and changed one, so checking it in now
before I break everything again.
2001-07-29 00:48:54 +00:00
Tim Peters faa7f116f2 Move Windows to Expat 1.95.2. CAUTION: Your Windows build won't work
until you download the new expat and install it; see PCbuild\readme.txt.
2001-07-28 07:56:38 +00:00
Tim Peters 76f373d081 Repair more now-obsolete references to config.h. 2001-07-26 21:34:59 +00:00
Martin v. Löwis 4f1cd8bdcb Patch #411138: Rename config.h to pyconfig.h. Closes bug #231774. 2001-07-26 13:41:06 +00:00
Tim Peters b5c61a899e Leave the Inno script in better shape. Added registration of .py etc
extensions -- but Inno uninstall doesn't restore previous ones (if any),
so that's another step backwards.
2001-07-21 21:16:39 +00:00
Tim Peters 7e5dcf6a33 A full Inno Setup script for Python, except for the few hard and esoteric
parts Inno has no good answer for (read the comments at the top of the
script).
2001-07-20 09:32:16 +00:00
Tim Peters 0b89fc0214 Remove the TENTATIVE marker from the now-historic Windows buildnos. 2001-07-20 05:17:10 +00:00
Tim Peters 0eb4f3e994 Prepare Windows installer for 2.2a1. 2001-07-17 04:05:43 +00:00
Tim Peters c683a29332 Remove TENTATIVE from the 2.1.1c1 Windows buildno. 2001-07-14 03:31:35 +00:00
Tim Peters c4889c496a Remove now-unnecessary "from __future__ import nested_scopes" stmts. 2001-07-12 22:36:02 +00:00
Tim Peters 9b23920b0f Fiddle Windows installer to create Lib/site-packages/REAMDE as
Lib\site-packages\README.txt.
2001-07-12 20:15:25 +00:00
Tim Peters 1a7f16ccdf Removed fpectlmodule.c and fpetestmodule.c from the Windows build. They
weren't functional under Windows even if enabled.
2001-07-05 21:19:02 +00:00
Tim Peters 8734952a84 Add tentative 2.1.1 Windows build numbers. 2001-07-02 04:08:39 +00:00
Tim Peters 289a961cd4 Record Windows build number for 2.0.1 final. 2001-06-22 02:06:04 +00:00
Tim Peters 42107c5a0f Record Windows buildno for 2.0.1c1. 2001-06-13 19:17:32 +00:00
Tim Peters 9dfe4cdfa4 Teach Windows about new iterobject.c. 2001-04-20 21:21:28 +00:00
Tim Peters 52709e321c Move Windows stuff to 2.2, so CVS builds won't interfere with 2.1
installations.
2001-04-18 21:12:25 +00:00
Tim Peters dd37dace87 Update Windows installer & buildno for 2.1 final. 2001-04-16 18:20:30 +00:00