!  |
! |
! |
!
Python Documentation |
! |
!  |
! |
diff -rc /home/trentm/main/contrib/python/dist/src/Doc/html/stdabout.dat /home/trentm/main/Apps/ActivePython/src/Core/Doc/html/stdabout.dat
*** /home/trentm/main/contrib/python/dist/src/Doc/html/stdabout.dat Fri Sep 22 13:40:25 2000
--- /home/trentm/main/Apps/ActivePython/src/Core/Doc/html/stdabout.dat Fri Sep 22 13:33:54 2000
***************
*** 27,32 ****
--- 27,38 ----
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 -rc /home/trentm/main/contrib/python/dist/src/Doc/html/style.css /home/trentm/main/Apps/ActivePython/src/Core/Doc/html/style.css
*** /home/trentm/main/contrib/python/dist/src/Doc/html/style.css Fri Sep 22 13:40:25 2000
--- /home/trentm/main/Apps/ActivePython/src/Core/Doc/html/style.css Fri Sep 22 13:33:54 2000
***************
*** 3,12 ****
* 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 }
/* implement both fixed-size and relative sizes */
SMALL.XTINY { font-size : xx-small }
--- 3,11 ----
* with the "empty" declarations removed.
*/
! .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 }
***************
*** 26,79 ****
* Netscape on Solaris otherwise doesn't get it right; they all end up
* the normal text size.
*/
!
! body { color: #000000;
! background-color: #ffffff; }
!
! 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; }
! .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; }
.refcount-info { font-style: italic }
! .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 .heading { font-size: 110% }
--- 25,57 ----
* 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 }
! .navigation { font-family: verdana, arial, helvetica, sans-serif; font-size: 110% }
! .title { font-family: verdana, arial, helvetica, sans-serif; font-size: 110% }
! .verbatim { color: #00008b }
! .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 }
! .seealso { background-color: #EAE2BB; border: thin solid black; padding: 4pt }
.seealso .heading { font-size: 110% }
diff -rc /home/trentm/main/contrib/python/dist/src/Doc/texinputs/copyright.tex /home/trentm/main/Apps/ActivePython/src/Core/Doc/texinputs/copyright.tex
*** /home/trentm/main/contrib/python/dist/src/Doc/texinputs/copyright.tex Fri Sep 22 13:40:25 2000
--- /home/trentm/main/Apps/ActivePython/src/Core/Doc/texinputs/copyright.tex Fri Sep 22 13:33:55 2000
***************
*** 1,6 ****
! \strong{BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0}
! \centerline{\strong{BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1}}
\begin{enumerate}
--- 1,19 ----
! \strong{ActiveState Terms and Conditions for ActivePython 2.0}
! \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,63 ****
Agreement.
\end{enumerate}
!
! \centerline{\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
--- 69,76 ----
Agreement.
\end{enumerate}
! \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,73 ****
URL: \url{http://hdl.handle.net/1895.22/1012}.
! \centerline{\strong{CWI PERMISSIONS STATEMENT AND DISCLAIMER}}
Copyright \copyright{} 1991 - 1995, Stichting Mathematisch Centrum
Amsterdam, The Netherlands. All rights reserved.
--- 80,87 ----
URL: \url{http://hdl.handle.net/1895.22/1012}.
! \item[]
! \strong{CWI PERMISSIONS STATEMENT AND DISCLAIMER}
Copyright \copyright{} 1991 - 1995, Stichting Mathematisch Centrum
Amsterdam, The Netherlands. All rights reserved.
***************
*** 88,90 ****
--- 102,144 ----
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.
Only in /home/trentm/main/Apps/ActivePython/src/Core/Lib/test/output: test_sax
Only in /home/trentm/main/Apps/ActivePython/src/Core/Lib/test: test_sax.py
diff -rc /home/trentm/main/contrib/python/dist/src/Lib/xml/sax/expatreader.py /home/trentm/main/Apps/ActivePython/src/Core/Lib/xml/sax/expatreader.py
*** /home/trentm/main/contrib/python/dist/src/Lib/xml/sax/expatreader.py Fri Sep 22 13:40:27 2000
--- /home/trentm/main/Apps/ActivePython/src/Core/Lib/xml/sax/expatreader.py Fri Sep 22 13:33:56 2000
***************
*** 26,37 ****
# --- ExpatParser
class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ):
"SAX driver for the Pyexpat C module."
def __init__(self, namespaceHandling=0, bufsize=2**16-20):
xmlreader.IncrementalParser.__init__(self, bufsize)
! self._source = None
self._parser = None
self._namespaces = namespaceHandling
self._parsing = 0
--- 26,43 ----
# --- ExpatParser
+ # The current version of SAX doesn't have the concept of InputSource
+ # so all references to it are removed.
+
+ # If InputSource is added back in, then they can be uncommented (after
+ # consideration!)
+
class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ):
"SAX driver for the Pyexpat C module."
def __init__(self, namespaceHandling=0, bufsize=2**16-20):
xmlreader.IncrementalParser.__init__(self, bufsize)
! #self._source = None
self._parser = None
self._namespaces = namespaceHandling
self._parsing = 0
***************
*** 40,54 ****
def parse(self, stream_or_string ):
"Parse an XML document from a URL."
- if type( stream_or_string ) == type( "" ):
- stream=open( stream_or_string )
- else:
- stream=stream_or_string
self.reset()
self._cont_handler.setDocumentLocator(self)
try:
! xmlreader.IncrementalParser.parse(self, stream)
except pyexpat.error:
error_code = self._parser.ErrorCode
raise xml.sax.SAXParseException(pyexpat.ErrorString(error_code),
--- 46,56 ----
def parse(self, stream_or_string ):
"Parse an XML document from a URL."
self.reset()
self._cont_handler.setDocumentLocator(self)
try:
! xmlreader.IncrementalParser.parse(self, stream_or_string)
except pyexpat.error:
error_code = self._parser.ErrorCode
raise xml.sax.SAXParseException(pyexpat.ErrorString(error_code),
***************
*** 56,66 ****
self._cont_handler.endDocument()
! def prepareParser(self, filename=None):
! self._source = filename
! if self._source != None:
! self._parser.SetBase(self._source)
def getFeature(self, name):
"Looks up and returns the state of a SAX2 feature."
--- 58,69 ----
self._cont_handler.endDocument()
! def prepareParser(self, source=None):
! pass
! #self._source = filename
! #if self._source != None:
! # self._parser.SetBase(self._source)
def getFeature(self, name):
"Looks up and returns the state of a SAX2 feature."
***************
*** 107,112 ****
--- 110,116 ----
self._parser.ProcessingInstructionHandler = \
self._cont_handler.processingInstruction
self._parser.CharacterDataHandler = self._cont_handler.characters
+
self._parser.UnparsedEntityDeclHandler = self.unparsed_entity_decl
self._parser.NotationDeclHandler = self.notation_decl
self._parser.StartNamespaceDeclHandler = self.start_namespace_decl
***************
*** 128,134 ****
return self._parser.ErrorLineNumber
def getPublicId(self):
! return self._source.getPublicId()
def getSystemId(self):
return self._parser.GetBase()
--- 132,138 ----
return self._parser.ErrorLineNumber
def getPublicId(self):
! return # self._source.getPublicId()
def getSystemId(self):
return self._parser.GetBase()
diff -rc /home/trentm/main/contrib/python/dist/src/Lib/xml/sax/xmlreader.py /home/trentm/main/Apps/ActivePython/src/Core/Lib/xml/sax/xmlreader.py
*** /home/trentm/main/contrib/python/dist/src/Lib/xml/sax/xmlreader.py Fri Sep 22 13:40:27 2000
--- /home/trentm/main/Apps/ActivePython/src/Core/Lib/xml/sax/xmlreader.py Fri Sep 22 13:33:56 2000
***************
*** 98,106 ****
def parse(self, source):
self.prepareParser(source)
! #FIXME: do some type checking: could be already stream, URL or
! # filename
! inf=open( source )
buffer = inf.read(self._bufsize)
while buffer != "":
self.feed(buffer)
--- 98,108 ----
def parse(self, source):
self.prepareParser(source)
! if hasattr( source, "read" ):
! inf=source
! else:
! #FIXME: how to recognize if it is a URL instead of filename?
! inf=open( source )
buffer = inf.read(self._bufsize)
while buffer != "":
self.feed(buffer)
diff -rc /home/trentm/main/contrib/python/dist/src/Makefile.in /home/trentm/main/Apps/ActivePython/src/Core/Makefile.in
*** /home/trentm/main/contrib/python/dist/src/Makefile.in Fri Sep 22 13:40:27 2000
--- /home/trentm/main/Apps/ActivePython/src/Core/Makefile.in Fri Sep 22 13:33:56 2000
***************
*** 214,220 ****
PYTHONPATH= $(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
# Install everything
! install: altinstall bininstall maninstall
# Install almost everything without disturbing previous versions
altinstall: altbininstall libinstall inclinstall libainstall sharedinstall
--- 214,220 ----
PYTHONPATH= $(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
# Install everything
! install: altinstall bininstall maninstall toolsinstall
# Install almost everything without disturbing previous versions
altinstall: altbininstall libinstall inclinstall libainstall sharedinstall
***************
*** 234,240 ****
do \
if test ! -d $$i; then \
echo "Creating directory $$i"; \
! mkdir $$i; \
chmod $(DIRMODE) $$i; \
else true; \
fi; \
--- 234,240 ----
do \
if test ! -d $$i; then \
echo "Creating directory $$i"; \
! mkdir -p $$i; \
chmod $(DIRMODE) $$i; \
else true; \
fi; \
***************
*** 258,263 ****
--- 258,266 ----
done
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
$(MANDIR)/man1/python.1
+
+ toolsinstall:
+ tar -cf - Tools | (cd $(exec_prefix); tar -xf -)
# Install the library
PLATDIR= plat-$(MACHDEP)
Only in /home/trentm/main/Apps/ActivePython/src/Core/Modules: Setup.in.checkpoint
Only in /home/trentm/main/Apps/ActivePython/src/Core/Modules: Setup.in.linux
Only in /home/trentm/main/Apps/ActivePython/src/Core/Modules: Setup.in.solaris
diff -rc /home/trentm/main/contrib/python/dist/src/Modules/main.c /home/trentm/main/Apps/ActivePython/src/Core/Modules/main.c
*** /home/trentm/main/contrib/python/dist/src/Modules/main.c Fri Sep 22 13:40:27 2000
--- /home/trentm/main/Apps/ActivePython/src/Core/Modules/main.c Fri Sep 22 13:33:57 2000
***************
*** 248,254 ****
if (Py_VerboseFlag ||
(command == NULL && filename == NULL && stdin_is_interactive))
! fprintf(stderr, "Python %s on %s\n%s\n",
Py_GetVersion(), Py_GetPlatform(), COPYRIGHT);
--- 248,254 ----
if (Py_VerboseFlag ||
(command == NULL && filename == NULL && stdin_is_interactive))
! fprintf(stderr, "ActivePython 2.0, build 201 (ActiveState Tool Corp.)\nbased on Python %s on %s\n%s\n",
Py_GetVersion(), Py_GetPlatform(), COPYRIGHT);
diff -rc /home/trentm/main/contrib/python/dist/src/PC/python_nt.rc /home/trentm/main/Apps/ActivePython/src/Core/PC/python_nt.rc
*** /home/trentm/main/contrib/python/dist/src/PC/python_nt.rc Fri Sep 22 13:40:29 2000
--- /home/trentm/main/Apps/ActivePython/src/Core/PC/python_nt.rc Fri Sep 22 13:33:58 2000
***************
*** 28,35 ****
//
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 1,6,0,0
! PRODUCTVERSION 1,6,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
--- 28,35 ----
//
VS_VERSION_INFO VERSIONINFO
! FILEVERSION 2,0,0,201
! PRODUCTVERSION 2,0,0,201
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
***************
*** 44,54 ****
BEGIN
BLOCK "000004b0"
BEGIN
! VALUE "CompanyName", "BeOpen.com\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 "OriginalFilename", PYTHON_DLL_NAME "\0"
VALUE "ProductName", "Python\0"
VALUE "ProductVersion", PYTHON_VERSION
--- 44,54 ----
BEGIN
BLOCK "000004b0"
BEGIN
! 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 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 -rc /home/trentm/main/contrib/python/dist/src/PCbuild/_tkinter.dsp /home/trentm/main/Apps/ActivePython/src/Core/PCbuild/_tkinter.dsp
*** /home/trentm/main/contrib/python/dist/src/PCbuild/_tkinter.dsp Fri Sep 22 13:40:29 2000
--- /home/trentm/main/Apps/ActivePython/src/Core/PCbuild/_tkinter.dsp Fri Sep 22 13:33:58 2000
***************
*** 58,64 ****
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
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_tkinter - Win32 Alpha Release"
--- 58,64 ----
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\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,83 ****
# 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
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 77,83 ----
# 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 "..\..\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,96 ****
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
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_tkinter - Win32 Debug"
--- 90,96 ----
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\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,115 ****
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
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
--- 109,115 ----
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 "..\..\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,127 ****
# 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
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_tkinter - Win32 Release"
--- 121,127 ----
# 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 ..\..\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,146 ****
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
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 140,146 ----
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 "..\..\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,158 ****
# 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
# SUBTRACT LINK32 /pdb:none
!ENDIF
--- 152,158 ----
# 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 ..\..\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 -rc /home/trentm/main/contrib/python/dist/src/configure /home/trentm/main/Apps/ActivePython/src/Core/configure
*** /home/trentm/main/contrib/python/dist/src/configure Fri Sep 22 13:40:29 2000
--- /home/trentm/main/Apps/ActivePython/src/Core/configure Fri Sep 22 13:33:59 2000
***************
*** 2716,2722 ****
hp*|HP*)
LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
! Linux*) LINKFORSHARED="-Xlinker -export-dynamic";;
# -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
--- 2716,2722 ----
hp*|HP*)
LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
BSD/OS/4*) 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
***************
*** 2728,2740 ****
FreeBSD*|NetBSD*)
if [ "`$CC -dM -E - &1 | grep BFD >/dev/null
then
! LINKFORSHARED="-Xlinker --export-dynamic"
fi;;
esac;;
esac
--- 2728,2740 ----
FreeBSD*|NetBSD*)
if [ "`$CC -dM -E - &1 | grep BFD >/dev/null
then
! LINKFORSHARED="-Xlinker --export-dynamic -Xlinker -rpath -Xlinker /usr/local/lib"
fi;;
esac;;
esac
diff -rc /home/trentm/main/contrib/python/dist/src/configure.in /home/trentm/main/Apps/ActivePython/src/Core/configure.in
*** /home/trentm/main/contrib/python/dist/src/configure.in Fri Sep 22 13:40:29 2000
--- /home/trentm/main/Apps/ActivePython/src/Core/configure.in Fri Sep 22 13:33:59 2000
***************
*** 630,636 ****
hp*|HP*)
LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
! Linux*) LINKFORSHARED="-Xlinker -export-dynamic";;
# -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
--- 630,636 ----
hp*|HP*)
LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
BSD/OS/4*) 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
***************
*** 642,654 ****
FreeBSD*|NetBSD*)
if [[ "`$CC -dM -E - &1 | grep BFD >/dev/null
then
! LINKFORSHARED="-Xlinker --export-dynamic"
fi;;
esac;;
esac
--- 642,654 ----
FreeBSD*|NetBSD*)
if [[ "`$CC -dM -E - &1 | grep BFD >/dev/null
then
! LINKFORSHARED="-Xlinker --export-dynamic -Xlinker -rpath -Xlinker /usr/local/lib"
fi;;
esac;;
esac
