From: <vac...@us...> - 2009-04-27 18:43:10
|
Revision: 140 http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=140&view=rev Author: vaclavslavik Date: 2009-04-27 18:43:00 +0000 (Mon, 27 Apr 2009) Log Message: ----------- added Bakefile-generated VC++ projects; changed VC6 project file to be generated too Modified Paths: -------------- trunk/Makefile.am trunk/NEWS trunk/README Added Paths: ----------- trunk/platform/Win32/Bakefiles.bkgen trunk/platform/Win32/README trunk/platform/Win32/xmlwrapp.bkl Removed Paths: ------------- trunk/platform/Win32/xmlwrapp.dsp trunk/platform/Win32/xmlwrapp.dsw Property Changed: ---------------- trunk/platform/Win32/ Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2009-04-17 13:07:32 UTC (rev 139) +++ trunk/Makefile.am 2009-04-27 18:43:00 UTC (rev 140) @@ -11,5 +11,13 @@ bin_SCRIPTS = xmlwrapp-config -EXTRA_DIST = LICENSE bootstrap \ - $(srcdir)/platform/Win32/*.dsp $(srcdir)/platform/Win32/*.dsw +EXTRA_DIST = \ + LICENSE bootstrap \ + $(srcdir)/platform/Win32/README \ + $(srcdir)/platform/Win32/*.dsp \ + $(srcdir)/platform/Win32/Bakefiles.bkgen \ + $(srcdir)/platform/Win32/*.bkl + +dist-hook: + (cd $(distdir)/platform/Win32 ; bakefile_gen) + rm -f $(distdir)/platform/Win32/.bakefile_gen.state Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2009-04-17 13:07:32 UTC (rev 139) +++ trunk/NEWS 2009-04-27 18:43:00 UTC (rev 140) @@ -1,3 +1,5 @@ + Added Visual C++ 200x projects and fixed VC6 project. + Version 0.6.0 Fixed libxmlwrapp to not depend on libxslt if XSLT support Modified: trunk/README =================================================================== --- trunk/README 2009-04-17 13:07:32 UTC (rev 139) +++ trunk/README 2009-04-27 18:43:00 UTC (rev 140) @@ -25,7 +25,9 @@ ---------------------- At this time, only building with Visual C++ compiler is supported. The required -project files are located in platform/Win32 directory. +project files are located in platform/Win32 directory. You will need libxml +and libxslt libraries built for Windows, e.g. the binaries from +http://www.zlatkovic.com/libxml.en.html. 4. Using xmlwrapp Property changes on: trunk/platform/Win32 ___________________________________________________________________ Added: svn:ignore + Debug Release xmlwrapp_vc?_xmlwrapp.vcproj* xmlwrapp_vc?_xsltwrapp.vcproj* xmlwrapp_vc?.sln *.ncb *.suo .bakefile_gen.state Added: trunk/platform/Win32/Bakefiles.bkgen =================================================================== --- trunk/platform/Win32/Bakefiles.bkgen (rev 0) +++ trunk/platform/Win32/Bakefiles.bkgen 2009-04-27 18:43:00 UTC (rev 140) @@ -0,0 +1,23 @@ +<?xml version="1.0" ?> + +<bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen"> + + <input> + xmlwrapp.bkl + </input> + + <add-formats> + msvc6prj,msvs2003prj,msvs2005prj,msvs2008prj + </add-formats> + + <add-flags formats="msvs2003prj"> + -o $(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc7.sln + </add-flags> + <add-flags formats="msvs2005prj"> + -o $(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc8.sln + </add-flags> + <add-flags formats="msvs2008prj"> + -o $(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc9.sln + </add-flags> + +</bakefile-gen> Added: trunk/platform/Win32/README =================================================================== --- trunk/platform/Win32/README (rev 0) +++ trunk/platform/Win32/README 2009-04-27 18:43:00 UTC (rev 140) @@ -0,0 +1,3 @@ + +Please use Bakefile (http://www.bakefile.org) to generate Visual C++ project +files. Added: trunk/platform/Win32/xmlwrapp.bkl =================================================================== --- trunk/platform/Win32/xmlwrapp.bkl (rev 0) +++ trunk/platform/Win32/xmlwrapp.bkl 2009-04-27 18:43:00 UTC (rev 140) @@ -0,0 +1,66 @@ +<?xml version="1.0" ?> + +<makefile> + <set-srcdir>../..</set-srcdir> + + <include file="presets/simple.bkl"/> + + <template id="xmlwrapp_lib" template="simple"> + </template> + + + <lib id="xmlwrapp" template="xmlwrapp_lib"> + <headers> + include/xmlwrapp/attributes.h + include/xmlwrapp/_cbfo.h + include/xmlwrapp/document.h + include/xmlwrapp/event_parser.h + include/xmlwrapp/init.h + include/xmlwrapp/node.h + include/xmlwrapp/nodes_view.h + include/xmlwrapp/tree_parser.h + include/xmlwrapp/xmlwrapp.h + + <!-- private headers --> + src/libxml/ait_impl.h + src/libxml/dtd_impl.h + src/libxml/node_iterator.h + src/libxml/node_manip.h + src/libxml/pimpl_base.h + src/libxml/utility.h + </headers> + + <sources> + src/libxml/ait_impl.cxx + src/libxml/attributes.cxx + src/libxml/document.cxx + src/libxml/dtd_impl.cxx + src/libxml/event_parser.cxx + src/libxml/init.cxx + src/libxml/node.cxx + src/libxml/node_iterator.cxx + src/libxml/node_manip.cxx + src/libxml/nodes_view.cxx + src/libxml/tree_parser.cxx + src/libxml/utility.cxx + </sources> + </lib> + + + <lib id="xsltwrapp" template="xmlwrapp_lib"> + <headers> + include/xsltwrapp/init.h + include/xsltwrapp/stylesheet.h + include/xsltwrapp/xsltwrapp.h + + <!-- private headers --> + src/libxslt/result.h + </headers> + + <sources> + src/libxslt/init.cxx + src/libxslt/stylesheet.cxx + </sources> + </lib> + +</makefile> Deleted: trunk/platform/Win32/xmlwrapp.dsp =================================================================== --- trunk/platform/Win32/xmlwrapp.dsp 2009-04-17 13:07:32 UTC (rev 139) +++ trunk/platform/Win32/xmlwrapp.dsp 2009-04-27 18:43:00 UTC (rev 140) @@ -1,172 +0,0 @@ -# Microsoft Developer Studio Project File - Name="xmlwrapp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=xmlwrapp - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "xmlwrapp.mak". -!MESSAGE -!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 "xmlwrapp.mak" CFG="xmlwrapp - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "xmlwrapp - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "xmlwrapp - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "xmlwrapp - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# 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 "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /I../../include /I..\..\..\libxml2-2.4.30.win32\include /I..\..\..\iconv-1.8.win32\include /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "xmlwrapp - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# 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 "Debug" -# PROP Intermediate_Dir "Debug" -# 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 /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /I../../include /I../../../libxml2-2.4.30.win32\include /I../../../iconv-1.8.win32\include /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "xmlwrapp - Win32 Release" -# Name "xmlwrapp - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\src\libxml\ait_impl.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\libxml\attributes.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\libxml\document.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\libxml\dtd_impl.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\libxml\event_parser.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\libxml\init.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\libxml\node.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\libxml\nodes_view.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\libxml\node_iterator.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\libxml\node_iterator.h -# End Source File -# Begin Source File - -SOURCE=..\..\src\libxml\tree_parser.cxx -# End Source File -# Begin Source File - -SOURCE=..\..\src\libxml\utility.cxx -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\include\xmlwrapp\attributes.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\xmlwrapp\document.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\xmlwrapp\event_parser.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\xmlwrapp\init.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\xmlwrapp\node.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\xmlwrapp\nodes_view.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\xmlwrapp\tree_parser.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\xmlwrapp\xmlwrapp.h -# End Source File -# End Group -# End Target -# End Project Deleted: trunk/platform/Win32/xmlwrapp.dsw =================================================================== --- trunk/platform/Win32/xmlwrapp.dsw 2009-04-17 13:07:32 UTC (rev 139) +++ trunk/platform/Win32/xmlwrapp.dsw 2009-04-27 18:43:00 UTC (rev 140) @@ -1,74 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "example event parser"=".\example_event_parser.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmlwrapp - End Project Dependency -}}} - -############################################################################### - -Project: "example tree parser"=".\example_tree_parser.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmlwrapp - End Project Dependency -}}} - -############################################################################### - -Project: "example xml generation"=".\example_xml_generation.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name xmlwrapp - End Project Dependency -}}} - -############################################################################### - -Project: "xmlwrapp"=".\xmlwrapp.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |