From kwaclaw at users.sourceforge.net Thu May 3 04:13:31 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Wed, 02 May 2007 19:13:31 -0700 Subject: [Expat-checkins] expat/lib expat.dsp, 1.14, 1.15 expat_static.dsp, 1.6, 1.7 expatw.dsp, 1.7, 1.8 expatw_static.dsp, 1.7, 1.8 Message-ID: <20070503021333.DA2C11E4005@bag.python.org> Update of /cvsroot/expat/expat/lib In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv14891 Modified Files: expat.dsp expat_static.dsp expatw.dsp expatw_static.dsp Log Message: Updated output directory settings, so that they all point to win32/bin/Debug or win32/bin/Release. This ensures that executables can find the libraries they depend on. Intermediate files will go into a subdirectory of win32/tmp. Index: expat.dsp =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.dsp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- expat.dsp 26 Nov 2006 17:34:46 -0000 1.14 +++ expat.dsp 3 May 2007 02:13:28 -0000 1.15 @@ -38,8 +38,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "..\win32\bin\Release" +# PROP Intermediate_Dir "..\win32\tmp\Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c @@ -54,7 +54,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 /dll /machine:I386 -# ADD 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 /dll /pdb:none /machine:I386 /out:"Release\libexpat.dll" +# ADD 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 /dll /pdb:none /machine:I386 /out:"..\win32\bin\Release/libexpat.dll" !ELSEIF "$(CFG)" == "expat - Win32 Debug" @@ -65,8 +65,9 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "..\win32\bin\Debug" +# PROP Intermediate_Dir "..\win32\tmp\Debug" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /FD /GZ /c @@ -79,7 +80,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 /dll /debug /machine:I386 /pdbtype:sept -# ADD 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 /dll /pdb:none /debug /machine:I386 /out:"Debug\libexpat.dll" +# ADD 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 /dll /pdb:none /debug /machine:I386 /out:"..\win32\bin\Debug/libexpat.dll" !ENDIF Index: expat_static.dsp =================================================================== RCS file: /cvsroot/expat/expat/lib/expat_static.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- expat_static.dsp 26 Nov 2006 17:58:06 -0000 1.6 +++ expat_static.dsp 3 May 2007 02:13:28 -0000 1.7 @@ -37,8 +37,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" +# PROP Output_Dir "..\win32\bin\Release" +# PROP Intermediate_Dir "..\win32\tmp\Release_static" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /FD /c @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Release_static\libexpatMT.lib" +# ADD LIB32 /nologo /out:"..\win32\bin\Release/libexpatMT.lib" !ELSEIF "$(CFG)" == "expat_static - Win32 Debug" @@ -61,8 +61,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" +# PROP Output_Dir "..\win32\bin\Debug" +# PROP Intermediate_Dir "..\win32\tmp\Debug_static" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "COMPILED_FROM_DSP" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug_static\libexpatMT.lib" +# ADD LIB32 /nologo /out:"..\win32\bin\Debug\libexpatMT.lib" !ENDIF Index: expatw.dsp =================================================================== RCS file: /cvsroot/expat/expat/lib/expatw.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- expatw.dsp 26 Nov 2006 17:58:06 -0000 1.7 +++ expatw.dsp 3 May 2007 02:13:28 -0000 1.8 @@ -38,8 +38,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release-w" -# PROP Intermediate_Dir "Release-w" +# PROP Output_Dir "..\win32\bin\Release" +# PROP Intermediate_Dir "..\win32\tmp\Release-w" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c @@ -54,7 +54,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 /dll /machine:I386 -# ADD 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 /dll /pdb:none /machine:I386 /out:"Release-w\libexpatw.dll" +# ADD 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 /dll /pdb:none /machine:I386 /out:"..\win32\bin\Release/libexpatw.dll" !ELSEIF "$(CFG)" == "expatw - Win32 Debug" @@ -65,8 +65,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug-w" -# PROP Intermediate_Dir "Debug-w" +# PROP Output_Dir "..\win32\bin\Debug" +# PROP Intermediate_Dir "..\win32\tmp\Debug-w" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c @@ -80,7 +80,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 /dll /debug /machine:I386 /pdbtype:sept -# ADD 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 /dll /pdb:none /debug /machine:I386 /out:"Debug-w\libexpatw.dll" +# ADD 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 /dll /pdb:none /debug /machine:I386 /out:"..\win32\bin\Debug/libexpatw.dll" !ENDIF Index: expatw_static.dsp =================================================================== RCS file: /cvsroot/expat/expat/lib/expatw_static.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- expatw_static.dsp 26 Nov 2006 17:58:06 -0000 1.7 +++ expatw_static.dsp 3 May 2007 02:13:28 -0000 1.8 @@ -37,8 +37,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release-w_static" -# PROP Intermediate_Dir "Release-w_static" +# PROP Output_Dir "..\win32\bin\Release" +# PROP Intermediate_Dir "..\win32\tmp\Release-w_static" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /D "XML_UNICODE_WCHAR_T" /FD /c @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Release-w_static\libexpatwMT.lib" +# ADD LIB32 /nologo /out:"..\win32\bin\Release\libexpatwMT.lib" !ELSEIF "$(CFG)" == "expatw_static - Win32 Debug" @@ -61,8 +61,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug-w_static" -# PROP Intermediate_Dir "Debug-w_static" +# PROP Output_Dir "..\win32\bin\Debug" +# PROP Intermediate_Dir "..\win32\tmp\Debug-w_static" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /D "COMPILED_FROM_DSP" /D "XML_UNICODE_WCHAR_T" /FR /FD /GZ /c @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug-w_static\libexpatwMT.lib" +# ADD LIB32 /nologo /out:"..\win32\bin\Debug\libexpatwMT.lib" !ENDIF From kwaclaw at users.sourceforge.net Thu May 3 04:14:32 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Wed, 02 May 2007 19:14:32 -0700 Subject: [Expat-checkins] expat/win32 expat.iss,1.21,1.22 Message-ID: <20070503021435.3F9A81E4005@bag.python.org> Update of /cvsroot/expat/expat/win32 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15294 Modified Files: expat.iss Log Message: New install directory structure. All binaries are now in the Bin directory. Index: expat.iss =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.iss,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- expat.iss 30 Apr 2007 00:58:52 -0000 1.21 +++ expat.iss 3 May 2007 02:14:30 -0000 1.22 @@ -27,43 +27,39 @@ DisableReadyPage=yes [Files] -Flags: ignoreversion; Source: xmlwf\Release\*.exe; DestDir: "{app}" -Flags: ignoreversion; Source: win32\MANIFEST.txt; DestDir: "{app}" -Flags: ignoreversion; Source: Changes; DestDir: "{app}"; DestName: Changes.txt -Flags: ignoreversion; Source: COPYING; DestDir: "{app}"; DestName: COPYING.txt -Flags: ignoreversion; Source: README; DestDir: "{app}"; DestName: README.txt -Flags: ignoreversion; Source: doc\*.html; DestDir: "{app}\Doc" -Flags: ignoreversion; Source: doc\*.css; DestDir: "{app}\Doc" -Flags: ignoreversion; Source: doc\*.png; DestDir: "{app}\Doc" -Flags: ignoreversion; Source: lib\Release\*.dll; DestDir: "{app}\Libs" -Flags: ignoreversion; Source: lib\Release\*.lib; DestDir: "{app}\Libs" -Flags: ignoreversion; Source: lib\Release-w\*.dll; DestDir: "{app}\Libs" -Flags: ignoreversion; Source: lib\Release-w\*.lib; DestDir: "{app}\Libs" -Flags: ignoreversion; Source: lib\Release_static\*.lib; DestDir: "{app}\StaticLibs" -Flags: ignoreversion; Source: lib\Release-w_static\*.lib; DestDir: "{app}\StaticLibs" -Flags: ignoreversion; Source: expat.dsw; DestDir: "{app}\Source" -Flags: ignoreversion; Source: win32\README.txt; DestDir: "{app}\Source" -Flags: ignoreversion; Source: bcb5\*.bp*; DestDir: "{app}\Source\bcb5" -Flags: ignoreversion; Source: bcb5\*.mak; DestDir: "{app}\Source\bcb5" -Flags: ignoreversion; Source: bcb5\*.def; DestDir: "{app}\Source\bcb5" -Flags: ignoreversion; Source: bcb5\*.txt; DestDir: "{app}\Source\bcb5" -Flags: ignoreversion; Source: bcb5\*.bat; DestDir: "{app}\Source\bcb5" -Flags: ignoreversion; Source: lib\*.c; DestDir: "{app}\Source\lib" -Flags: ignoreversion; Source: lib\*.h; DestDir: "{app}\Source\lib" -Flags: ignoreversion; Source: lib\*.def; DestDir: "{app}\Source\lib" -Flags: ignoreversion; Source: lib\*.dsp; DestDir: "{app}\Source\lib" -Flags: ignoreversion; Source: examples\*.c; DestDir: "{app}\Source\examples" -Flags: ignoreversion; Source: examples\*.dsp; DestDir: "{app}\Source\examples" -Flags: ignoreversion; Source: tests\*.c; DestDir: "{app}\Source\tests" -Flags: ignoreversion; Source: tests\*.cpp; DestDir: "{app}\Source\tests" -Flags: ignoreversion; Source: tests\*.h; DestDir: "{app}\Source\tests" -Flags: ignoreversion; Source: tests\README.txt; DestDir: "{app}\Source\tests" -Flags: ignoreversion; Source: tests\benchmark\*.c; DestDir: "{app}\Source\tests\benchmark" -Flags: ignoreversion; Source: tests\benchmark\*.ds*; DestDir: "{app}\Source\tests\benchmark" -Flags: ignoreversion; Source: tests\benchmark\README.txt; DestDir: "{app}\Source\tests\benchmark" -Flags: ignoreversion; Source: xmlwf\*.c*; DestDir: "{app}\Source\xmlwf" -Flags: ignoreversion; Source: xmlwf\*.h; DestDir: "{app}\Source\xmlwf" -Flags: ignoreversion; Source: xmlwf\*.dsp; DestDir: "{app}\Source\xmlwf" +Flags: ignoreversion; Source: win32\bin\Release\xmlwf.exe; DestDir: "{app}\Bin" +Flags: ignoreversion; Source: win32\MANIFEST.txt; DestDir: "{app}" +Flags: ignoreversion; Source: Changes; DestDir: "{app}"; DestName: Changes.txt +Flags: ignoreversion; Source: COPYING; DestDir: "{app}"; DestName: COPYING.txt +Flags: ignoreversion; Source: README; DestDir: "{app}"; DestName: README.txt +Flags: ignoreversion; Source: doc\*.html; DestDir: "{app}\Doc" +Flags: ignoreversion; Source: doc\*.css; DestDir: "{app}\Doc" +Flags: ignoreversion; Source: doc\*.png; DestDir: "{app}\Doc" +Flags: ignoreversion; Source: win32\bin\Release\*.dll; DestDir: "{app}\Bin" +Flags: ignoreversion; Source: win32\bin\Release\*.lib; DestDir: "{app}\Bin" +Flags: ignoreversion; Source: expat.dsw; DestDir: "{app}\Source" +Flags: ignoreversion; Source: win32\README.txt; DestDir: "{app}\Source" +Flags: ignoreversion; Source: bcb5\*.bp*; DestDir: "{app}\Source\bcb5" +Flags: ignoreversion; Source: bcb5\*.mak; DestDir: "{app}\Source\bcb5" +Flags: ignoreversion; Source: bcb5\*.def; DestDir: "{app}\Source\bcb5" +Flags: ignoreversion; Source: bcb5\*.txt; DestDir: "{app}\Source\bcb5" +Flags: ignoreversion; Source: bcb5\*.bat; DestDir: "{app}\Source\bcb5" +Flags: ignoreversion; Source: lib\*.c; DestDir: "{app}\Source\lib" +Flags: ignoreversion; Source: lib\*.h; DestDir: "{app}\Source\lib" +Flags: ignoreversion; Source: lib\*.def; DestDir: "{app}\Source\lib" +Flags: ignoreversion; Source: lib\*.dsp; DestDir: "{app}\Source\lib" +Flags: ignoreversion; Source: examples\*.c; DestDir: "{app}\Source\examples" +Flags: ignoreversion; Source: examples\*.dsp; DestDir: "{app}\Source\examples" +Flags: ignoreversion; Source: tests\*.c; DestDir: "{app}\Source\tests" +Flags: ignoreversion; Source: tests\*.cpp; DestDir: "{app}\Source\tests" +Flags: ignoreversion; Source: tests\*.h; DestDir: "{app}\Source\tests" +Flags: ignoreversion; Source: tests\README.txt; DestDir: "{app}\Source\tests" +Flags: ignoreversion; Source: tests\benchmark\*.c; DestDir: "{app}\Source\tests\benchmark" +Flags: ignoreversion; Source: tests\benchmark\*.ds*; DestDir: "{app}\Source\tests\benchmark" +Flags: ignoreversion; Source: tests\benchmark\README.txt; DestDir: "{app}\Source\tests\benchmark" +Flags: ignoreversion; Source: xmlwf\*.c*; DestDir: "{app}\Source\xmlwf" +Flags: ignoreversion; Source: xmlwf\*.h; DestDir: "{app}\Source\xmlwf" +Flags: ignoreversion; Source: xmlwf\*.dsp; DestDir: "{app}\Source\xmlwf" [Messages] WelcomeLabel1=Welcome to the Expat XML Parser Setup Wizard From kwaclaw at users.sourceforge.net Thu May 3 04:15:16 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Wed, 02 May 2007 19:15:16 -0700 Subject: [Expat-checkins] expat/win32 MANIFEST.txt,1.6,1.7 Message-ID: <20070503021517.B774C1E4005@bag.python.org> Update of /cvsroot/expat/expat/win32 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15690 Modified Files: MANIFEST.txt Log Message: Updated with new install directory structure. Index: MANIFEST.txt =================================================================== RCS file: /cvsroot/expat/expat/win32/MANIFEST.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- MANIFEST.txt 26 Dec 2005 19:38:38 -0000 1.6 +++ MANIFEST.txt 3 May 2007 02:15:13 -0000 1.7 @@ -6,24 +6,22 @@ use Expat in their applications. In the list below, is the directory you specified to the installer. - Directory Contents - -------------------------------------------------------------------- - \ The XML well-formedness checker and some general - information files. - - \Doc\ API documentation for developers. + Directory Contents + --------------------------------------------------------------------- + \ Some general information files. - \Libs\ Pre-compiled dynamic libraries for developers. + \Doc\ API documentation for developers. - \StaticLibs\ Pre-compiled static libraries for developers. + \Bin\ Pre-compiled dynamic libraries for developers. + Pre-compiled static libraries for developers (*MT.lib). + The XML well-formedness checker xmlwf. - \Source\ Source code, which may interest some developers, - including a workspace for Microsft Visual C++. - The source code includes the parser, the well- - formedness checker, and a couple of small sample - applications. + \Source\ Source code, which may interest some developers, + including a workspace for Microsft Visual C++. + The source code includes the parser, the well- + formedness checker, and a couple of small sample + applications. - \Source\bcb5\ Project files for Borland C++ Builder 5 and BCC - 5.5. + \Source\bcb5\ Project files for Borland C++ Builder 5 and BCC 5.5. From kwaclaw at users.sourceforge.net Thu May 3 04:22:47 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Wed, 02 May 2007 19:22:47 -0700 Subject: [Expat-checkins] expat/examples elements.dsp, 1.6, 1.7 outline.dsp, 1.4, 1.5 Message-ID: <20070503022248.DA2C21E4005@bag.python.org> Update of /cvsroot/expat/expat/examples In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv18555 Modified Files: elements.dsp outline.dsp Log Message: Changed output directories so that all binaries end up in the same location. Index: elements.dsp =================================================================== RCS file: /cvsroot/expat/expat/examples/elements.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- elements.dsp 30 Sep 2004 02:47:02 -0000 1.6 +++ elements.dsp 3 May 2007 02:22:44 -0000 1.7 @@ -37,8 +37,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "..\win32\bin\Release" +# PROP Intermediate_Dir "..\win32\tmp\Release-elements" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c @@ -51,7 +51,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 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:console /machine:I386 -# ADD LINK32 odbccp32.lib libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\lib\Release_static" +# ADD LINK32 odbccp32.lib libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\win32\bin\Release" !ELSEIF "$(CFG)" == "elements - Win32 Debug" @@ -62,8 +62,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "..\win32\bin\Debug" +# PROP Intermediate_Dir "..\win32\tmp\Debug-elements" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c @@ -75,7 +75,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 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:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 odbccp32.lib libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /libpath:"..\lib\Debug_static" +# ADD LINK32 odbccp32.lib libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /libpath:"..\win32\bin\Debug" !ENDIF Index: outline.dsp =================================================================== RCS file: /cvsroot/expat/expat/examples/outline.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- outline.dsp 30 Sep 2004 02:47:02 -0000 1.4 +++ outline.dsp 3 May 2007 02:22:44 -0000 1.5 @@ -37,8 +37,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "..\win32\bin\Release" +# PROP Intermediate_Dir "..\win32\tmp\Release-outline" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c @@ -62,8 +62,8 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "..\win32\bin\Debug" +# PROP Intermediate_Dir "..\win32\tmp\Debug-outline" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c From kwaclaw at users.sourceforge.net Thu May 3 04:23:19 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Wed, 02 May 2007 19:23:19 -0700 Subject: [Expat-checkins] expat/xmlwf xmlwf.dsp,1.11,1.12 Message-ID: <20070503022321.E349E1E4005@bag.python.org> Update of /cvsroot/expat/expat/xmlwf In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv18939 Modified Files: xmlwf.dsp Log Message: Changed output directories so that all binaries end up in the same location. Index: xmlwf.dsp =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.dsp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- xmlwf.dsp 30 Sep 2004 02:47:03 -0000 1.11 +++ xmlwf.dsp 3 May 2007 02:23:17 -0000 1.12 @@ -37,8 +37,8 @@ # PROP BASE Target_Dir "." # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir ".\Release" -# PROP Intermediate_Dir ".\Release" +# PROP Output_Dir "..\win32\bin\Release" +# PROP Intermediate_Dir "..\win32\tmp\Release-xmlwf" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c @@ -51,7 +51,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:console /machine:I386 -# ADD LINK32 setargv.obj 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:console /pdb:none /machine:I386 /out:"Release\xmlwf.exe" +# ADD LINK32 setargv.obj 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:console /pdb:none /machine:I386 # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "xmlwf - Win32 Debug" @@ -63,8 +63,8 @@ # PROP BASE Target_Dir "." # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir ".\Debug" -# PROP Intermediate_Dir ".\Debug" +# PROP Output_Dir "..\win32\bin\Debug" +# PROP Intermediate_Dir "..\win32\tmp\Debug-xmlwf" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c @@ -77,7 +77,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:console /debug /machine:I386 -# ADD LINK32 setargv.obj 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:console /pdb:none /debug /machine:I386 /out:"Debug\xmlwf.exe" +# ADD LINK32 setargv.obj 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:console /pdb:none /debug /machine:I386 !ENDIF From hartwork at users.sourceforge.net Thu May 3 21:51:10 2007 From: hartwork at users.sourceforge.net (Sebastian Pipping) Date: Thu, 03 May 2007 12:51:10 -0700 Subject: [Expat-checkins] expat/win32 expat.iss,1.22,1.23 Message-ID: <20070503195113.51F5D1E4015@bag.python.org> Update of /cvsroot/expat/expat/win32 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv11040/win32 Modified Files: expat.iss Log Message: VersionInfoVersion added (to avoid "0.0.0.0"), compression set to "lzma/max" Index: expat.iss =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.iss,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- expat.iss 3 May 2007 02:14:30 -0000 1.22 +++ expat.iss 3 May 2007 19:51:08 -0000 1.23 @@ -8,17 +8,19 @@ AppName=Expat AppId=expat AppVersion=2.0.1 -AppVerName=expat 2.0.1 +AppVerName=Expat 2.0.1 AppCopyright=Copyright ? 1998-2006 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers -DefaultDirName={pf}\Expat 2.0.1 AppPublisher=The Expat Developers AppPublisherURL=http://www.libexpat.org/ AppSupportURL=http://www.libexpat.org/ AppUpdatesURL=http://www.libexpat.org/ UninstallDisplayName=Expat XML Parser 2.0.1 +VersionInfoVersion=2.0.1 + +DefaultDirName={pf}\Expat 2.0.1 UninstallFilesDir={app}\Uninstall -Compression=bzip/9 +Compression=lzma/max SourceDir=.. OutputDir=win32 DisableStartupPrompt=yes From hartwork at users.sourceforge.net Thu May 3 21:54:52 2007 From: hartwork at users.sourceforge.net (Sebastian Pipping) Date: Thu, 03 May 2007 12:54:52 -0700 Subject: [Expat-checkins] expat .cvsignore,1.9,1.10 Message-ID: <20070503195454.4FE0A1E4005@bag.python.org> Update of /cvsroot/expat/expat In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12353 Modified Files: .cvsignore Log Message: Ignore .project of Eclipse Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- .cvsignore 11 Jul 2002 18:55:43 -0000 1.9 +++ .cvsignore 3 May 2007 19:54:50 -0000 1.10 @@ -10,3 +10,4 @@ libtool expat.ncb expat.opt +.project From kwaclaw at users.sourceforge.net Fri May 4 02:09:16 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Thu, 03 May 2007 17:09:16 -0700 Subject: [Expat-checkins] expat/win32 expat.iss,1.23,1.24 Message-ID: <20070504000918.EF07B1E4021@bag.python.org> Update of /cvsroot/expat/expat/win32 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12517 Modified Files: expat.iss Log Message: Added SolidCompression flag. Saves another 170KB. Index: expat.iss =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.iss,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- expat.iss 3 May 2007 19:51:08 -0000 1.23 +++ expat.iss 4 May 2007 00:09:11 -0000 1.24 @@ -21,6 +21,7 @@ UninstallFilesDir={app}\Uninstall Compression=lzma/max +SolidCompression=yes SourceDir=.. OutputDir=win32 DisableStartupPrompt=yes From kwaclaw at users.sourceforge.net Fri May 4 02:17:21 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Thu, 03 May 2007 17:17:21 -0700 Subject: [Expat-checkins] expat/win32 README.txt,1.6,1.7 Message-ID: <20070504001723.4BF2A1E4005@bag.python.org> Update of /cvsroot/expat/expat/win32 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15626 Modified Files: README.txt Log Message: Added note about output locations for MS builds. Index: README.txt =================================================================== RCS file: /cvsroot/expat/expat/win32/README.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- README.txt 26 Dec 2005 19:36:21 -0000 1.6 +++ README.txt 4 May 2007 00:17:18 -0000 1.7 @@ -16,6 +16,11 @@ * MS Visual Studio .NET 2002, 2003, 2005: The VC++ 6 workspace file (expat.dsw) and project files (.dsp) can be opened and imported in VS.NET without problems. + +* All MS C/C++ compilers: + The output for all projects will be generated in the win32\bin + directory, intermediate files will be located in project-specific + subdirectories of win32\tmp. * Creating MinGW dynamic libraries from MS VC++ DLLs: From kwaclaw at users.sourceforge.net Fri May 4 02:21:02 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Thu, 03 May 2007 17:21:02 -0700 Subject: [Expat-checkins] expat/win32 expat.iss,1.24,1.25 Message-ID: <20070504002104.00DED1E4006@bag.python.org> Update of /cvsroot/expat/expat/win32 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16834 Modified Files: expat.iss Log Message: Don't need to specify the max option - its the default. Index: expat.iss =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.iss,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- expat.iss 4 May 2007 00:09:11 -0000 1.24 +++ expat.iss 4 May 2007 00:20:59 -0000 1.25 @@ -20,7 +20,7 @@ DefaultDirName={pf}\Expat 2.0.1 UninstallFilesDir={app}\Uninstall -Compression=lzma/max +Compression=lzma SolidCompression=yes SourceDir=.. OutputDir=win32 From kwaclaw at users.sourceforge.net Sat May 5 05:46:31 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Fri, 04 May 2007 20:46:31 -0700 Subject: [Expat-checkins] expat README,1.34,1.35 Message-ID: <20070505034633.D7D221E4006@bag.python.org> Update of /cvsroot/expat/expat In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8507 Modified Files: README Log Message: Added a missing step for the UTF-16 intall. Index: README =================================================================== RCS file: /cvsroot/expat/expat/README,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- README 27 Nov 2006 02:51:57 -0000 1.34 +++ README 5 May 2007 03:46:28 -0000 1.35 @@ -66,7 +66,7 @@ If you are interested in building Expat to provide document information in UTF-16 rather than the default UTF-8, follow these -instructions: +instructions (after having run "make distclean"): 1. For UTF-16 output as unsigned short (and version/error strings as char), run: @@ -93,6 +93,7 @@ Or, to save step 2, run "make buildlib LIBRARY=libexpatw.la". 4. Run "make installlib" (which installs the library only). + Or, if step 2 was omitted, run "make installlib LIBRARY=libexpatw.la". Note for Solaris users: The "ar" command is usually located in "/usr/ccs/bin", which is not in the default PATH. You will need to From kwaclaw at users.sourceforge.net Sat May 5 16:14:02 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Sat, 05 May 2007 07:14:02 -0700 Subject: [Expat-checkins] expat configure.in,1.43,1.44 Message-ID: <20070505141404.CE6D91E4002@bag.python.org> Update of /cvsroot/expat/expat In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25447 Modified Files: configure.in Log Message: Updated version info according to libtool rules. Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- configure.in 27 Nov 2006 02:51:57 -0000 1.43 +++ configure.in 5 May 2007 14:13:59 -0000 1.44 @@ -45,7 +45,7 @@ dnl LIBCURRENT=6 -LIBREVISION=1 +LIBREVISION=2 LIBAGE=5 AC_CONFIG_HEADER(expat_config.h) From kwaclaw at users.sourceforge.net Sat May 5 19:26:41 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Sat, 05 May 2007 10:26:41 -0700 Subject: [Expat-checkins] expat Makefile.in,1.56,1.57 Message-ID: <20070505172644.07EF31E4002@bag.python.org> Update of /cvsroot/expat/expat In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3432 Modified Files: Makefile.in Log Message: Trying to make conditional syntax more cross-platform compatible. See bugs # 1490371, 1613457, 1618673. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- Makefile.in 13 Dec 2006 17:26:07 -0000 1.56 +++ Makefile.in 5 May 2007 17:26:37 -0000 1.57 @@ -44,7 +44,9 @@ APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h LIBRARY = libexpat.la -INSTALL_ROOT ?= $(DESTDIR) +ifeq ($(INSTALL_ROOT),) +INSTALL_ROOT = $(DESTDIR) +endif default: buildlib xmlwf/xmlwf From kwaclaw at users.sourceforge.net Tue May 8 04:25:37 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Mon, 07 May 2007 19:25:37 -0700 Subject: [Expat-checkins] expat/lib xmlparse.c,1.160,1.161 ascii.h,1.4,1.5 Message-ID: <20070508022540.880CF1E4002@bag.python.org> Update of /cvsroot/expat/expat/lib In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28338 Modified Files: xmlparse.c ascii.h Log Message: Replaced all literal references to ASCII characters with macros that explicitly specify a hex code point. This should make it work on EBCDIC systems. Patch provided by Scott Klement for bug #1690883. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.160 retrieving revision 1.161 diff -u -d -r1.160 -r1.161 --- xmlparse.c 6 Sep 2006 14:32:12 -0000 1.160 +++ xmlparse.c 8 May 2007 02:25:35 -0000 1.161 @@ -20,6 +20,7 @@ #include #endif /* ndef COMPILED_FROM_DSP */ +#include "ascii.h" #include "expat.h" #ifdef XML_UNICODE @@ -668,10 +669,12 @@ } static const XML_Char implicitContext[] = { - 'x', 'm', 'l', '=', 'h', 't', 't', 'p', ':', '/', '/', - 'w', 'w', 'w', '.', 'w', '3', '.', 'o', 'r', 'g', '/', - 'X', 'M', 'L', '/', '1', '9', '9', '8', '/', - 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\0' + ASCII_x, ASCII_m, ASCII_l, ASCII_EQUALS, ASCII_h, ASCII_t, ASCII_t, ASCII_p, + ASCII_COLON, ASCII_SLASH, ASCII_SLASH, ASCII_w, ASCII_w, ASCII_w, + ASCII_PERIOD, ASCII_w, ASCII_3, ASCII_PERIOD, ASCII_o, ASCII_r, ASCII_g, + ASCII_SLASH, ASCII_X, ASCII_M, ASCII_L, ASCII_SLASH, ASCII_1, ASCII_9, + ASCII_9, ASCII_8, ASCII_SLASH, ASCII_n, ASCII_a, ASCII_m, ASCII_e, + ASCII_s, ASCII_p, ASCII_a, ASCII_c, ASCII_e, '\0' }; XML_Parser XMLCALL @@ -764,7 +767,7 @@ unknownEncodingHandler = NULL; unknownEncodingHandlerData = NULL; - namespaceSeparator = '!'; + namespaceSeparator = ASCII_EXCL; ns = XML_FALSE; ns_triplets = XML_FALSE; @@ -2815,7 +2818,7 @@ return XML_ERROR_NO_MEMORY; uriHash = CHAR_HASH(uriHash, c); } - while (*s++ != XML_T(':')) + while (*s++ != XML_T(ASCII_COLON)) ; do { /* copies null terminator */ const XML_Char c = *s; @@ -2889,7 +2892,7 @@ if (!binding) return XML_ERROR_UNBOUND_PREFIX; localPart = tagNamePtr->str; - while (*localPart++ != XML_T(':')) + while (*localPart++ != XML_T(ASCII_COLON)) ; } else if (dtd->defaultPrefix.binding) { @@ -2944,17 +2947,21 @@ const XML_Char *uri, BINDING **bindingsPtr) { static const XML_Char xmlNamespace[] = { - 'h', 't', 't', 'p', ':', '/', '/', - 'w', 'w', 'w', '.', 'w', '3', '.', 'o', 'r', 'g', '/', - 'X', 'M', 'L', '/', '1', '9', '9', '8', '/', - 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\0' + ASCII_h, ASCII_t, ASCII_t, ASCII_p, ASCII_COLON, ASCII_SLASH, ASCII_SLASH, + ASCII_w, ASCII_w, ASCII_w, ASCII_PERIOD, ASCII_w, ASCII_3, ASCII_PERIOD, + ASCII_o, ASCII_r, ASCII_g, ASCII_SLASH, ASCII_X, ASCII_M, ASCII_L, + ASCII_SLASH, ASCII_1, ASCII_9, ASCII_9, ASCII_8, ASCII_SLASH, + ASCII_n, ASCII_a, ASCII_m, ASCII_e, ASCII_s, ASCII_p, ASCII_a, ASCII_c, + ASCII_e, '\0' }; static const int xmlLen = (int)sizeof(xmlNamespace)/sizeof(XML_Char) - 1; static const XML_Char xmlnsNamespace[] = { - 'h', 't', 't', 'p', ':', '/', '/', - 'w', 'w', 'w', '.', 'w', '3', '.', 'o', 'r', 'g', '/', - '2', '0', '0', '0', '/', 'x', 'm', 'l', 'n', 's', '/', '\0' + ASCII_h, ASCII_t, ASCII_t, ASCII_p, ASCII_COLON, ASCII_SLASH, ASCII_SLASH, + ASCII_w, ASCII_w, ASCII_w, ASCII_PERIOD, ASCII_w, ASCII_3, ASCII_PERIOD, + ASCII_o, ASCII_r, ASCII_g, ASCII_SLASH, ASCII_2, ASCII_0, ASCII_0, + ASCII_0, ASCII_SLASH, ASCII_x, ASCII_m, ASCII_l, ASCII_n, ASCII_s, + ASCII_SLASH, '\0' }; static const int xmlnsLen = (int)sizeof(xmlnsNamespace)/sizeof(XML_Char) - 1; @@ -2971,13 +2978,13 @@ return XML_ERROR_UNDECLARING_PREFIX; if (prefix->name - && prefix->name[0] == XML_T('x') - && prefix->name[1] == XML_T('m') - && prefix->name[2] == XML_T('l')) { + && prefix->name[0] == XML_T(ASCII_x) + && prefix->name[1] == XML_T(ASCII_m) + && prefix->name[2] == XML_T(ASCII_l)) { /* Not allowed to bind xmlns */ - if (prefix->name[3] == XML_T('n') - && prefix->name[4] == XML_T('s') + if (prefix->name[3] == XML_T(ASCII_n) + && prefix->name[4] == XML_T(ASCII_s) && prefix->name[5] == XML_T('\0')) return XML_ERROR_RESERVED_PREFIX_XMLNS; @@ -3640,23 +3647,27 @@ XML_Bool haveMore) { #ifdef XML_DTD - static const XML_Char externalSubsetName[] = { '#' , '\0' }; + static const XML_Char externalSubsetName[] = { ASCII_HASH , '\0' }; #endif /* XML_DTD */ - static const XML_Char atypeCDATA[] = { 'C', 'D', 'A', 'T', 'A', '\0' }; - static const XML_Char atypeID[] = { 'I', 'D', '\0' }; - static const XML_Char atypeIDREF[] = { 'I', 'D', 'R', 'E', 'F', '\0' }; - static const XML_Char atypeIDREFS[] = { 'I', 'D', 'R', 'E', 'F', 'S', '\0' }; - static const XML_Char atypeENTITY[] = { 'E', 'N', 'T', 'I', 'T', 'Y', '\0' }; - static const XML_Char atypeENTITIES[] = - { 'E', 'N', 'T', 'I', 'T', 'I', 'E', 'S', '\0' }; + static const XML_Char atypeCDATA[] = + { ASCII_C, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' }; + static const XML_Char atypeID[] = { ASCII_I, ASCII_D, '\0' }; + static const XML_Char atypeIDREF[] = + { ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, '\0' }; + static const XML_Char atypeIDREFS[] = + { ASCII_I, ASCII_D, ASCII_R, ASCII_E, ASCII_F, ASCII_S, '\0' }; + static const XML_Char atypeENTITY[] = + { ASCII_E, ASCII_N, ASCII_T, ASCII_I, ASCII_T, ASCII_Y, '\0' }; + static const XML_Char atypeENTITIES[] = { ASCII_E, ASCII_N, + ASCII_T, ASCII_I, ASCII_T, ASCII_I, ASCII_E, ASCII_S, '\0' }; static const XML_Char atypeNMTOKEN[] = { - 'N', 'M', 'T', 'O', 'K', 'E', 'N', '\0' }; - static const XML_Char atypeNMTOKENS[] = { - 'N', 'M', 'T', 'O', 'K', 'E', 'N', 'S', '\0' }; - static const XML_Char notationPrefix[] = { - 'N', 'O', 'T', 'A', 'T', 'I', 'O', 'N', '(', '\0' }; - static const XML_Char enumValueSep[] = { '|', '\0' }; - static const XML_Char enumValueStart[] = { '(', '\0' }; + ASCII_N, ASCII_M, ASCII_T, ASCII_O, ASCII_K, ASCII_E, ASCII_N, '\0' }; + static const XML_Char atypeNMTOKENS[] = { ASCII_N, ASCII_M, ASCII_T, + ASCII_O, ASCII_K, ASCII_E, ASCII_N, ASCII_S, '\0' }; + static const XML_Char notationPrefix[] = { ASCII_N, ASCII_O, ASCII_T, + ASCII_A, ASCII_T, ASCII_I, ASCII_O, ASCII_N, ASCII_LPAREN, '\0' }; + static const XML_Char enumValueSep[] = { ASCII_PIPE, '\0' }; + static const XML_Char enumValueStart[] = { ASCII_LPAREN, '\0' }; /* save one level of indirection */ DTD * const dtd = _dtd; @@ -3962,11 +3973,11 @@ 0, parser)) return XML_ERROR_NO_MEMORY; if (attlistDeclHandler && declAttributeType) { - if (*declAttributeType == XML_T('(') - || (*declAttributeType == XML_T('N') - && declAttributeType[1] == XML_T('O'))) { + if (*declAttributeType == XML_T(ASCII_LPAREN) + || (*declAttributeType == XML_T(ASCII_N) + && declAttributeType[1] == XML_T(ASCII_O))) { /* Enumerated or Notation type */ - if (!poolAppendChar(&tempPool, XML_T(')')) + if (!poolAppendChar(&tempPool, XML_T(ASCII_RPAREN)) || !poolAppendChar(&tempPool, XML_T('\0'))) return XML_ERROR_NO_MEMORY; declAttributeType = tempPool.start; @@ -3999,11 +4010,11 @@ declAttributeIsCdata, XML_FALSE, attVal, parser)) return XML_ERROR_NO_MEMORY; if (attlistDeclHandler && declAttributeType) { - if (*declAttributeType == XML_T('(') - || (*declAttributeType == XML_T('N') - && declAttributeType[1] == XML_T('O'))) { + if (*declAttributeType == XML_T(ASCII_LPAREN) + || (*declAttributeType == XML_T(ASCII_N) + && declAttributeType[1] == XML_T(ASCII_O))) { /* Enumerated or Notation type */ - if (!poolAppendChar(&tempPool, XML_T(')')) + if (!poolAppendChar(&tempPool, XML_T(ASCII_RPAREN)) || !poolAppendChar(&tempPool, XML_T('\0'))) return XML_ERROR_NO_MEMORY; declAttributeType = tempPool.start; @@ -4330,14 +4341,14 @@ } break; case XML_ROLE_GROUP_SEQUENCE: - if (groupConnector[prologState.level] == '|') + if (groupConnector[prologState.level] == ASCII_PIPE) return XML_ERROR_SYNTAX; - groupConnector[prologState.level] = ','; + groupConnector[prologState.level] = ASCII_COMMA; if (dtd->in_eldecl && elementDeclHandler) handleDefault = XML_FALSE; break; case XML_ROLE_GROUP_CHOICE: - if (groupConnector[prologState.level] == ',') + if (groupConnector[prologState.level] == ASCII_COMMA) return XML_ERROR_SYNTAX; if (dtd->in_eldecl && !groupConnector[prologState.level] @@ -4349,7 +4360,7 @@ if (elementDeclHandler) handleDefault = XML_FALSE; } - groupConnector[prologState.level] = '|'; + groupConnector[prologState.level] = ASCII_PIPE; break; case XML_ROLE_PARAM_ENTITY_REF: #ifdef XML_DTD @@ -5279,7 +5290,7 @@ DTD * const dtd = _dtd; /* save one level of indirection */ const XML_Char *name; for (name = elementType->name; *name; name++) { - if (*name == XML_T(':')) { + if (*name == XML_T(ASCII_COLON)) { PREFIX *prefix; const XML_Char *s; for (s = elementType->name; s != name; s++) { @@ -5326,12 +5337,12 @@ poolFinish(&dtd->pool); if (!ns) ; - else if (name[0] == XML_T('x') - && name[1] == XML_T('m') - && name[2] == XML_T('l') - && name[3] == XML_T('n') - && name[4] == XML_T('s') - && (name[5] == XML_T('\0') || name[5] == XML_T(':'))) { + else if (name[0] == XML_T(ASCII_x) + && name[1] == XML_T(ASCII_m) + && name[2] == XML_T(ASCII_l) + && name[3] == XML_T(ASCII_n) + && name[4] == XML_T(ASCII_s) + && (name[5] == XML_T('\0') || name[5] == XML_T(ASCII_COLON))) { if (name[5] == XML_T('\0')) id->prefix = &dtd->defaultPrefix; else @@ -5342,7 +5353,7 @@ int i; for (i = 0; name[i]; i++) { /* attributes without prefix are *not* in the default namespace */ - if (name[i] == XML_T(':')) { + if (name[i] == XML_T(ASCII_COLON)) { int j; for (j = 0; j < i; j++) { if (!poolAppendChar(&dtd->pool, name[j])) @@ -5364,7 +5375,7 @@ return id; } -#define CONTEXT_SEP XML_T('\f') +#define CONTEXT_SEP XML_T(ASCII_FF) static const XML_Char * getContext(XML_Parser parser) @@ -5376,7 +5387,7 @@ if (dtd->defaultPrefix.binding) { int i; int len; - if (!poolAppendChar(&tempPool, XML_T('='))) + if (!poolAppendChar(&tempPool, XML_T(ASCII_EQUALS))) return NULL; len = dtd->defaultPrefix.binding->uriLen; if (namespaceSeparator) @@ -5402,7 +5413,7 @@ for (s = prefix->name; *s; s++) if (!poolAppendChar(&tempPool, *s)) return NULL; - if (!poolAppendChar(&tempPool, XML_T('='))) + if (!poolAppendChar(&tempPool, XML_T(ASCII_EQUALS))) return NULL; len = prefix->binding->uriLen; if (namespaceSeparator) @@ -5454,7 +5465,7 @@ context = s; poolDiscard(&tempPool); } - else if (*s == XML_T('=')) { + else if (*s == XML_T(ASCII_EQUALS)) { PREFIX *prefix; if (poolLength(&tempPool) == 0) prefix = &dtd->defaultPrefix; Index: ascii.h =================================================================== RCS file: /cvsroot/expat/expat/lib/ascii.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ascii.h 12 Nov 2002 21:45:57 -0000 1.4 +++ ascii.h 8 May 2007 02:25:35 -0000 1.5 @@ -83,3 +83,10 @@ #define ASCII_LSQB 0x5B #define ASCII_RSQB 0x5D #define ASCII_UNDERSCORE 0x5F +#define ASCII_LPAREN 0x28 +#define ASCII_RPAREN 0x29 +#define ASCII_FF 0x0C +#define ASCII_SLASH 0x2F +#define ASCII_HASH 0x23 +#define ASCII_PIPE 0x7C +#define ASCII_COMMA 0x2C From kwaclaw at users.sourceforge.net Wed May 9 15:27:05 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Wed, 09 May 2007 06:27:05 -0700 Subject: [Expat-checkins] expat configure.in,1.44,1.45 Message-ID: <20070509132711.305FD1E400C@bag.python.org> Update of /cvsroot/expat/expat In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3852 Modified Files: configure.in Log Message: Fix for issue #1647805 (detecting -fexceptions support doesn't work with Intel compiler). Thanks to Hazael (hmaldonado) for the fix. Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- configure.in 5 May 2007 14:13:59 -0000 1.44 +++ configure.in 9 May 2007 13:26:48 -0000 1.45 @@ -72,8 +72,8 @@ dnl OLDCFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes" CFLAGS="$OLDCFLAGS -fexceptions" - AC_MSG_CHECKING(whether gcc accepts -fexceptions) - AC_TRY_COMPILE(,(void)1, + AC_MSG_CHECKING(whether $CC accepts -fexceptions) + AC_TRY_LINK( , , AC_MSG_RESULT(yes), AC_MSG_RESULT(no); CFLAGS="$OLDCFLAGS") CXXFLAGS=`echo "$CFLAGS" | sed 's/ -Wmissing-prototypes -Wstrict-prototypes//'` From kwaclaw at users.sourceforge.net Wed May 9 20:38:52 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Wed, 09 May 2007 11:38:52 -0700 Subject: [Expat-checkins] expat Makefile.in,1.57,1.58 Message-ID: <20070509183901.8125C1E4011@bag.python.org> Update of /cvsroot/expat/expat In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32380 Modified Files: Makefile.in Log Message: One more patch for bug #1490371. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- Makefile.in 5 May 2007 17:26:37 -0000 1.57 +++ Makefile.in 9 May 2007 18:38:50 -0000 1.58 @@ -44,9 +44,7 @@ APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h LIBRARY = libexpat.la -ifeq ($(INSTALL_ROOT),) -INSTALL_ROOT = $(DESTDIR) -endif +DESTDIR = $(INSTALL_ROOT) default: buildlib xmlwf/xmlwf @@ -78,23 +76,23 @@ tests/runtestspp install: xmlwf/xmlwf installlib - $(mkinstalldirs) $(INSTALL_ROOT)$(bindir) $(INSTALL_ROOT)$(man1dir) - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(INSTALL_ROOT)$(bindir)/xmlwf - $(INSTALL_DATA) $(MANFILE) $(INSTALL_ROOT)$(man1dir) + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(DESTDIR)$(bindir)/xmlwf + $(INSTALL_DATA) $(MANFILE) $(DESTDIR)$(man1dir) installlib: $(LIBRARY) $(APIHEADER) - $(mkinstalldirs) $(INSTALL_ROOT)$(libdir) $(INSTALL_ROOT)$(includedir) - $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(INSTALL_ROOT)$(libdir)/$(LIBRARY) - for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(INSTALL_ROOT)$(includedir) ; done + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY) + for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(DESTDIR)$(includedir) ; done uninstall: uninstalllib - $(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(bindir)/xmlwf - rm -f $(INSTALL_ROOT)$(man1dir)/xmlwf.1 + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/xmlwf + rm -f $(DESTDIR)$(man1dir)/xmlwf.1 uninstalllib: - $(LIBTOOL) --mode=uninstall rm -f $(INSTALL_ROOT)$(libdir)/$(LIBRARY) - rm -f $(INSTALL_ROOT)$(includedir)/expat.h - rm -f $(INSTALL_ROOT)$(includedir)/expat_external.h + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY) + rm -f $(DESTDIR)$(includedir)/expat.h + rm -f $(DESTDIR)$(includedir)/expat_external.h # for VPATH builds (invoked by configure) mkdir-init: From kwaclaw at users.sourceforge.net Fri May 11 18:54:11 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Fri, 11 May 2007 09:54:11 -0700 Subject: [Expat-checkins] expat/lib libexpatw.def, 1.7, 1.8 libexpat.def, 1.7, 1.8 Message-ID: <20070511165414.658E81E4004@bag.python.org> Update of /cvsroot/expat/expat/lib In directory sc8-pr-cvs17:/tmp/cvs-serv7528 Modified Files: libexpatw.def libexpat.def Log Message: Fix for issue #1717322. Removed deprecated comment and fixed library name. Index: libexpatw.def =================================================================== RCS file: /cvsroot/expat/expat/lib/libexpatw.def,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- libexpatw.def 7 Apr 2006 20:54:55 -0000 1.7 +++ libexpatw.def 11 May 2007 16:54:09 -0000 1.8 @@ -1,5 +1,4 @@ -; DEF file for MS VC++ -LIBRARY LIBEXPATW +LIBRARY EXPORTS XML_DefaultCurrent @1 XML_ErrorString @2 Index: libexpat.def =================================================================== RCS file: /cvsroot/expat/expat/lib/libexpat.def,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- libexpat.def 7 Apr 2006 20:54:55 -0000 1.7 +++ libexpat.def 11 May 2007 16:54:09 -0000 1.8 @@ -1,5 +1,4 @@ -; DEF file for MS VC++ -LIBRARY LIBEXPAT +LIBRARY EXPORTS XML_DefaultCurrent @1 XML_ErrorString @2 From kwaclaw at users.sourceforge.net Fri May 11 19:20:27 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Fri, 11 May 2007 10:20:27 -0700 Subject: [Expat-checkins] expat/lib libexpat.def, 1.8, 1.9 libexpatw.def, 1.8, 1.9 Message-ID: <20070511172029.924291E4005@bag.python.org> Update of /cvsroot/expat/expat/lib In directory sc8-pr-cvs17:/tmp/cvs-serv18044 Modified Files: libexpat.def libexpatw.def Log Message: Removing the comment was actually not necessary. Index: libexpat.def =================================================================== RCS file: /cvsroot/expat/expat/lib/libexpat.def,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- libexpat.def 11 May 2007 16:54:09 -0000 1.8 +++ libexpat.def 11 May 2007 17:20:24 -0000 1.9 @@ -1,3 +1,5 @@ +; DEF file for MS VC++ + LIBRARY EXPORTS XML_DefaultCurrent @1 Index: libexpatw.def =================================================================== RCS file: /cvsroot/expat/expat/lib/libexpatw.def,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- libexpatw.def 11 May 2007 16:54:09 -0000 1.8 +++ libexpatw.def 11 May 2007 17:20:24 -0000 1.9 @@ -1,3 +1,5 @@ +; DEF file for MS VC++ + LIBRARY EXPORTS XML_DefaultCurrent @1 From kwaclaw at users.sourceforge.net Fri May 11 20:30:20 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Fri, 11 May 2007 11:30:20 -0700 Subject: [Expat-checkins] expat README,1.35,1.36 Message-ID: <20070511183022.329E11E4005@bag.python.org> Update of /cvsroot/expat/expat In directory sc8-pr-cvs17:/tmp/cvs-serv14364 Modified Files: README Log Message: Added section about using DESTDIR and INSTALL_ROOT. Index: README =================================================================== RCS file: /cvsroot/expat/expat/README,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- README 5 May 2007 03:46:28 -0000 1.35 +++ README 11 May 2007 18:30:17 -0000 1.36 @@ -94,6 +94,19 @@ 4. Run "make installlib" (which installs the library only). Or, if step 2 was omitted, run "make installlib LIBRARY=libexpatw.la". + +Using DESTDIR or INSTALL_ROOT is enabled, with INSTALL_ROOT being the default +value for DESTDIR, and the rest of the make file using only DESTDIR. +It works as follows: + $ make install DESTDIR=/path/to/image +overrides the in-makefile set DESTDIR, while both + $ INSTALL_ROOT=/path/to/image make install + $ make install INSTALL_ROOT=/path/to/image +use DESTDIR=$(INSTALL_ROOT), even if DESTDIR eventually is defined in the +environment, because variable-setting priority is +1) commandline +2) in-makefile +3) environment Note for Solaris users: The "ar" command is usually located in "/usr/ccs/bin", which is not in the default PATH. You will need to From kwaclaw at users.sourceforge.net Mon May 14 19:49:22 2007 From: kwaclaw at users.sourceforge.net (Karl Waclawek) Date: Mon, 14 May 2007 10:49:22 -0700 Subject: [Expat-checkins] expat Changes,1.52,1.53 Message-ID: <20070514174924.86D101E4009@bag.python.org> Update of /cvsroot/expat/expat In directory sc8-pr-cvs17:/tmp/cvs-serv18610 Modified Files: Changes Log Message: Added references to newest patches and fixes. Index: Changes =================================================================== RCS file: /cvsroot/expat/expat/Changes,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- Changes 27 Nov 2006 03:05:20 -0000 1.52 +++ Changes 14 May 2007 17:49:19 -0000 1.53 @@ -1,15 +1,20 @@ Release 2.0.1 - - Fixed bug #1515266: The character data handler's calling of - XML_StopParser() was not handled properly; if the parser was + - Fixed bugs #1515266, 1515600: The character data handler's calling + of XML_StopParser() was not handled properly; if the parser was stopped and the handler set to NULL, the parser would segfault. + - Fixed bug #1690883: Expat failed on EBCDIC systems as it assumed + some character constants to be ASCII encoded. - Minor cleanups of the test harness. - Fixed xmlwf bug #1513566: "out of memory" error on file size zero. - Fixed outline.c bug #1543233: missing a final XML_ParserFree() call. - Fixes and improvements for Windows platform: - bugs #1409451, #1476160, 1548182, 1602769. + bugs #1409451, #1476160, 1548182, 1602769, 1717322. - Build fixes for various platforms: HP-UX, Tru64, Solaris 9: patch #1437840, bug #1196180. All Unix: #1554618 (refreshed config.sub/config.guess). + #1490371, #1613457: support both, DESTDIR and INSTALL_ROOT, + without relying on GNU-Make specific features. + #1647805: Patched configure.in to work better with Intel compiler. - Fixes to Makefile.in to have make check work correctly: bugs #1408143, #1535603, #1536684. - Added Open Watcom support: patch #1523242.