[Winmerge-svn] SF.net SVN: winmerge:[7375] branches/R2_14/Externals
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2010-10-27 21:25:07
|
Revision: 7375 http://winmerge.svn.sourceforge.net/winmerge/?rev=7375&view=rev Author: kimmov Date: 2010-10-27 21:24:57 +0000 (Wed, 27 Oct 2010) Log Message: ----------- Upgrade SCEW to version 1.1.2. Modified Paths: -------------- branches/R2_14/Externals/scew/AUTHORS branches/R2_14/Externals/scew/COPYING branches/R2_14/Externals/scew/INSTALL branches/R2_14/Externals/scew/Makefile.am branches/R2_14/Externals/scew/NEWS branches/R2_14/Externals/scew/README branches/R2_14/Externals/scew/THANKS branches/R2_14/Externals/scew/doc/Doxyfile.in branches/R2_14/Externals/scew/doc/Makefile.am branches/R2_14/Externals/scew/etc/Makefile.am branches/R2_14/Externals/scew/etc/autoconf/Makefile.am branches/R2_14/Externals/scew/etc/autoconf/doxygen.m4 branches/R2_14/Externals/scew/etc/pkg-config/Makefile.am branches/R2_14/Externals/scew/examples/Makefile.am branches/R2_14/Externals/scew/examples/README branches/R2_14/Externals/scew/examples/scew_print/Makefile.am branches/R2_14/Externals/scew/examples/scew_print/scew_print.c branches/R2_14/Externals/scew/examples/scew_stream/Makefile.am branches/R2_14/Externals/scew/examples/scew_stream/scew_stream.c branches/R2_14/Externals/scew/examples/scew_write/Makefile.am branches/R2_14/Externals/scew/examples/scew_write/scew_write.c branches/R2_14/Externals/scew/scew/Makefile.am branches/R2_14/Externals/scew/scew/attribute.c branches/R2_14/Externals/scew/scew/attribute.h branches/R2_14/Externals/scew/scew/element.c branches/R2_14/Externals/scew/scew/element.h branches/R2_14/Externals/scew/scew/error.c branches/R2_14/Externals/scew/scew/error.h branches/R2_14/Externals/scew/scew/parser.c branches/R2_14/Externals/scew/scew/parser.h branches/R2_14/Externals/scew/scew/scew.h branches/R2_14/Externals/scew/scew/str.c branches/R2_14/Externals/scew/scew/str.h branches/R2_14/Externals/scew/scew/tree.c branches/R2_14/Externals/scew/scew/tree.h branches/R2_14/Externals/scew/scew/writer.c branches/R2_14/Externals/scew/scew/writer.h branches/R2_14/Externals/scew/scew/xattribute.c branches/R2_14/Externals/scew/scew/xattribute.h branches/R2_14/Externals/scew/scew/xelement.h branches/R2_14/Externals/scew/scew/xerror.c branches/R2_14/Externals/scew/scew/xerror.h branches/R2_14/Externals/scew/scew/xparser.c branches/R2_14/Externals/scew/scew/xparser.h branches/R2_14/Externals/scew/win32/Makefile.am branches/R2_14/Externals/scew/win32/scew.vcproj branches/R2_14/Externals/scew/win32/scewX64.vcproj branches/R2_14/Externals/versions.txt Added Paths: ----------- branches/R2_14/Externals/scew/examples/win32/ branches/R2_14/Externals/scew/examples/win32/Makefile.am branches/R2_14/Externals/scew/examples/win32/README.txt branches/R2_14/Externals/scew/examples/win32/scew_examples.sln branches/R2_14/Externals/scew/examples/win32/scew_print/ branches/R2_14/Externals/scew/examples/win32/scew_print/Makefile.am branches/R2_14/Externals/scew/examples/win32/scew_print/scew_print.vcproj branches/R2_14/Externals/scew/examples/win32/scew_stream/ branches/R2_14/Externals/scew/examples/win32/scew_stream/Makefile.am branches/R2_14/Externals/scew/examples/win32/scew_stream/scew_stream.vcproj branches/R2_14/Externals/scew/examples/win32/scew_write/ branches/R2_14/Externals/scew/examples/win32/scew_write/Makefile.am branches/R2_14/Externals/scew/examples/win32/scew_write/scew_write.vcproj branches/R2_14/Externals/scew/tests/ branches/R2_14/Externals/scew/tests/Makefile.am branches/R2_14/Externals/scew/tests/check_attribute.c branches/R2_14/Externals/scew/tests/check_element.c branches/R2_14/Externals/scew/tests/check_list.c branches/R2_14/Externals/scew/tests/check_parser.c branches/R2_14/Externals/scew/tests/check_printer.c branches/R2_14/Externals/scew/tests/check_reader_buffer.c branches/R2_14/Externals/scew/tests/check_reader_file.c branches/R2_14/Externals/scew/tests/check_tree.c branches/R2_14/Externals/scew/tests/check_writer_buffer.c branches/R2_14/Externals/scew/tests/check_writer_file.c branches/R2_14/Externals/scew/tests/data/ branches/R2_14/Externals/scew/tests/data/Makefile.am branches/R2_14/Externals/scew/tests/data/check_reader_file.txt branches/R2_14/Externals/scew/tests/main.c branches/R2_14/Externals/scew/tests/test.h Removed Paths: ------------- branches/R2_14/Externals/scew/ChangeLog branches/R2_14/Externals/scew/INSTALL.WIN32 branches/R2_14/Externals/scew/Makefile.in branches/R2_14/Externals/scew/aclocal.m4 branches/R2_14/Externals/scew/config.h.in branches/R2_14/Externals/scew/configure branches/R2_14/Externals/scew/configure.in branches/R2_14/Externals/scew/depcomp branches/R2_14/Externals/scew/doc/Makefile.in branches/R2_14/Externals/scew/etc/Makefile.in branches/R2_14/Externals/scew/etc/autoconf/Makefile.in branches/R2_14/Externals/scew/etc/pkg-config/Makefile.in branches/R2_14/Externals/scew/examples/Makefile.in branches/R2_14/Externals/scew/examples/scew_print/Makefile.in branches/R2_14/Externals/scew/examples/scew_stream/Makefile.in branches/R2_14/Externals/scew/examples/scew_write/Makefile.in branches/R2_14/Externals/scew/install-sh branches/R2_14/Externals/scew/missing branches/R2_14/Externals/scew/mkinstalldirs branches/R2_14/Externals/scew/scew/Makefile.in branches/R2_14/Externals/scew/scew/types.h branches/R2_14/Externals/scew/scew/xhandler.c branches/R2_14/Externals/scew/scew/xhandler.h branches/R2_14/Externals/scew/scew/xprint.c branches/R2_14/Externals/scew/scew/xprint.h branches/R2_14/Externals/scew/scew/xtree.h branches/R2_14/Externals/scew/win32/Makefile.in branches/R2_14/Externals/scew/win32/scew.dsp Modified: branches/R2_14/Externals/scew/AUTHORS =================================================================== --- branches/R2_14/Externals/scew/AUTHORS 2010-10-27 20:56:49 UTC (rev 7374) +++ branches/R2_14/Externals/scew/AUTHORS 2010-10-27 21:24:57 UTC (rev 7375) @@ -1,7 +1,4 @@ Authors of SCEW (Simple C Expat Wrapper) See also the files THANKS and ChangeLog. -Aleix Conchillo Flaque designed and implemented SCEW. - ---- -$Id: AUTHORS,v 1.1 2002/12/03 23:58:55 aleix Exp $ +Aleix Conchillo Flaqu\xE9 designed and implemented SCEW. Modified: branches/R2_14/Externals/scew/COPYING =================================================================== --- branches/R2_14/Externals/scew/COPYING 2010-10-27 20:56:49 UTC (rev 7374) +++ branches/R2_14/Externals/scew/COPYING 2010-10-27 21:24:57 UTC (rev 7375) @@ -2,7 +2,7 @@ Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -485,7 +485,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. Deleted: branches/R2_14/Externals/scew/ChangeLog =================================================================== --- branches/R2_14/Externals/scew/ChangeLog 2010-10-27 20:56:49 UTC (rev 7374) +++ branches/R2_14/Externals/scew/ChangeLog 2010-10-27 21:24:57 UTC (rev 7375) @@ -1,128 +0,0 @@ -Changes for WinMerge compile: - -2008-01-13 Kimmo Varis <ki...@wi...> - * scew/win32/scew.dsp: Build scew to WinMerge's Build folder. This prevents - polluting source folders with compiled files. - -2007-01-20 Kimmo Varis <ki...@wi...> - * scew/error.c: Fix compile with VS2005 - -2006-12-18 Kimmo Varis <ki...@wi...> - * WinMerge patch [ 1616302 ] Small BUILD bug, in scew.h, for WIN32 - submitted by geoffmc <ge...@us...> to fix ansi - release target filename. - -2006-11-05 Kimmo Varis <ki...@wi...> - - * scew/win32/scew.dsp: Added post-build commands to copy - lib files to /Build/expat - - * scew/win32/scew.dsp: Added include path to expat for one - target (missed in previous commit) - -2006-11-01 Kimmo Varis <ki...@wi...> - - * scew/win32/scew.dsp: added library paths to WinMerge /Build/expat - -**** Changes in version 0.3.2 **** - -2004-05-23 Aleix Conchillo Flaque <al...@me...> - - * src (Module): Added stream functionality. - -2004-03-20 Aleix Conchillo Flaque <al...@me...> - - * by now just some minor fixes. - -**** Changes in version 0.3.1 **** - -2004-01-26 Aleix Conchillo Flaque <al...@me...> - - * src/writer.*: write functions moved from tree to new writer - files. - -2004-01-25 Aleix Conchillo Flaque <al...@me...> - - * src/xtree.*: added XML preamble support. - -2003-12-09 Brodie Thiesfield - - * re-jigged the source tree to make building and installing as a - common system library on Windows easier. - - * src directory renamed scew to keep consistency of code on - both Unix and Windows platforms. Enables cross platform building - of code always using #include <scew/scew.h> - - * added Windows DevStudio 6+ build workspace to easily build - all required versions of the library. - - * much of scew/str.* rewritten to use compiler macros instead of - separate functions. Means one less level of function calling and - supports Unicode building on Windows simply. - - * scew/mem.* removed (functions now available through str.h) - - * added INSTALL.WIN32 file to describe building on Windows - -**** Changes in version 0.3.0 **** - -2003-07-16 Aleix Conchillo Flaque <al...@me...> - - * src/element.c, src/xattribute.c: performance improvement by - saving last index visited. - - * src (Module): Lots of fixes and improvements by Brodie - Thiesfield. - -**** Changes in version 0.2.1 **** - -2003-07-09 Aleix Conchillo Flaque <al...@me...> - - * src/str.h (Module): Added isalpha, isalnum, isdigit, isspace, - isprint... functions. - - * src/mem.h (Module): Added initial memory functions. - -2003-07-08 Aleix Conchillo Flaque <al...@me...> - - * src (Module): - - Added error system - - Fixed some minor bugs - - Improve white space parse treatment - - New string functions - - Added support for XML declarations attributes (version, - encoding, standalone) - -2003-05-01 Aleix Conchillo Flaque <al...@me...> - - * src/tree.c (scew_tree_save_file): file closing fixed. - -**** Changes in version 0.2.0 **** - -2003-04-25 Aleix Conchillo Flaque <al...@me...> - - * src (Module): Added compatibilized headers with C++ (ifdef - __cplusplus). - -2003-04-24 Aleix Conchillo Flaque <al...@me...> - - * src (Module): Compilation warnings fixes. - - * src/xattribute.c(scew_element_del_attr): memory crash fixed. - -**** Changes in version 0.1.1 **** - -2003-03-30 Aleix Conchillo Flaque <al...@me...> - - * src (Module): Lot of cleanup and some important changes in - internal data structures. Everything is now based in a triply - linked tree which is created when reading a file or when creating - a new XML tree in memory. - -2003-02-21 Aleix Conchillo Flaque <al...@me...> - - * src (Module): Added new tree structure which is now included in - scew_parser and will be used for writing purposes. - - * ChangeLog started Modified: branches/R2_14/Externals/scew/INSTALL =================================================================== --- branches/R2_14/Externals/scew/INSTALL 2010-10-27 20:56:49 UTC (rev 7374) +++ branches/R2_14/Externals/scew/INSTALL 2010-10-27 21:24:57 UTC (rev 7375) @@ -19,8 +19,8 @@ be considered for the next release. If at some point `config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change + The file `configure.ac' is used to create `configure' by a program +called `autoconf'. You only need `configure.ac' if you want to change it or regenerate `configure' using a newer version of `autoconf'. The simplest way to compile this package is: Deleted: branches/R2_14/Externals/scew/INSTALL.WIN32 =================================================================== --- branches/R2_14/Externals/scew/INSTALL.WIN32 2010-10-27 20:56:49 UTC (rev 7374) +++ branches/R2_14/Externals/scew/INSTALL.WIN32 2010-10-27 21:24:57 UTC (rev 7375) @@ -1,49 +0,0 @@ -Windows Installation -==================== - -Extract the SCEW distribution library to it's installation location. For -example, the scew-0.3.2 distribution may be extracted to the directory - - c:\lib\scew-0.3.2 - -Open the scew.dsp file from win32 directory in Visual Studio 6 or Visual -Studio .NET 2002/2003. Go to the 'Build' menu and select 'Batch -Build...'. Select all of the configurations to be built and click -'Rebuild All'. This will build versions of the SCEW library for -Debug/Release, MBCS/Unicode and not/XML_STATIC. - -Note that SCEW is always linked statically with your application. The -XML_STATIC compile option determines whether libexpat will be used as a -static linked library or a DLL. - -Add the following directories to the DevStudio Project paths. This is -available via the 'Tools', 'Options' menu. 'Directories' in DevStudio 6, -'Projects' in DevStudio .NET. - - Include Directories - SCEW top level, e.g. "c:\lib\scew-0.3.2" - - Library Directories - SCEW win32 lib, e.g. "c:\lib\scew-0.3.2\win32\lib" - -You will also have to include your Expat library directory to Includes -and Library: - - Include and Library Directories - <expat_install>\source\lib e.g. "c:\lib\expat\source\lib" - -To use SCEW in your application, you simply include the SCEW header file -like: - - #include <scew/scew.h> - -Including this header will automatically cause the correct SCEW library -to be linked in with your application for the current compile -settings. You do not need to add the SCEW library to the linker -settings. - -Note: you do need to add the appropriate Expat library to your linker -settings. - -=== -$Id: INSTALL.WIN32,v 1.5 2004/01/30 12:12:53 aleix Exp $ Modified: branches/R2_14/Externals/scew/Makefile.am =================================================================== --- branches/R2_14/Externals/scew/Makefile.am 2010-10-27 20:56:49 UTC (rev 7374) +++ branches/R2_14/Externals/scew/Makefile.am 2010-10-27 21:24:57 UTC (rev 7375) @@ -1,15 +1,13 @@ # -# $Id: Makefile.am,v 1.11 2004/01/29 22:42:09 aleix Exp $ -# # Author: Aleix Conchillo Flaque <al...@me...> # Date: Mon Nov 04, 2002 20:29 # -# Copyright (C) 2002, 2003, 2004 Aleix Conchillo Flaque +# Copyright (C) 2002-2009 Aleix Conchillo Flaque # -SUBDIRS = doc etc win32 scew examples +SUBDIRS = doc etc scew examples tests win32 -EXTRA_DIST = INSTALL.WIN32 +EXTRA_DIST = ChangeLog.1 .PHONY: doc @@ -21,6 +19,6 @@ else doc: - @echo "Doxygen documentation generation not enabled"; + @echo "WARNING: Documentation generation not enabled or available"; endif Deleted: branches/R2_14/Externals/scew/Makefile.in =================================================================== --- branches/R2_14/Externals/scew/Makefile.in 2010-10-27 20:56:49 UTC (rev 7374) +++ branches/R2_14/Externals/scew/Makefile.in 2010-10-27 21:24:57 UTC (rev 7375) @@ -1,539 +0,0 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. -# @configure_input@ - -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# -# $Id: Makefile.am,v 1.11 2004/01/29 22:42:09 aleix Exp $ -# -# Author: Aleix Conchillo Flaque <al...@me...> -# Date: Mon Nov 04, 2002 20:29 -# -# Copyright (C) 2002, 2003, 2004 Aleix Conchillo Flaque -# - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . - -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOC_FALSE = @DOC_FALSE@ -DOC_TRUE = @DOC_TRUE@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -enable_dot = @enable_dot@ -enable_html_docs = @enable_html_docs@ -enable_latex_docs = @enable_latex_docs@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ - -SUBDIRS = doc etc win32 scew examples - -EXTRA_DIST = INSTALL.WIN32 -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ - COPYING ChangeLog INSTALL Makefile.am NEWS THANKS aclocal.m4 \ - config.h.in configure configure.in depcomp install-sh missing \ - mkinstalldirs -DIST_SUBDIRS = $(SUBDIRS) -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) - -$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) - -$(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ - else :; fi - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h - -$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - touch $(srcdir)/config.h.in - -distclean-hdr: - -rm -f config.h stamp-h1 -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - else \ - include_option=--include; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = . -distdir = $(PACKAGE)-$(VERSION) - -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print - -distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkinstalldirs) $(distdir)/doc $(distdir)/etc/pkg-config - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ - && rm -f $(distdir).tar.gz \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile config.h -installdirs: installdirs-recursive -installdirs-am: - -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr distclean-tags - -dvi: dvi-recursive - -dvi-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive dist \ - dist-all dist-gzip distcheck distclean distclean-generic \ - distclean-hdr distclean-recursive distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am dvi-recursive info \ - info-am info-recursive install install-am install-data \ - install-data-am install-data-recursive install-exec \ - install-exec-am install-exec-recursive install-info \ - install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-info-recursive uninstall-recursive - - -.PHONY: doc - -@DOC_TRUE@doc: -@DOC_TRUE@ (cd doc && $(MAKE) doc) - -@DOC_FALSE@doc: -@DOC_FALSE@ @echo "Doxygen documentation generation not enabled"; -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Modified: branches/R2_14/Externals/scew/NEWS =================================================================== --- branches/R2_14/Externals/scew/NEWS 2010-10-27 20:56:49 UTC (rev 7374) +++ branches/R2_14/Externals/scew/NEWS 2010-10-27 21:24:57 UTC (rev 7375) @@ -1,204 +1,340 @@ SCEW -- History of visible changes. -Copyright (C) 2002, 2003, 2004 Aleix Conchillo Flaque +Copyright (C) 2002-2010 Aleix Conchillo Flaqu\xE9 See the end for copying conditions. ------------------------------------------------------------------------ -* Version 0.4.0 (25/05/04) +* Version 1.1.2 (2010/06/04) +** Fixes: + + - Precondition violation when assigning preamble to tree after + trimming and becoming NULL (scew/xparser.c). + (reported by Rudolf Alexander Kerbitz) + +------------------------------------------------------------------------ + +* Version 1.1.1 (2009/12/11) + ** Changes: - - Ability to load and XML document from an stream has been - added. The stream may not be completed, so it will just load - correct XML pieces. A callback, set by the user, will be - called each time an element is available. - (thanks to Gord Shier) + - Element contents and attribute values are now escaped when + printing by using the new scew_strescape function. + - Examples correctly output UTF-16 characters in Windows console. + +------------------------------------------------------------------------ + +* Version 1.1.0 (2009/11/30) + +** API changes: + + - scew_tree_compare and scew_element_compare now receive an extra + argument to specify user defined comparisons. + +** Changes: + + - Tree and element comparison function can now take a user defined + comparison function. + ** Fixes: - - Fixed indentation level when document contains multiple - consecutive empty elements. - (thanks to Tom Probasco) + - Missing _cpluplus closing brace in printer.h. + (closes #28130) - - scew_element_add_attr_pair() did not add a new attribute - correctly if the attribute already existed. - (reported by Matthew Peltzer) + - Printer stops printing when element with zero-length contents is + encountered. + (closes #28125) - - Compiltaion fixes in MSVC. Compiler interpreted a function - argument called list as the std::list. - (reported by Renaud Dumont) +------------------------------------------------------------------------ +* Version 1.0.0 (2009/10/30) + +** API changes: + + - scew_parser_load now uses an SCEW reader to read the XML + document. It also returns a scew_tree giving the user to + responsibility to free it. + + - scew_parser_tree has been removed. + + - Parse loading notifications (via hooks) can be added for elements + and trees. + + - A new type, scew_printer, has been added to provide XML document + printing. Printers work with any SCEW writer type to perform the + actual output. + + - Two new types, scew_reader and scew_writer, have been created to + support any type of I/O. Two default I/O interfaces are provided: + files and memory buffers. New I/O sources can be easily added. + + - More functions to delete attributes and child elements have been + added to the scew_element interface. + + - Attribute functions related to elements have been moved to the + scew_element interface. + + - Some element functions have been renamed, mostly the ones related + to attributes. + + - Added copy and comparison functions in most SCEW types: trees, + elements and attributes. + + - A new type, scew_list, has been defined and used for scew_element + children and attributes. scew_list provides a general way to work + with lists, thus no code repetition is done and there is a + flexible and general way to work with lists. + + - Added new scew_bool type. In the future, this should be changed + in favor of the bool type defined by C99. + + - Added scew_element_detach which detaches an element from its + parent (it does not free it). + (suggested by Alex Katebi) + + - Added scew_element_parent which returns an element's parent if + any. + (thanks to dsk AT purdue DOT edu and Alex Katebi) + + - Added scew_element_add_pair which allows to add a new attribute + with a name and contents. + (thanks to Christopher Layne) + +** Changes: + + - Windows support has been updated to Microsoft Visual C++ 2008. It + is now also possible to build SCEW DLLs and SCEW examples. + + - UTF-16 is better supported (only under Windows platforms). + + - XML preamble (anything between XML declaration and root element) + is now parsed. + + - XML declaration standalone attribute is now used. + + - Unit Test cases have been added using Check unit testing + framework (C99 needed). + (see http://check.sf.net) + + - Code has been cleaned to allow better definition of private and + public interfaces. + + - Documentation has been improved and organized into modules. + + - SCEW now uses libtool to generate a static or dynamic library. + + - Thread support can now be disabled (see ./configure --help). + +** Fixes: + + - Fix compilation warnings in error.c and parser.c. + (reported by Aaron S. Kurland) + + - Fix scew_tree_free documentation. + (reported by Gord Shier) + + - Hardcoded gcc "CFLAGS" removed. + (reported by Mark Zieg) + ------------------------------------------------------------------------ -* Version 0.3.2 (30/01/04) +* Version 0.4.0 (2004/05/25) ** Changes: - - A new "Unknown error code" message has been added. - (thanks to Brodie Thiesfield) + - Ability to load and XML document from an stream has been + added. The stream may not be completed, so it will just load + correct XML pieces. A callback, set by the user, will be called + each time an element is available. + (thanks to Gord Shier) - - Improved support for Windows and Unix compilation. - (thanks to Brodie Thiesfield) +** Fixes: - - Added improvements in str functions. mem.* has been removed. - (thanks to Brodie Thiesfield) + - Fixed indentation level when document contains multiple + consecutive empty elements. + (thanks to Tom Probasco) - - Write functions have been moved from tree to new writer.* - files. + - scew_element_add_attr_pair() did not add a new attribute + correctly if the attribute already existed. + (reported by Matthew Peltzer) - - Added a preamble section to the XML declaration. + - Compiltaion fixes in MSVC. Compiler interpreted a function + argument called list as the std::list. + (reported by Renaud Dumont) +------------------------------------------------------------------------ + +* Version 0.3.2 (2004/01/30) + +** Changes: + + - A new "Unknown error code" message has been added. + (thanks to Brodie Thiesfield) + + - Improved support for Windows and Unix compilation. + (thanks to Brodie Thiesfield) + + - Added improvements in str functions. mem.* has been removed. + (thanks to Brodie Thiesfield) + + - Write functions have been moved from tree to new writer.* files. + + - Added a preamble section to the XML declaration. + ** Fixes: - - Allow building in a separate directory. - (thanks to Kalle Valo) + - Allow building in a separate directory. + (thanks to Kalle Valo) ------------------------------------------------------------------------ -* Version 0.3.1 (21/07/03) +* Version 0.3.1 (2003/07/21) ** Changes: - - Added missing performace improvements by using the linked list - in element and attribute iterations. - (thanks to Brodie Thiesfield) + - Added missing performace improvements by using the linked list in + element and attribute iterations. + (thanks to Brodie Thiesfield) - - Added exponentially growing buffer to avoid many realloc calls - which are slow and fragment memory in scew_element_list. - (thanks to Brodie Thiesfield) + - Added exponentially growing buffer to avoid many realloc calls + which are slow and fragment memory in scew_element_list. + (thanks to Brodie Thiesfield) - - Performance improvements in file loading by using a static - buffer. - (thanks to Brodie Thiesfield) + - Performance improvements in file loading by using a static + buffer. + (thanks to Brodie Thiesfield) - - Added scew_parser_load_file_fp(). - (thanks to Brodie Thiesfield) + - Added scew_parser_load_file_fp(). + (thanks to Brodie Thiesfield) - - Some other minor changes. - (thanks to Brodie Thiesfield) + - Some other minor changes. + (thanks to Brodie Thiesfield) ** Fixes: - - scew_isxdigit() was calling isdigit() instead of isxdigit(). + - scew_isxdigit() was calling isdigit() instead of isxdigit(). - - scew_isxxxx() fixed. - (thanks to Brodie Thiesfield) + - scew_isxxxx() fixed. + (thanks to Brodie Thiesfield) - - strdup() is a GNU extension, replaced it by own version. + - strdup() is a GNU extension, replaced it by own version. - - Fixed scew_element_by_name. - (reported by Eric Fronheiser) + - Fixed scew_element_by_name. + (reported by Eric Fronheiser) - - Warning fixes (level 4) in Microsoft Visual C++ 7. - (thanks to Brodie Thiesfield) + - Warning fixes (level 4) in Microsoft Visual C++ 7. + (thanks to Brodie Thiesfield) - - Multi-thread support fixed in Microsoft Visual - C++. __declspec(thread) did not work, use TLS functions - instead. - (thanks to Brodie Thiesfield) + - Multi-thread support fixed in Microsoft Visual + C++. __declspec(thread) did not work, use TLS functions instead. + (thanks to Brodie Thiesfield) ------------------------------------------------------------------------ -* Version 0.3.0 (10/07/03) +* Version 0.3.0 (2003/07/10) ** Changes: - - Added more string functions. New memory functions have also - been added. + - Added more string functions. New memory functions have also been + added. - - Performance improved in element and attribute iteration. - (thanks to Sanzo Miyazawa) + - Performance improved in element and attribute iteration. + (thanks to Sanzo Miyazawa) - - Support for XML declaration attributes has been added - (version, encoding, standalone). This attributes can be - changed using SCEW tree functions. + - Support for XML declaration attributes has been added (version, + encoding, standalone). This attributes can be changed using SCEW + tree functions. - - Improved white spaces treatment in XML element contents. + - Improved white spaces treatment in XML element contents. - - Added error system. See documentation for more details. + - Added error system. See documentation for more details. - - Added pkg-config file. - (thanks to Neil Harvey) + - Added pkg-config file. + (thanks to Neil Harvey) - - Added 'make doc'. If you have doxygen installed (which will be - automatically detected), it will create SCEW documentation. - Execute './configure --help' to see more documentation - options. + - Added 'make doc'. If you have doxygen installed (which will be + automatically detected), it will create SCEW + documentation. Execute './configure --help' to see more + documentation options. - - 'make install' does not install example binaries anymore. + - 'make install' does not install example binaries anymore. ** Fixes: - - scew_tree_save_file() did not fclose output file. - (reported by Paul Bohme) + - scew_tree_save_file() did not fclose output file. + (reported by Paul Bohme) - - scew_element_free() did not decrement parent number of - children. - (reported by anonymous) + - scew_element_free() did not decrement parent number of children. + (reported by anonymous) ------------------------------------------------------------------------ -* Version 0.2.1 (25/04/03) +* Version 0.2.1 (2003/04/25) ** Changes: - - Added --enable-debug flag to the configure script. + - Added --enable-debug flag to the configure script. ** Fixes: - - Added compatibilized headers with C++ (ifdef __cplusplus). + - Added compatibilized headers with C++ (ifdef __cplusplus). - - Compilation warnings fixed. + - Compilation warnings fixed. - - scew_element_del_attr() segmentation fault fixed. - (reported by Jussi M\xE4ki) + - scew_element_del_attr() segmentation fault fixed. + (reported by Jussi M\xE4ki) ------------------------------------------------------------------------ -* Version 0.2.0 (07/04/03) +* Version 0.2.0 (2003/04/07) ** Changes: - - Functions to create and save XML files have been added. + - Functions to create and save XML files have been added. - - A lot of cleanup and rewriting has been done. Internal - structures have changed. + - A lot of cleanup and rewriting has been done. Internal structures + have changed. ** Fixes: ------------------------------------------------------------------------ -* Version 0.1.1 (14/01/03) +* Version 0.1.1 (2003/01/14) ** Changes: ** Fixes: - - scew_get_element_by_name() and scew_get_attribute_by_name() - did not return NULL if an element/attribute was not found. - (reported by Stuart R. Anderson) + - scew_get_element_by_name() and scew_get_attribute_by_name() did + not return NULL if an element/attribute was not found. + (reported by Stuart R. Anderson) ------------------------------------------------------------------------ -* Version 0.1.0 (05/12/02) +* Version 0.1.0 (2002/12/05) ** Initial release ------------------------------------------------------------------------ -Copying information: -Copyright (C) 2002, 2003, 2004 Aleix Conchillo Flaque +* Copying information: - Permission is granted to anyone to make or distribute verbatim copies -of this document as received, in any medium, provided that the copyright -notice and this permission notice are preserved, thus giving the -recipient permission to redistribute in turn. +Copyright (C) 2002-2010 Aleix Conchillo Flaqu\xE9 - Permission is granted to distribute modified versions of this -document, or of portions of it, under the above conditions, provided -also that they carry prominent notices stating who last changed them. + Permission is granted to anyone to make or distribute verbatim + copies of this document as received, in any medium, provided that + the copyright notice and this permission notice are preserved, thus + giving the recipient permission to redistribute in turn. ---- -$Id: NEWS,v 1.21 2004/05/25 21:10:54 aleix Exp $ + Permission is granted to distribute modified versions of this + document, or of portions of it, under the above conditions, + provided also that they carry prominent notices stating who last + changed them. + +-- +;;; Local Variables: +;;; mode: outline +;;; End: Modified: branches/R2_14/Externals/scew/README =================================================================== --- branches/R2_14/Externals/scew/README 2010-10-27 20:56:49 UTC (rev 7374) +++ branches/R2_14/Externals/scew/README 2010-10-27 21:24:57 UTC (rev 7375) @@ -1,16 +1,21 @@ Welcome to SCEW (Simple C Expat Wrapper) +======================================== - The aim of SCEW is to provide an easy interface around the XML Expat -parser. It provides functions to load and access XML elements without -the need to create the Expat event handling routines each time you want -to load a different XML document. It also lets you access to the -internal Expat parser, that means you can still have all the -functionality that Expat library gives you. + The aim of SCEW is to provide an easy interface around the XML +Expat parser, as well as a simple interface for creating new XML +documents. It provides functions to load and access XML elements +without the need to create Expat event handling routines every time +you want to load a new XML document. - Since version 0.2.0, SCEW incorporates functions to create and handle -XML trees. That is, add and delete nodes, change attribute names and -values... +These are the main SCEW features: + - Uses a DOM-like object model for new or parsed XML documents. + - Supports loading concatenated XML documents. + - Can copy and compare full XML documents, elements or attributes. + - Writes XML documents to multiple outputs. + - Allows adding new I/O sources easily. + - UTF-8, ISO-8859-1 and US-ASCII encodings (and UTF-16 in Windows). + Project homepage: http://www.nongnu.org/scew/ SCEW is free software [0]. Please see the file COPYING for details. @@ -21,6 +26,3 @@ [0] To learn more about GNU, the FSF and its goals, please visit http://www.gnu.org. - ---- -$Id: README,v 1.4 2004/01/29 22:52:15 aleix Exp $ Modified: branches/R2_14/Externals/scew/THANKS =================================================================== --- branches/R2_14/Externals/scew/THANKS 2010-10-27 20:56:49 UTC (rev 7374) +++ branches/R2_14/Externals/scew/THANKS 2010-10-27 21:24:57 UTC (rev 7375) @@ -1,32 +1,34 @@ Acknowledgements -**************** +================ - It has been written originally by Aleix Conchillo Flaque. Many people -have contributed to SCEW by reporting problems, suggesting improvements, -or submitting actual code. Here is a list of these people. Help me keep -it complete and exempt of errors. + It has been written originally by Aleix Conchillo Flaqu\xE9. Many +people have contributed to SCEW by reporting problems, suggesting +improvements, or submitting actual code. Here is a list of these +people. Help me keep it complete and exempt of errors. -* Jose A. Ortega suggested some important C implementation details. As +* Jose A. Ortega suggested some important C implementation details. As usual, he has helped me in many other ways. Thanks jao! -* Brodie Thiesfield has submit lots of fixes and improvements. He has - also improved builds on Windows, and many more. +* Brodie Thiesfield has submitted lots of fixes and improvements. He + also provided the initial builds on Windows, and many more. -* Sanzo Miyazawa has submit code to improve performance in element and - attribute iteration. +* Sanzo Miyazawa submitted code to improve performance in element and + attribute iteration in first releases. -* Gord Shier has implemented the load stream functionality. +* Gord Shier implemented the first load stream functionality. * Neil Harvey has contributed the pkg-config file. -* Carlos Carrasco has helped a lot in the debugging and testing - phases. Those nigths at IRC are really great. Thanks! +* Carlos Carrasco helped a lot in the debugging and testing phases of + initial releases. Those nigths at IRC were really great. Thanks! -* Lluis Gesa has also helped in testing the package. +* Lluis Gesa also helped in testing the package and listened to my + boring implementation thoughts of SCEW readers/writers. -* Bug reporting (in alphabetical order): - Anonymous reporters, Stuart R. Anderson, Paul Bohme, Eric Fronheiser, - Jussi M\xE4ki, Sanzo Miyazawa, Brodie Thiesfield, Kalle Vallo. +* Bug reporting and others (in alphabetical order): ---- -$Id: THANKS,v 1.13 2004/05/25 20:28:43 aleix Exp $ + Anonymous reporters, Stuart R. Anderson, Paul Bohme, Eric + Fronheiser, Alex Katebi, Rudolf Alexander Kerbitz, Aaron S. Kurland, + Christopher Layne, Jussi M\xE4ki, Sanzo Miyazawa, George Neill, Gord + Shier, Brodie Thiesfield, Andrew Thomas, Kalle Vallo, Michal Wozniak + and Mark Zieg. Deleted: branches/R2_14/Externals/scew/aclocal.m4 =================================================================== --- branches/R2_14/Externals/scew/aclocal.m4 2010-10-27 20:56:49 UTC (rev 7374) +++ branches/R2_14/Externals/scew/aclocal.m4 2010-10-27 21:24:57 UTC (rev 7375) @@ -1,950 +0,0 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 10 - -AC_PREREQ([2.54]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl - -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.9])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright 2001, 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU G... [truncated message content] |