diff --git a/Arabica.dsw b/Arabica.dsw index 9a904b41..ae1d839d 100644 --- a/Arabica.dsw +++ b/Arabica.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "DOM"=.\DOM\DOM.dsp - Package Owner=<4> +Project: "ArabicaLib"=.\SAX\SAX.dsp - Package Owner=<4> Package=<5> {{{ @@ -15,7 +15,7 @@ Package=<4> ############################################################################### -Project: "DOMWriter"=.\EXAMPLES\SAX2DOM\DOMWriter.dsp - Package Owner=<4> +Project: "example_DOMWriter"=.\EXAMPLES\SAX2DOM\DOMWriter.dsp - Package Owner=<4> Package=<5> {{{ @@ -24,16 +24,13 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name SAXlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name XML + Project_Dep_Name ArabicaLib End Project Dependency }}} ############################################################################### -Project: "SAX2DOM_test"=.\EXAMPLES\SAX2DOM\SAX2DOM_test.dsp - Package Owner=<4> +Project: "example_SAX2DOMTests"=.\EXAMPLES\SAX2DOM\SAX2DOM_test.dsp - Package Owner=<4> Package=<5> {{{ @@ -42,16 +39,13 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name DOM - End Project Dependency - Begin Project Dependency - Project_Dep_Name SAXlib + Project_Dep_Name ArabicaLib End Project Dependency }}} ############################################################################### -Project: "SAXlib"=.\SAX\SAX.dsp - Package Owner=<4> +Project: "example_SAXPyx"=.\examples\SAX\pyx.dsp - Package Owner=<4> Package=<5> {{{ @@ -60,13 +54,13 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name Utilities + Project_Dep_Name ArabicaLib End Project Dependency }}} ############################################################################### -Project: "SimpleHandler"=.\examples\SAX\SimpleHandler.dsp - Package Owner=<4> +Project: "example_SAXSimpleHandler"=.\examples\SAX\SimpleHandler.dsp - Package Owner=<4> Package=<5> {{{ @@ -75,28 +69,13 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name SAXlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name Utilities + Project_Dep_Name ArabicaLib End Project Dependency }}} ############################################################################### -Project: "Utilities"=.\Utils\Utilities.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "Writer"=.\EXAMPLES\SAX\Writer.dsp - Package Owner=<4> +Project: "example_SAXWriter"=.\EXAMPLES\SAX\Writer.dsp - Package Owner=<4> Package=<5> {{{ @@ -105,25 +84,13 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name SAXlib + Project_Dep_Name ArabicaLib End Project Dependency }}} ############################################################################### -Project: "XML"=.\XML\XML.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "pyx"=.\examples\SAX\pyx.dsp - Package Owner=<4> +Project: "example_UtilsTranscode"=.\EXAMPLES\UTILS\transcode.dsp - Package Owner=<4> Package=<5> {{{ @@ -132,7 +99,7 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name SAXlib + Project_Dep_Name ArabicaLib End Project Dependency }}} diff --git a/Arabica.sln b/Arabica.sln index e5723f76..92de4418 100644 --- a/Arabica.sln +++ b/Arabica.sln @@ -11,6 +11,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOMWriter", "exampl EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_UtilsTranscode", "examples\Utils\transcode.vcproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX2DOMTests", "examples\SAX2DOM\SAX2DOM_test.vcproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}" +EndProject Global GlobalSection(SolutionConfiguration) = preSolution ConfigName.0 = Debug @@ -48,6 +50,10 @@ Global {436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug.Build.0 = Debug|Win32 {436B423B-BF20-4B2E-A187-604AF391FBE2}.Release.ActiveCfg = Release|Win32 {436B423B-BF20-4B2E-A187-604AF391FBE2}.Release.Build.0 = Release|Win32 + {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug.ActiveCfg = Debug|Win32 + {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug.Build.0 = Debug|Win32 + {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release.ActiveCfg = Release|Win32 + {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/SAX/SAX.dsp b/SAX/SAX.dsp index 162c2922..ca079dea 100644 --- a/SAX/SAX.dsp +++ b/SAX/SAX.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="SAXlib" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="ArabicaLib" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=SAXlib - Win32 Debug +CFG=ArabicaLib - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=SAXlib - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "SAX.mak" CFG="SAXlib - Win32 Debug" +!MESSAGE NMAKE /f "SAX.mak" CFG="ArabicaLib - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "SAXlib - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "SAXlib - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "ArabicaLib - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "ArabicaLib - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=SAXlib - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "SAXlib - Win32 Release" +!IF "$(CFG)" == "ArabicaLib - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -49,9 +49,9 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"..\lib\Arabica.lib" -!ELSEIF "$(CFG)" == "SAXlib - Win32 Debug" +!ELSEIF "$(CFG)" == "ArabicaLib - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -72,14 +72,14 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"..\lib\Arabica.lib" !ENDIF # Begin Target -# Name "SAXlib - Win32 Release" -# Name "SAXlib - Win32 Debug" +# Name "ArabicaLib - Win32 Release" +# Name "ArabicaLib - Win32 Debug" # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" @@ -303,11 +303,162 @@ SOURCE=.\filter\Writer.h SOURCE=.\parsers\saxgarden.h # End Source File # End Group +# Begin Group "Utils" + +# PROP Default_Filter "" +# Begin Group "impl" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\Utils\impl\codecvt_specialisations.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\impl\iso88591_utf8.cpp +# End Source File +# Begin Source File + +SOURCE=..\Utils\impl\iso88591_utf8.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\impl\ucs2_utf16.cpp +# End Source File +# Begin Source File + +SOURCE=..\Utils\impl\ucs2_utf16.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\impl\ucs2_utf8.cpp +# End Source File +# Begin Source File + +SOURCE=..\Utils\impl\ucs2_utf8.h +# End Source File +# End Group +# Begin Source File + +SOURCE=..\Utils\base64codecvt.cpp +# End Source File +# Begin Source File + +SOURCE=..\Utils\base64codecvt.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\convert_adaptor.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\convertstream.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\iso88591utf8codecvt.cpp +# End Source File +# Begin Source File + +SOURCE=..\Utils\iso88591utf8codecvt.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\rot13codecvt.cpp +# End Source File +# Begin Source File + +SOURCE=..\Utils\rot13codecvt.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\socket_stream.h +# End Source File +# Begin Source File + +SOURCE=..\XML\UnicodeCharacters.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\utf16beucs2codecvt.cpp +# End Source File +# Begin Source File + +SOURCE=..\Utils\utf16beucs2codecvt.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\utf16leucs2codecvt.cpp +# End Source File +# Begin Source File + +SOURCE=..\Utils\utf16leucs2codecvt.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\utf16utf8codecvt.cpp +# End Source File +# Begin Source File + +SOURCE=..\Utils\utf16utf8codecvt.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\utf8iso88591codecvt.cpp +# End Source File +# Begin Source File + +SOURCE=..\Utils\utf8iso88591codecvt.h +# End Source File +# Begin Source File + +SOURCE=..\Utils\utf8ucs2codecvt.cpp +# End Source File +# Begin Source File + +SOURCE=..\Utils\utf8ucs2codecvt.h +# End Source File +# Begin Source File + +SOURCE=..\XML\XMLCharacterClasses.cpp +# End Source File +# Begin Source File + +SOURCE=..\XML\XMLCharacterClasses.h +# End Source File +# End Group +# Begin Source File + +SOURCE=.\ArabicaConfig.S + +!IF "$(CFG)" == "ArabicaLib - Win32 Release" + +# Begin Custom Build +InputPath=.\ArabicaConfig.S + +"ArabicaConfig.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /TC /EP ArabicaConfig.S > ArabicaConfig.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "ArabicaLib - Win32 Debug" + +# Begin Custom Build +InputPath=.\ArabicaConfig.S + +"ArabicaConfig.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cl /TC /EP ArabicaConfig.S > ArabicaConfig.h + +# End Custom Build + +!ENDIF + +# End Source File # Begin Source File SOURCE=.\ParserConfig.S -!IF "$(CFG)" == "SAXlib - Win32 Release" +!IF "$(CFG)" == "ArabicaLib - Win32 Release" # Begin Custom Build InputPath=.\ParserConfig.S @@ -324,15 +475,15 @@ BuildCmds= \ $(BuildCmds) # End Custom Build -!ELSEIF "$(CFG)" == "SAXlib - Win32 Debug" +!ELSEIF "$(CFG)" == "ArabicaLib - Win32 Debug" # PROP Ignore_Default_Tool 1 # Begin Custom Build InputPath=.\ParserConfig.S BuildCmds= \ - cl /TC /D USE_XERCES /EP ParserConfig.S > ParserConfig.h \ - cl /TC /D USE_XERCES /EP saxlib.S > saxlib.cpp \ + cl /TC /D USE_MSXML /EP ParserConfig.S > ParserConfig.h \ + cl /TC /D USE_MSXML /EP saxlib.S > saxlib.cpp \ "ParserConfig.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" diff --git a/SAX/SAX.vcproj b/SAX/SAX.vcproj index 37981856..43ab2d48 100644 --- a/SAX/SAX.vcproj +++ b/SAX/SAX.vcproj @@ -281,9 +281,6 @@ - - @@ -446,6 +444,9 @@ cl /TC /D USE_MSXML /EP saxlib.S > saxlib.cpp + + diff --git a/SAX/filter/Writer.h b/SAX/filter/Writer.h index e25e323d..aaad8225 100644 --- a/SAX/filter/Writer.h +++ b/SAX/filter/Writer.h @@ -24,6 +24,7 @@ class basic_Writer : public basic_XMLFilterImpl, typedef std::basic_ostream ostreamT; typedef basic_XMLReader XMLReaderT; typedef basic_XMLFilterImpl XMLFilterT; + typedef typename basic_XMLFilterImpl::AttributesT AttributesT; typedef Unicode UnicodeT; private: typedef basic_LexicalHandler LexicalHandlerT; @@ -56,7 +57,7 @@ class basic_Writer : public basic_XMLFilterImpl, virtual void endDocument(); virtual void startElement(const stringT& namespaceURI, const stringT& localName, - const stringT& qName, const typename XMLFilterT::AttributesT& atts); + const stringT& qName, const AttributesT& atts); virtual void endElement(const stringT& namespaceURI, const stringT& localName, const stringT& qName); @@ -193,7 +194,7 @@ void basic_Writer::endDocument() template void basic_Writer::startElement( const stringT& namespaceURI, const stringT& localName, - const stringT& qName, const typename XMLFilterT::AttributesT& atts) + const stringT& qName, const AttributesT& atts) { doIndent(); *stream_ << UnicodeT::LESS_THAN_SIGN << (!qName.empty() ? qName : localName); diff --git a/SAX/wrappers/saxmsxml2.h b/SAX/wrappers/saxmsxml2.h index b4c025d7..ba1fe200 100644 --- a/SAX/wrappers/saxmsxml2.h +++ b/SAX/wrappers/saxmsxml2.h @@ -844,7 +844,6 @@ msxml2_wrapper::msxml2_wrapper() reader_->putContentHandler(&contentHandler_); reader_->putErrorHandler(&errorHandler_); reader_->putDTDHandler(&dtdHandler_); - std::cerr << "MSXML Wrapper handlers registered" << std::endl << std::flush; VARIANT wrapper; wrapper.vt = VT_UNKNOWN; @@ -852,8 +851,6 @@ msxml2_wrapper::msxml2_wrapper() reader_->putProperty(L"http://xml.org/sax/properties/lexical-handler", wrapper); wrapper.punkVal = static_cast(&declHandler_); reader_->putProperty(L"http://xml.org/sax/properties/declaration-handler", wrapper); - - std::cerr << "MSXML Wrapper initialized" << std::endl << std::flush; } // msxml2_wrapper template diff --git a/Utils/base64codecvt.h b/Utils/base64codecvt.h index 03bef8c4..79a1935b 100644 --- a/Utils/base64codecvt.h +++ b/Utils/base64codecvt.h @@ -7,6 +7,7 @@ /////////////////////////////////////////// #include +#include #ifdef ARABICA_VS6_WORKAROUND namespace std { diff --git a/Utils/convert_adaptor.h b/Utils/convert_adaptor.h index 7cc08f32..1aa49b18 100644 --- a/Utils/convert_adaptor.h +++ b/Utils/convert_adaptor.h @@ -19,7 +19,11 @@ #include #include +#include #ifdef ARABICA_VS6_WORKAROUND +namespace std { + typedef ::mbstate_t mbstate_t; +} #include #endif @@ -137,9 +141,9 @@ bool convert_bufadaptor::flushOu bool ok(true); const std::codecvt& cvt = #ifndef ARABICA_VS6_WORKAROUND - std::use_facet >(this->getloc()); + std::use_facet >(this->getloc()); #else - std::use_facet(this->getloc(), (std::codecvt*)0, true); + std::use_facet(this->getloc(), (std::codecvt*)0, true); #endif if(cvt.always_noconv()) @@ -193,9 +197,9 @@ std::streamsize convert_bufadaptor& cvt = #ifndef ARABICA_VS6_WORKAROUND - std::use_facet >(this->getloc()); + std::use_facet >(this->getloc()); #else - std::use_facet(this->getloc(), (std::codecvt*)0, true); + std::use_facet(this->getloc(), (std::codecvt*)0, true); #endif std::vector from(inBuffer_.capacity()); diff --git a/Utils/rot13codecvt.cpp b/Utils/rot13codecvt.cpp index e2adeef6..ef3100d3 100644 --- a/Utils/rot13codecvt.cpp +++ b/Utils/rot13codecvt.cpp @@ -5,6 +5,12 @@ /////////////////////////////////////////// #include "rot13codecvt.h" +#ifdef ARABICA_VS6_WORKAROUND +namespace std { +template +T max(T a, T b) { return a > b ? a : b; } +} +#endif static unsigned char table[]={0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,78,79,80,81,82,83,84,85,86,87,88,89,90,65,66,67,68,69,70,71,72,73,74,75,76,77,91,92,93,94,95,96,110,111,112,113,114,115,116,117,118,119,120,121,122,97,98,99,100,101,102,103,104,105,106,107,108,109,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255}; @@ -24,7 +30,7 @@ std::codecvt_base::result rot13codecvt::rot13(const char* from, return (from_next == from_end) ? std::codecvt_base::ok : std::codecvt_base::partial; } // rot13 -std::codecvt_base::result rot13codecvt::do_unshift(state_t& state, +std::codecvt_base::result rot13codecvt::do_unshift(std::mbstate_t& state, char* to, char* /* to_limit */, char*& to_next) const @@ -33,7 +39,7 @@ std::codecvt_base::result rot13codecvt::do_unshift(state_t& state, return codecvt_base::ok; } // do_unshift -int rot13codecvt::do_length(const state_t&, +int rot13codecvt::do_length(const std::mbstate_t&, const char* from, const char* end, size_t max) const diff --git a/Utils/rot13codecvt.h b/Utils/rot13codecvt.h index 9841a1d4..a88d365a 100644 --- a/Utils/rot13codecvt.h +++ b/Utils/rot13codecvt.h @@ -7,16 +7,20 @@ /////////////////////////////////////////// #include +#include +#ifdef ARABICA_VS6_WORKAROUND +namespace std { + typedef ::mbstate_t mbstate_t; +} +#endif -class rot13codecvt : public std::codecvt::state_type> + +class rot13codecvt : public std::codecvt { -public: - typedef std::char_traits::state_type state_t; - protected: virtual ~rot13codecvt() { } - virtual result do_out(state_t& state, + virtual result do_out(std::mbstate_t& state, const char* from, const char* from_end, const char*& from_next, @@ -25,7 +29,7 @@ protected: char*& to_next) const { return rot13(from, from_end, from_next, to, to_limit, to_next); } - virtual result do_in(state_t& state, + virtual result do_in(std::mbstate_t& state, const char* from, const char* from_end, const char*& from_next, @@ -34,7 +38,7 @@ protected: char*& to_next) const { return rot13(from, from_end, from_next, to, to_limit, to_next); } - virtual result do_unshift(state_t& state, + virtual result do_unshift(std::mbstate_t& state, char* to, char* to_limit, char*& to_next) const; @@ -43,7 +47,7 @@ protected: virtual bool do_always_noconv() const throw() { return false; } - virtual int do_length(const state_t&, + virtual int do_length(const std::mbstate_t&, const char* from, const char* end, size_t max) const; diff --git a/Utils/utf16beucs2codecvt.cpp b/Utils/utf16beucs2codecvt.cpp index 4ef26fba..012d4bab 100644 --- a/Utils/utf16beucs2codecvt.cpp +++ b/Utils/utf16beucs2codecvt.cpp @@ -4,6 +4,13 @@ #include "utf16beucs2codecvt.h" #ifndef ARABICA_NO_WCHAR_T #include "impl/ucs2_utf16.h" + +#ifdef ARABICA_VS6_WORKAROUND +namespace std { +template +T max(T a, T b) { return a > b ? a : b; } +} +#endif //--------------------------------------------------------------------------- std::codecvt_base::result utf16beucs2codecvt::do_out(std::mbstate_t& /* state */, diff --git a/Utils/utf16leucs2codecvt.cpp b/Utils/utf16leucs2codecvt.cpp index 44f7ff0d..af42e5ac 100644 --- a/Utils/utf16leucs2codecvt.cpp +++ b/Utils/utf16leucs2codecvt.cpp @@ -4,6 +4,12 @@ #include "utf16leucs2codecvt.h" #ifndef ARABICA_NO_WCHAR_T #include "impl/ucs2_utf16.h" +#ifdef ARABICA_VS6_WORKAROUND +namespace std { +template +T max(T a, T b) { return a > b ? a : b; } +} +#endif //--------------------------------------------------------------------------- std::codecvt_base::result utf16leucs2codecvt::do_out(std::mbstate_t& /* state */, diff --git a/Utils/utf16utf8codecvt.h b/Utils/utf16utf8codecvt.h index 3837b55d..8dc867d1 100644 --- a/Utils/utf16utf8codecvt.h +++ b/Utils/utf16utf8codecvt.h @@ -14,9 +14,12 @@ //--------------------------------------------------------------------------- #include +#include + #ifndef ARABICA_NO_CODECVT_SPECIALISATIONS #include #endif + #ifdef ARABICA_VS6_WORKAROUND namespace std { typedef ::mbstate_t mbstate_t; diff --git a/examples/SAX/SimpleHandler.dsp b/examples/SAX/SimpleHandler.dsp index 70dcacb3..18623b23 100644 --- a/examples/SAX/SimpleHandler.dsp +++ b/examples/SAX/SimpleHandler.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="SimpleHandler" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="example_SAXSimpleHandler" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=SimpleHandler - Win32 Debug +CFG=example_SAXSimpleHandler - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=SimpleHandler - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "SimpleHandler.mak" CFG="SimpleHandler - Win32 Debug" +!MESSAGE NMAKE /f "SimpleHandler.mak" CFG="example_SAXSimpleHandler - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "SimpleHandler - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "SimpleHandler - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "example_SAXSimpleHandler - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "example_SAXSimpleHandler - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=SimpleHandler - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "SimpleHandler - Win32 Release" +!IF "$(CFG)" == "example_SAXSimpleHandler - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -37,11 +37,11 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\bin" +# PROP Output_Dir "..\..\bin" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GR /GX /O2 /I "..\SAX" /I "..\SAXExpat" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GR /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +51,7 @@ 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 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 -!ELSEIF "$(CFG)" == "SimpleHandler - Win32 Debug" +!ELSEIF "$(CFG)" == "example_SAXSimpleHandler - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -80,8 +80,8 @@ LINK32=link.exe # Begin Target -# Name "SimpleHandler - Win32 Release" -# Name "SimpleHandler - Win32 Debug" +# Name "example_SAXSimpleHandler - Win32 Release" +# Name "example_SAXSimpleHandler - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -102,5 +102,13 @@ SOURCE=.\wrapper.cpp SOURCE=.\SimpleHandler.h # End Source File # End Group +# Begin Group "Libs" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\lib\Arabica.lib +# End Source File +# End Group # End Target # End Project diff --git a/examples/SAX/Writer.dsp b/examples/SAX/Writer.dsp index 42cabbfc..3fc92dec 100644 --- a/examples/SAX/Writer.dsp +++ b/examples/SAX/Writer.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="Writer" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="example_SAXWriter" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=Writer - Win32 Debug +CFG=example_SAXWriter - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=Writer - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "Writer.mak" CFG="Writer - Win32 Debug" +!MESSAGE NMAKE /f "Writer.mak" CFG="example_SAXWriter - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "Writer - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Writer - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "example_SAXWriter - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "example_SAXWriter - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=Writer - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "Writer - Win32 Release" +!IF "$(CFG)" == "example_SAXWriter - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -37,8 +37,9 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" +# PROP Output_Dir "..\..\bin" # PROP Intermediate_Dir "Release" +# 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 # ADD CPP /nologo /W3 /GR /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c @@ -49,9 +50,9 @@ BSC32=bscmake.exe # 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 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /machine:I386 -!ELSEIF "$(CFG)" == "Writer - Win32 Debug" +!ELSEIF "$(CFG)" == "example_SAXWriter - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -73,14 +74,14 @@ BSC32=bscmake.exe # 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 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 wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF # Begin Target -# Name "Writer - Win32 Release" -# Name "Writer - Win32 Debug" +# Name "example_SAXWriter - Win32 Release" +# Name "example_SAXWriter - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -91,10 +92,10 @@ SOURCE=.\writer.cpp # End Group # Begin Group "Libs" -# PROP Default_Filter "lib" +# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\lib\SAX.lib +SOURCE=..\..\lib\Arabica.lib # End Source File # End Group # End Target diff --git a/examples/SAX/pyx.dsp b/examples/SAX/pyx.dsp index 8fea67b8..e9553185 100644 --- a/examples/SAX/pyx.dsp +++ b/examples/SAX/pyx.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="pyx" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="example_SAXPyx" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=pyx - Win32 Debug +CFG=example_SAXPyx - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=pyx - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "pyx.mak" CFG="pyx - Win32 Debug" +!MESSAGE NMAKE /f "pyx.mak" CFG="example_SAXPyx - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "pyx - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "pyx - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "example_SAXPyx - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "example_SAXPyx - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=pyx - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "pyx - Win32 Release" +!IF "$(CFG)" == "example_SAXPyx - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -37,11 +37,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\bin" +# PROP Output_Dir "..\..\bin" # PROP Intermediate_Dir "Release" +# 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 -# ADD CPP /nologo /W3 /GR /GX /O2 /I "..\SAXExpat" /I "..\SAXlibxml" /I "..\SAX" /I "..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GR /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -49,19 +50,19 @@ BSC32=bscmake.exe # 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 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 wsock32.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 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 -!ELSEIF "$(CFG)" == "pyx - Win32 Debug" +!ELSEIF "$(CFG)" == "example_SAXPyx - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "pyx___Win32_Debug" -# PROP BASE Intermediate_Dir "pyx___Win32_Debug" +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\bin" -# PROP Intermediate_Dir "pyx___Win32_Debug" +# PROP Intermediate_Dir "Debug" # 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 @@ -73,14 +74,14 @@ BSC32=bscmake.exe # 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 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 wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\lib" /libpath:"\work\lib\vc6" +# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF # Begin Target -# Name "pyx - Win32 Release" -# Name "pyx - Win32 Debug" +# Name "example_SAXPyx - Win32 Release" +# Name "example_SAXPyx - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -91,10 +92,10 @@ SOURCE=.\pyx.cpp # End Group # Begin Group "Libs" -# PROP Default_Filter "lib" +# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\lib\SAX.lib +SOURCE=..\..\lib\Arabica.lib # End Source File # End Group # End Target diff --git a/examples/SAX2DOM/DOMWriter.dsp b/examples/SAX2DOM/DOMWriter.dsp index 2daf6714..c29e1f94 100644 --- a/examples/SAX2DOM/DOMWriter.dsp +++ b/examples/SAX2DOM/DOMWriter.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="DOMWriter" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="example_DOMWriter" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=DOMWriter - Win32 Debug +CFG=example_DOMWriter - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=DOMWriter - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "DOMWriter.mak" CFG="DOMWriter - Win32 Debug" +!MESSAGE NMAKE /f "DOMWriter.mak" CFG="example_DOMWriter - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "DOMWriter - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "DOMWriter - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "example_DOMWriter - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "example_DOMWriter - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -28,17 +28,17 @@ CFG=DOMWriter - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "DOMWriter - Win32 Release" +!IF "$(CFG)" == "example_DOMWriter - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "DOMWriter___Win32_Release" -# PROP BASE Intermediate_Dir "DOMWriter___Win32_Release" +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "..\..\bin" -# PROP Intermediate_Dir "DOMWriter___Win32_Release" +# PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /W3 /GR /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c @@ -49,23 +49,24 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 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 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 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 -!ELSEIF "$(CFG)" == "DOMWriter - Win32 Debug" +!ELSEIF "$(CFG)" == "example_DOMWriter - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DOMWriter___Win32_Debug" -# PROP BASE Intermediate_Dir "DOMWriter___Win32_Debug" +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "..\..\bin" # PROP Intermediate_Dir "Debug" +# 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 -# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" @@ -73,15 +74,15 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 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 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 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 uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF # Begin Target -# Name "DOMWriter - Win32 Release" -# Name "DOMWriter - Win32 Debug" +# Name "example_DOMWriter - Win32 Release" +# Name "example_DOMWriter - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -90,13 +91,13 @@ LINK32=link.exe SOURCE=.\DOMWriter.cpp # End Source File # End Group +# Begin Group "Libs" + +# PROP Default_Filter "" # Begin Source File -SOURCE=..\..\lib\Utilities.lib -# End Source File -# Begin Source File - -SOURCE=..\..\lib\SAX.lib +SOURCE=..\..\lib\Arabica.lib # End Source File +# End Group # End Target # End Project diff --git a/examples/SAX2DOM/SAX2DOM_test.dsp b/examples/SAX2DOM/SAX2DOM_test.dsp index 0ca27649..33e5e1f2 100644 --- a/examples/SAX2DOM/SAX2DOM_test.dsp +++ b/examples/SAX2DOM/SAX2DOM_test.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="SAX2DOM_test" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="example_SAX2DOMTests" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=SAX2DOM_test - Win32 Debug +CFG=example_SAX2DOMTests - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=SAX2DOM_test - Win32 Debug !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "SAX2DOM_test.mak" CFG="SAX2DOM_test - Win32 Debug" +!MESSAGE NMAKE /f "SAX2DOM_test.mak" CFG="example_SAX2DOMTests - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "SAX2DOM_test - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "SAX2DOM_test - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "example_SAX2DOMTests - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "example_SAX2DOMTests - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=SAX2DOM_test - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "SAX2DOM_test - Win32 Release" +!IF "$(CFG)" == "example_SAX2DOMTests - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -37,11 +37,12 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" +# PROP Output_Dir "..\..\bin" # PROP Intermediate_Dir "Release" +# 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 -# ADD CPP /nologo /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GR /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +52,7 @@ 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 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 -!ELSEIF "$(CFG)" == "SAX2DOM_test - Win32 Debug" +!ELSEIF "$(CFG)" == "example_SAX2DOMTests - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -79,8 +80,8 @@ LINK32=link.exe # Begin Target -# Name "SAX2DOM_test - Win32 Release" -# Name "SAX2DOM_test - Win32 Debug" +# Name "example_SAX2DOMTests - Win32 Release" +# Name "example_SAX2DOMTests - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -225,17 +226,13 @@ SOURCE=.\CppUnit\framework\TestResult.h SOURCE=.\CppUnit\framework\TestSuite.h # End Source File # End Group -# Begin Group "Resource Files" +# Begin Group "Libs" -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\lib\Arabica.lib +# End Source File # End Group -# Begin Source File - -SOURCE=..\..\lib\SAX.lib -# End Source File -# Begin Source File - -SOURCE=..\..\lib\Utilities.lib -# End Source File # End Target # End Project diff --git a/examples/SAX2DOM/SAX2DOM_test.vcproj b/examples/SAX2DOM/SAX2DOM_test.vcproj index 7da72428..c22a644a 100644 --- a/examples/SAX2DOM/SAX2DOM_test.vcproj +++ b/examples/SAX2DOM/SAX2DOM_test.vcproj @@ -3,6 +3,7 @@ ProjectType="Visual C++" Version="7.00" Name="example_SAX2DOMTests" + ProjectGUID="{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}" SccProjectName="" SccLocalPath=""> diff --git a/examples/Utils/transcode.cpp b/examples/Utils/transcode.cpp index 8a505301..a30460d9 100644 --- a/examples/Utils/transcode.cpp +++ b/examples/Utils/transcode.cpp @@ -16,7 +16,7 @@ int main(int argc, const char* argv[]) iconvert_adaptor ia(std::cin); oconvert_adaptor oa(std::cout); - ia.imbue(std::locale(ia.getloc(), new base64codecvt())); + //ia.imbue(std::locale(ia.getloc(), new base64codecvt())); //oa.imbue(std::locale(oa.getloc(), new base64codecvt())); while(ia) {