Python @RELEASE@ Documentation

diff -ru contrib/python/dist/src/Doc/html/stdabout.dat Apps/ActivePython/src/Core/Doc/html/stdabout.dat --- contrib/python/dist/src/Doc/html/stdabout.dat Thu Oct 19 03:38:00 2000 +++ Apps/ActivePython/src/Core/Doc/html/stdabout.dat Thu Oct 19 03:37:02 2000 @@ -27,6 +27,12 @@

Comments and Questions

Comments on the ActivePython distribution should be directed to + ActivePython@ActiveState.com. + For the latest news on ActivePython, visit the ActivePython homepage at + www.ActiveState.com/Products/ActivePython. +

General comments and questions regarding this document should be sent by email to python-docs@python.org. If you find specific errors in diff -ru contrib/python/dist/src/Doc/html/style.css Apps/ActivePython/src/Core/Doc/html/style.css --- contrib/python/dist/src/Doc/html/style.css Thu Oct 19 03:38:00 2000 +++ Apps/ActivePython/src/Core/Doc/html/style.css Thu Oct 19 03:37:02 2000 @@ -3,12 +3,9 @@ * with the "empty" declarations removed. */ -/* Century Schoolbook font is very similar to Computer Modern Math: cmmi */ -.math { font-family: "Century Schoolbook", serif; } -.math i { font-family: "Century Schoolbook", serif; - font-weight: bold } -.boldmath { font-family: "Century Schoolbook", serif; - font-weight: bold } +.math { font-family: serif; } +.math i { font-family: serif; font-weight: bold } +.boldmath { font-family: serif; font-weight: bold } /* Implement both fixed-size and relative sizes: */ small.xtiny { font-size : xx-small } @@ -28,55 +25,33 @@ * Netscape on Solaris otherwise doesn't get it right; they all end up * the normal text size. */ +a:link { color:#B82619; } +a:visited { color:#C2B266; } +a:active { color: #000000; } +body { font-family: verdana, arial, helvetica, sans-serif; font-size: small; } +h1, h2, h3, h4, h5, h6 { font-family: verdana, arial, helvetica, sans-serif; font-weight: bold; } +h1 { font-size: 180% } +h2 { font-size: 150% } +h3, h4 { font-size: 120% } +code, tt { font-family: monospace } +var { font-family: serif; font-style: italic; font-weight: normal } -body { color: #000000; - background-color: #ffffff; } +.navigation { font-family: verdana, arial, helvetica, sans-serif; font-size: 110% } -a:active { color: #ff0000; } -a:visited { color: #551a8b; } -a:link { color: #0000bb; } - -h1, h2, h3, h4, h5, h6 { font-family: avantgarde, sans-serif; - font-weight: bold } -h1 { font-size: 180% } -h2 { font-size: 150% } -h3, h4 { font-size: 120% } -code, tt { font-family: monospace } -var { font-family: serif; - font-style: italic; - font-weight: normal } - -.navigation td { background-color: #99ccff; - font-weight: bold; - font-family: avantgarde, sans-serif; - font-size: 110% } - -.titlegraphic { vertical-align: top; } +.title { font-family: verdana, arial, helvetica, sans-serif; font-size: 110% } .verbatim { color: #00008b } -.email { font-family: avantgarde, sans-serif } -.mimetype { font-family: avantgarde, sans-serif } -.newsgroup { font-family: avantgarde, sans-serif } -.url { font-family: avantgarde, sans-serif } -.file { font-family: avantgarde, sans-serif } - -.tableheader td { background-color: #99ccff; } -.tableheader th { background-color: #99ccff; - font-family: avantgarde, sans-serif; } +.email { font-family: verdana, arial, helvetica, sans-serif } +.mimetype { font-family: verdana, arial, helvetica, sans-serif } +.newsgroup { font-family: verdana, arial, helvetica, sans-serif } +.url { font-family: verdana, arial, helvetica, sans-serif } +.file { font-family: verdana, arial, helvetica, sans-serif } .refcount-info { font-style: italic } -.refcount-info .value { font-weight: bold; - color: #006600 } +.refcount-info .value { font-weight: bold; color: #006600 } -/* - * Some decoration for the "See also:" blocks, in part inspired by some of - * the styling on Lars Marius Garshol's XSA pages. - * (The blue in the navigation bars is #99CCFF.) - */ -.seealso { background-color: #fffaf0; - border: thin solid black; - padding: 4pt } +.seealso { background-color: #EAE2BB; border: thin solid black; padding: 4pt } .seealso .heading { font-size: 110% } diff -ru contrib/python/dist/src/Doc/perl/l2hinit.perl Apps/ActivePython/src/Core/Doc/perl/l2hinit.perl --- contrib/python/dist/src/Doc/perl/l2hinit.perl Thu Oct 19 03:38:00 2000 +++ Apps/ActivePython/src/Core/Doc/perl/l2hinit.perl Thu Oct 19 03:37:02 2000 @@ -25,8 +25,8 @@ $BOTTOM_NAVIGATION = 1; $AUTO_NAVIGATION = 0; -# these exactly match the python.org colors -$BODYTEXT = ''; +# these exactly match the ActivePython colours +$BODYTEXT = 'bgcolor="#ffffff" text="#000000"'; $CHILDLINE = "\n

\n"; $VERBOSITY = 0; @@ -152,15 +152,15 @@ $s = ('' . "\n" # left-hand side - . "\n" - . "\n" - . "\n" + . "\n" + . "\n" + . "\n" # title box - . "\n" + . "\n" # right-hand side - . "\n" - . "\n" # module index - . "\n" + . "\n" + . "\n" # module index + . "\n" . "\n

$PREVIOUS

$UP

$NEXT

$PREVIOUS

$UP

$NEXT

$t_title

$CONTENTS

$CUSTOM_BUTTONS

$INDEX

$CONTENTS

$CUSTOM_BUTTONS

$INDEX

\n" # textual navigation . make_nav_sectref("Previous", $PREVIOUS_TITLE) diff -ru contrib/python/dist/src/Doc/texinputs/copyright.tex Apps/ActivePython/src/Core/Doc/texinputs/copyright.tex --- contrib/python/dist/src/Doc/texinputs/copyright.tex Thu Oct 19 03:38:00 2000 +++ Apps/ActivePython/src/Core/Doc/texinputs/copyright.tex Thu Oct 19 03:37:02 2000 @@ -1,6 +1,19 @@ -\centerline{\strong{BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0}} +\centerline{\strong{ActiveState Terms and Conditions for ActivePython 2.0}} -\centerline{\strong{BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1}} +\strong{ActivePython Community License Version 2} + +Preamble: + +The intent of this document is to state the conditions under which the +Package may be copied and distributed, such that ActiveState maintains +control over the development and distribution of the Package, while +allowing the users of the Package to use the Package in a variety of ways. + +The Package may contain software covered by other licenses: + +\begin{itemize} +\item[] +\strong{BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1} \begin{enumerate} @@ -56,8 +69,8 @@ Agreement. \end{enumerate} - -\centerline{\strong{CNRI OPEN SOURCE LICENSE AGREEMENT}} +\item[] +\strong{CNRI OPEN SOURCE LICENSE AGREEMENT} Python 1.6 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with Python 1.6 may @@ -67,7 +80,8 @@ URL: \url{http://hdl.handle.net/1895.22/1012}. -\centerline{\strong{CWI PERMISSIONS STATEMENT AND DISCLAIMER}} +\item[] +\strong{CWI PERMISSIONS STATEMENT AND DISCLAIMER} Copyright \copyright{} 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Netherlands. All rights reserved. @@ -88,3 +102,43 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +\end{itemize} + + +Definitions: + +"ActiveState" refers to ActiveState Tool Corp., the Copyright Holder of +the Package. + +"Package" refers to those files, including, but not limited to, source +code, binary executables, images, and scripts, which are distributed by +the Copyright Holder. + +"You" is you, if you are thinking about copying or distributing this +Package. + +You may use this Package for commercial or non-commercial purposes +without charge. + +You may make and give away verbatim copies of this Package for personal +use, or for use within your organization, provided that you duplicate all +of the original copyright notices and associated disclaimers. You may not +distribute copies of this Package, or copies of packages derived from this +Package, to others outside your organization without specific prior +written permission from ActiveState (although you are encouraged to direct +them to sources from which they may obtain it for themselves). + +You may apply bug fixes, portability fixes, and other modifications +derived from ActiveState. A Package modified in such a way shall still be +covered by the terms of this license. + +ActiveState's name and trademarks may not be used to endorse or promote +packages derived from this Package without specific prior written +permission from ActiveState. + +THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +ActivePython Community License Copyright (c) 2000 +ActiveState Tool Corp. All rights reserved. diff -ru contrib/python/dist/src/Doc/tools/support.py Apps/ActivePython/src/Core/Doc/tools/support.py --- contrib/python/dist/src/Doc/tools/support.py Thu Oct 19 03:38:01 2000 +++ Apps/ActivePython/src/Core/Doc/tools/support.py Thu Oct 19 03:37:02 2000 @@ -24,7 +24,7 @@ outputfile = "-" columns = 1 letters = 0 - uplink = "./" + uplink = "./index.html" uptitle = "Python Documentation Index" def __init__(self): diff -ru contrib/python/dist/src/LICENSE Apps/ActivePython/src/Core/LICENSE --- contrib/python/dist/src/LICENSE Thu Oct 19 03:38:01 2000 +++ Apps/ActivePython/src/Core/LICENSE Thu Oct 19 03:37:03 2000 @@ -14,10 +14,16 @@ release from PythonLabs. Thanks to the many outside volunteers who have worked under Guido's direction to make this release possible. +ActivePython Community License (version 2) +Preamble: -BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0 -============================================== +The intent of this document is to state the conditions under which the Package +may be copied and distributed, such that ActiveState maintains control over the +development and distribution of the Package, while allowing the users of the +Package to use the Package in a variety of ways. + +The Package may contain software covered by other licenses: BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 ----------------------------------------------------- @@ -162,3 +168,40 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Definitions: + +"ActiveState" refers to ActiveState Tool Corp., the Copyright Holder of the +Package. + +"Package" refers to those files, including, but not limited to, source code, +binary executables, images, and scripts, which are distributed by the Copyright +Holder. + +"You" is you, if you are thinking about copying or distributing this Package. + +1. You may use this Package for commercial or non-commercial purposes without + charge. + +2. You may make and give away verbatim copies of this Package for personal use, + or for use within your organization, provided that you duplicate all of the + original copyright notices and associated disclaimers. You may not + distribute copies of this Package, or copies of packages derived from this + Package, to others outside your organization without specific prior written + permission from ActiveState (although you are encouraged to direct them to + sources from which they may obtain it for themselves). + +3. You may apply bug fixes, portability fixes, and other modifications derived + from ActiveState. A Package modified in such a way shall still be covered by + the terms of this license. + +4. ActiveState's name and trademarks may not be used to endorse or promote + packages derived from this Package without specific prior written permission + from ActiveState. + +5. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +ActiveState Community License Copyright (c) 2000 +ActiveState Tool Corp. All rights reserved. diff -ru contrib/python/dist/src/Lib/site.py Apps/ActivePython/src/Core/Lib/site.py --- contrib/python/dist/src/Lib/site.py Thu Oct 19 03:38:03 2000 +++ Apps/ActivePython/src/Core/Lib/site.py Thu Oct 19 03:37:04 2000 @@ -202,10 +202,11 @@ __builtin__.copyright = _Printer("copyright", sys.copyright) __builtin__.credits = _Printer("credits", - "Python development is led by BeOpen PythonLabs (www.pythonlabs.com).") + "ActivePython is a Python distribution by ActiveState Tool Corp.\n Python development is led by BeOpen PythonLabs (www.pythonlabs.com).") here = os.path.dirname(os.__file__) __builtin__.license = _Printer( - "license", "See http://www.pythonlabs.com/products/python2.0/license.html", + "license", + "See http://www.activestate.com/Products/ActivePython/License_Agreement.html", ["LICENSE.txt", "LICENSE"], [here, os.path.join(here, os.pardir), os.curdir]) diff -ru contrib/python/dist/src/Lib/test/test_import.py Apps/ActivePython/src/Core/Lib/test/test_import.py --- contrib/python/dist/src/Lib/test/test_import.py Thu Oct 19 03:38:04 2000 +++ Apps/ActivePython/src/Core/Lib/test/test_import.py Thu Oct 19 03:37:04 2000 @@ -15,6 +15,11 @@ print >> f, "b =", b f.close() +# have to ensure that the directory in which TESTFN.py is created +# is on sys.path for the __import__ call +import sys +sys.path.append(os.path.dirname(os.curdir)) + try: try: mod = __import__(TESTFN) diff -ru contrib/python/dist/src/Makefile.in Apps/ActivePython/src/Core/Makefile.in --- contrib/python/dist/src/Makefile.in Thu Oct 19 03:38:05 2000 +++ Apps/ActivePython/src/Core/Makefile.in Thu Oct 19 03:37:05 2000 @@ -102,6 +102,7 @@ INSTALL= @srcdir@/install-sh -c INSTALL_PROGRAM=${INSTALL} -m $(EXEMODE) INSTALL_DATA= ${INSTALL} -m $(FILEMODE) +INSTALL_DIR_RECURSIVE= ./python$(EXE) install-dir-recursive.py $(DIRMODE) $(EXEMODE) $(FILEMODE) # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ @@ -217,7 +218,7 @@ PYTHONPATH= $(TESTPYTHON) $(TESTPROG) $(TESTOPTS) # Install everything -install: altinstall bininstall maninstall +install: altinstall bininstall maninstall toolsinstall # Install almost everything without disturbing previous versions altinstall: altbininstall libinstall inclinstall libainstall sharedinstall @@ -237,7 +238,7 @@ do \ if test ! -d $$i; then \ echo "Creating directory $$i"; \ - mkdir $$i; \ + mkdir -p $$i; \ chmod $(DIRMODE) $$i; \ else true; \ fi; \ @@ -261,6 +262,12 @@ done $(INSTALL_DATA) $(srcdir)/Misc/python.man \ $(MANDIR)/man1/python.1 + +toolsinstall: python$(EXE) + # should use INSTALL_DATA and INSTALL_PROGRAM as appropriate + # to get the proper installation premissions + PYTHONPATH=$(LIBDEST) \ + $(INSTALL_DIR_RECURSIVE) Tools $(exec_prefix)/Tools # Install the library PLATDIR= plat-$(MACHDEP) Only in Apps/ActivePython/src/Core/Modules: Setup.in.checkpoint Only in Apps/ActivePython/src/Core/Modules: Setup.in.linux Only in Apps/ActivePython/src/Core/Modules: Setup.in.solaris diff -ru contrib/python/dist/src/Modules/main.c Apps/ActivePython/src/Core/Modules/main.c --- contrib/python/dist/src/Modules/main.c Thu Oct 19 03:38:06 2000 +++ Apps/ActivePython/src/Core/Modules/main.c Thu Oct 19 03:37:05 2000 @@ -248,7 +248,7 @@ if (Py_VerboseFlag || (command == NULL && filename == NULL && stdin_is_interactive)) - fprintf(stderr, "Python %s on %s\n%s\n", + fprintf(stderr, "ActivePython 2.0, build 202 (ActiveState Tool Corp.)\nbased on Python %s on %s\n%s\n", Py_GetVersion(), Py_GetPlatform(), COPYRIGHT); diff -ru contrib/python/dist/src/PC/python_nt.rc Apps/ActivePython/src/Core/PC/python_nt.rc --- contrib/python/dist/src/PC/python_nt.rc Thu Oct 19 03:38:07 2000 +++ Apps/ActivePython/src/Core/PC/python_nt.rc Thu Oct 19 03:37:06 2000 @@ -28,8 +28,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,6,0,0 - PRODUCTVERSION 1,6,0,0 + FILEVERSION 2,0,0,202 + PRODUCTVERSION 2,0,0,202 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -44,11 +44,11 @@ BEGIN BLOCK "000004b0" BEGIN - VALUE "CompanyName", "BeOpen.com\0" + VALUE "CompanyName", "ActiveState Tool Corp.\0" VALUE "FileDescription", "Python Core\0" VALUE "FileVersion", PYTHON_VERSION VALUE "InternalName", "Python DLL\0" - VALUE "LegalCopyright", "Copyright (c) 2000 BeOpen.com. Copyright (c) 1995-2000 CNRI. Copyright (c) 1990-1995 SMC.\0" + VALUE "LegalCopyright", "Copyright (c) 2000 ActiveState Tool Corp. Copyright (c) 2000 BeOpen.com. Copyright (c) 1995-2000 CNRI. Copyright (c) 1990-1995 SMC.\0" VALUE "OriginalFilename", PYTHON_DLL_NAME "\0" VALUE "ProductName", "Python\0" VALUE "ProductVersion", PYTHON_VERSION diff -ru contrib/python/dist/src/PCbuild/_tkinter.dsp Apps/ActivePython/src/Core/PCbuild/_tkinter.dsp --- contrib/python/dist/src/PCbuild/_tkinter.dsp Thu Oct 19 03:38:07 2000 +++ Apps/ActivePython/src/Core/PCbuild/_tkinter.dsp Thu Oct 19 03:37:06 2000 @@ -58,7 +58,7 @@ LINK32=link.exe # ADD BASE LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter # SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 ..\..\tcl\lib\tcl83.lib ..\..\tcl\lib\tk83.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter +# ADD LINK32 ..\..\tcl\win\Debug\tcl83.lib ..\..\tk\win\Debug\tk83.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Release" @@ -77,7 +77,7 @@ # PROP Target_Dir "" CPP=cl.exe # ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "C:\Program Files\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c -# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /I "..\..\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c +# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\Include" /I "..\PC" /I "..\..\Tk\xlib" /I "..\..\Tk\generic" /I "..\..\Tcl\generic" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -90,7 +90,7 @@ LINK32=link.exe # ADD BASE LINK32 tcl80.lib tk80.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter # SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 ..\..\tcl\lib\tcl83.lib ..\..\tcl\lib\tk83.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter +# ADD LINK32 ..\..\tcl\win\Release\tcl83.lib ..\..\tk\win\Release\tk83.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "_tkinter - Win32 Debug" @@ -109,7 +109,7 @@ F90=df.exe CPP=cl.exe # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\tcl\include" /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Tk\xlib" /I "..\..\Tk\xlib" /I "..\..\Tk\generic" /I "..\..\tcl\generic" /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -121,7 +121,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ..\..\tcl\lib\tk83.lib ..\..\tcl\lib\tcl83.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter +# ADD LINK32 ..\..\tk\win\Debug\tk83.lib ..\..\tcl\win\Debug\tcl83.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "_tkinter - Win32 Release" @@ -140,7 +140,7 @@ F90=df.exe CPP=cl.exe # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\tcl\include" /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\tk\xlib" /I "..\..\tk\generic" /I "..\..\tcl\generic" /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -152,7 +152,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 ..\..\tcl\lib\tk83.lib ..\..\tcl\lib\tcl83.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter +# ADD LINK32 ..\..\tk\win\Release\tk83.lib ..\..\tcl\win\Release\tcl83.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter # SUBTRACT LINK32 /pdb:none !ENDIF diff -ru contrib/python/dist/src/Python/getcopyright.c Apps/ActivePython/src/Core/Python/getcopyright.c --- contrib/python/dist/src/Python/getcopyright.c Thu Oct 19 03:38:07 2000 +++ Apps/ActivePython/src/Core/Python/getcopyright.c Thu Oct 19 03:37:06 2000 @@ -3,7 +3,9 @@ #include "Python.h" static char cprt[] = -"Copyright (c) 2000 BeOpen.com.\n\ +"Copyright (c) 2000 ActiveState Tool Corp.\n\ +\n\ +Copyright (c) 2000 BeOpen.com.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 1995-2000 Corporation for National Research Initiatives.\n\ diff -ru contrib/python/dist/src/configure Apps/ActivePython/src/Core/configure --- contrib/python/dist/src/configure Thu Oct 19 03:38:09 2000 +++ Apps/ActivePython/src/Core/configure Thu Oct 19 03:37:07 2000 @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.172 +# From configure.in Revision: 1.173 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 @@ -2727,7 +2727,7 @@ hp*|HP*) LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; - Linux*) LINKFORSHARED="-Xlinker -export-dynamic";; + Linux*) LINKFORSHARED="-Xlinker -export-dynamic -Xlinker -rpath -Xlinker /usr/local/lib";; # -u libsys_s pulls in all symbols in libsys next/2*|next/3*) LINKFORSHARED="-u libsys_s";; # -u __dummy makes the linker aware of the objc runtime @@ -2741,13 +2741,13 @@ FreeBSD*|NetBSD*) if [ "`$CC -dM -E - &1 | grep BFD >/dev/null then - LINKFORSHARED="-Xlinker --export-dynamic" + LINKFORSHARED="-Xlinker --export-dynamic -Xlinker -rpath -Xlinker /usr/local/lib" fi;; esac;; esac diff -ru contrib/python/dist/src/configure.in Apps/ActivePython/src/Core/configure.in --- contrib/python/dist/src/configure.in Thu Oct 19 03:38:09 2000 +++ Apps/ActivePython/src/Core/configure.in Thu Oct 19 03:37:07 2000 @@ -639,7 +639,7 @@ hp*|HP*) LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; - Linux*) LINKFORSHARED="-Xlinker -export-dynamic";; + Linux*) LINKFORSHARED="-Xlinker -export-dynamic -Xlinker -rpath -Xlinker /usr/local/lib";; # -u libsys_s pulls in all symbols in libsys next/2*|next/3*) LINKFORSHARED="-u libsys_s";; # -u __dummy makes the linker aware of the objc runtime @@ -653,13 +653,13 @@ FreeBSD*|NetBSD*) if [[ "`$CC -dM -E - &1 | grep BFD >/dev/null then - LINKFORSHARED="-Xlinker --export-dynamic" + LINKFORSHARED="-Xlinker --export-dynamic -Xlinker -rpath -Xlinker /usr/local/lib" fi;; esac;; esac Only in Apps/ActivePython/src/Core: install-dir-recursive.py