[libxml++] Refactor build system
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml++] Refactor build system
- Date: Sat, 27 Mar 2010 14:38:48 +0000 (UTC)
commit 5d7ade484b3d3c1c48aae644aac15f3464fa2f55
Author: David King <davidk openismus com>
Date: Sat Mar 27 15:32:45 2010 +0100
Refactor build system
* Makefile.am: Merge from subdir Makefile.am files, excluding doc.
* MSVC_Net2005/examples/dom_parser_raw/dom_parser_raw.vcproj:
* MSVC_Net2008/examples/dom_parser_raw/dom_parser_raw.vcproj: Add
missing Visual studio project files.
* MSVC_Net2005/examples/*/Makefile.am:
* MSVC_Net2005/examples/Makefile.am:
* MSVC_Net2005/gendef/Makefile.am:
* MSVC_Net2005/libxml++/Makefile.am:
* MSVC_Net2008/examples/*/Makefile.am:
* MSVC_Net2008/examples/Makefile.am:
* MSVC_Net2008/gendef/Makefile.am:
* MSVC_Net2008/libxml++/Makefile.am: Remove from repository, and move
content to Makefile.am, making the MSVC project file build
non-recursive.
* README: Update.
* autogen.sh: Copy from gtkmm.
* configure.in: Move to configure.ac.
* configure.ac: Require autoconf 2.59 and automake 1.9. Use new-style
AC_INIT() with bug-report link and homepage URL. Use mm-common for
initialisation of version variables. Require libtool 2.2.6 for much
faster builds. Use MM_ARG_ENABLE_WARNINGS to configure compiler
warning flags. Use MM_CHECK_PERL to check for the required Perl
version. Use AC_CONFIG_FILES rather than AC_OUTPUT. Update for
Makefile.am changes.
* config.h.in: Remove from repository, as autoheader is now used.
* */.cvsignore: Remove old files.
* doc/manual/Makefile.am: Use the correct Perl.
* doc/reference/Doxyfile.in:
* MSVC_Net2005/libxml++/libxml++.rc.in:
* MSVC_Net2008/libxml++/libxml++.rc.in: Use new-style variable names.
* examples/Makefile.am_fragment:
* examples/Makefile.am:
* examples/*/Makefile.am: Remove from repository, and move content to
Makefile.am, making the examples build non-recursive.
* .gitignore: Update.
* libxml++/Makefile.am:
* libxml++/*/Makefile.am: Remove from repository, and move content to
Makefile.am, making the libxml++ build non-recursive.
* libxml++.spec.in:
* INSTALL: Remove from repository.
* scripts/README:
* scripts/Makfile.am: Remove from repository.
* scripts/reduced.m4: Move to macros/reduced.m4
.gitignore | 80 ++++++-
ChangeLog | 66 +++++-
INSTALL | 9 -
MSVC_Net2005/.cvsignore | 4 -
MSVC_Net2005/Makefile.am | 3 -
MSVC_Net2005/examples/.cvsignore | 3 -
MSVC_Net2005/examples/Makefile.am | 5 -
MSVC_Net2005/examples/dom_build/.cvsignore | 4 -
MSVC_Net2005/examples/dom_build/Makefile.am | 1 -
.../examples/dom_parse_entities/.cvsignore | 4 -
.../examples/dom_parse_entities/Makefile.am | 1 -
MSVC_Net2005/examples/dom_parser/.cvsignore | 4 -
MSVC_Net2005/examples/dom_parser/Makefile.am | 1 -
.../examples/dom_parser_raw/dom_parser_raw.vcproj | 213 ++++++++++++++++
MSVC_Net2005/examples/dom_read_write/.cvsignore | 4 -
MSVC_Net2005/examples/dom_read_write/Makefile.am | 1 -
MSVC_Net2005/examples/dom_xpath/.cvsignore | 4 -
MSVC_Net2005/examples/dom_xpath/Makefile.am | 1 -
MSVC_Net2005/examples/dtdvalidation/.cvsignore | 4 -
MSVC_Net2005/examples/dtdvalidation/Makefile.am | 1 -
MSVC_Net2005/examples/import_node/.cvsignore | 4 -
MSVC_Net2005/examples/import_node/Makefile.am | 1 -
MSVC_Net2005/examples/sax_exception/.cvsignore | 4 -
MSVC_Net2005/examples/sax_exception/Makefile.am | 1 -
MSVC_Net2005/examples/sax_parser/.cvsignore | 4 -
MSVC_Net2005/examples/sax_parser/Makefile.am | 1 -
.../examples/sax_parser_build_dom/.cvsignore | 4 -
.../examples/sax_parser_build_dom/Makefile.am | 1 -
.../examples/sax_parser_entities/.cvsignore | 4 -
.../examples/sax_parser_entities/Makefile.am | 1 -
MSVC_Net2005/examples/schemavalidation/Makefile.am | 1 -
MSVC_Net2005/examples/textreader/.cvsignore | 4 -
MSVC_Net2005/examples/textreader/Makefile.am | 1 -
MSVC_Net2005/gendef/.cvsignore | 4 -
MSVC_Net2005/gendef/Makefile.am | 2 -
MSVC_Net2005/libxml++/.cvsignore | 6 -
MSVC_Net2005/libxml++/Makefile.am | 12 -
MSVC_Net2005/libxml++/libxml++.rc.in | 10 +-
MSVC_Net2008/Makefile.am | 3 -
MSVC_Net2008/examples/Makefile.am | 5 -
MSVC_Net2008/examples/dom_build/Makefile.am | 1 -
.../examples/dom_parse_entities/Makefile.am | 1 -
MSVC_Net2008/examples/dom_parser/Makefile.am | 1 -
.../examples/dom_parser_raw/dom_parser_raw.vcproj | 212 ++++++++++++++++
MSVC_Net2008/examples/dom_read_write/Makefile.am | 1 -
MSVC_Net2008/examples/dom_xpath/Makefile.am | 1 -
MSVC_Net2008/examples/dtdvalidation/Makefile.am | 1 -
MSVC_Net2008/examples/import_node/Makefile.am | 1 -
MSVC_Net2008/examples/sax_exception/Makefile.am | 1 -
MSVC_Net2008/examples/sax_parser/Makefile.am | 1 -
.../examples/sax_parser_build_dom/Makefile.am | 1 -
.../examples/sax_parser_entities/Makefile.am | 1 -
MSVC_Net2008/examples/schemavalidation/Makefile.am | 1 -
MSVC_Net2008/examples/textreader/Makefile.am | 1 -
MSVC_Net2008/gendef/Makefile.am | 2 -
MSVC_Net2008/libxml++/Makefile.am | 12 -
MSVC_Net2008/libxml++/libxml++.rc.in | 10 +-
Makefile.am | 254 +++++++++++++++++++-
README | 18 +-
autogen.sh | 51 +----
config.h.in | 25 --
configure.ac | 58 +++++
configure.in | 196 ---------------
docs/.cvsignore | 2 -
docs/manual/Makefile.am | 2 +-
docs/reference/.cvsignore | 3 -
docs/reference/Doxyfile.in | 4 +-
examples/.cvsignore | 2 -
examples/Makefile.am | 5 -
examples/Makefile.am_fragment | 5 -
examples/dom_build/.cvsignore | 3 -
examples/dom_build/Makefile.am | 8 -
examples/dom_parse_entities/.cvsignore | 3 -
examples/dom_parse_entities/Makefile.am | 9 -
examples/dom_parser/.cvsignore | 3 -
examples/dom_parser/Makefile.am | 9 -
examples/dom_parser_raw/.cvsignore | 3 -
examples/dom_parser_raw/Makefile.am | 9 -
examples/dom_read_write/.cvsignore | 3 -
examples/dom_read_write/Makefile.am | 10 -
examples/dom_xpath/.cvsignore | 3 -
examples/dom_xpath/Makefile.am | 9 -
examples/dtdvalidation/Makefile.am | 8 -
examples/import_node/.cvsignore | 3 -
examples/import_node/Makefile.am | 9 -
examples/sax_exception/.cvsignore | 3 -
examples/sax_exception/Makefile.am | 9 -
examples/sax_parser/.cvsignore | 3 -
examples/sax_parser/Makefile.am | 9 -
examples/sax_parser_build_dom/.cvsignore | 3 -
examples/sax_parser_build_dom/Makefile.am | 14 -
examples/sax_parser_entities/.cvsignore | 3 -
examples/sax_parser_entities/Makefile.am | 9 -
examples/schemavalidation/Makefile.am | 9 -
examples/textreader/.cvsignore | 3 -
examples/textreader/Makefile.am | 8 -
libxml++-2.6.pc.in | 2 +-
libxml++.spec.in | 51 ----
libxml++/.cvsignore | 2 -
libxml++/Makefile.am | 91 +++++--
libxml++/exceptions/.cvsignore | 2 -
libxml++/exceptions/Makefile.am | 12 -
libxml++/io/.cvsignore | 2 -
libxml++/io/Makefile.am | 23 --
libxml++/nodes/.cvsignore | 2 -
libxml++/nodes/Makefile.am | 30 ---
libxml++/parsers/.cvsignore | 2 -
libxml++/parsers/Makefile.am | 13 -
libxml++/validators/Makefile.am | 13 -
.../libxml++config.h.in => libxml++config.h.in | 2 +-
{scripts => macros}/reduced.m4 | 0
scripts/Makefile.am | 2 -
scripts/README | 1 -
113 files changed, 960 insertions(+), 815 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b76978..2dd0d19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,71 @@
-Makefile.in
-Makefile
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-libtool
-libxml++-2.6.pc
-libxml++.spec
+# wildcard patterns
+*.[ao]
+*.l[ao]
*~
+Makefile
+Makefile.in
+.deps/
+.libs/
+.stamps/
+.dirstamp
+libxml++config.h
+stamp-h?
+
+# /
+/aclocal.m4
+/INSTALL
+/autom4te.cache/
+/config.h
+/config.h.in
+/config.log
+/config.status
+/configure
+/configure.lineno
+/libxml++-2.6.pc
+/libxml++-*.tar.*
+/libtool
+
+# MSVC
+/MSVC_Net2005/libxml++/libxml++.rc
+/MSVC_Net2008/libxml++/libxml++.rc
+
+# docs
+/docs/manual/html/
+/docs/manual/libxml++.xml
+/docs/reference/Doxyfile
+/docs/reference/html/
+/docs/reference/libxml++_doxygen_tags
+/docs/reference/xml/
+
+# examples
+/examples/dom_build/dom_build
+/examples/dom_parse_entities/dom_parse_entities
+/examples/dom_parser/dom_parser
+/examples/dom_parser_raw/dom_parser_raw
+/examples/dom_read_write/dom_read_write
+/examples/dom_xpath/dom_xpath
+/examples/dtdvalidation/dtdvalidation
+/examples/import_node/import_node
+/examples/sax_exception/sax_exception
+/examples/sax_parser/sax_parser
+/examples/sax_parser_build_dom/sax_parser_build_dom
+/examples/sax_parser_entities/sax_parser_entities
+/examples/schemavalidation/schemavalidation
+/examples/textreader/textreader
+
+# macros
+/macros/compile-binding.am
+/macros/config.guess
+/macros/config.sub
+/macros/depcomp
+/macros/dist-changelog.am
+/macros/doc-reference.am
+/macros/generate-binding.am
+/macros/install-sh
+/macros/libtool.m4
+/macros/ltmain.sh
+/macros/ltoptions.m4
+/macros/ltsugar.m4
+/macros/ltversion.m4
+/macros/lt~obsolete.m4
+/macros/missing
diff --git a/ChangeLog b/ChangeLog
index 7e6ceb0..e975a77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,70 @@
+2010-03-27 David King <davidk openismus com>
+
+ Refactor build system
+
+ * Makefile.am: Merge from subdir Makefile.am files, excluding doc.
+
+ * MSVC_Net2005/examples/dom_parser_raw/dom_parser_raw.vcproj:
+ * MSVC_Net2008/examples/dom_parser_raw/dom_parser_raw.vcproj: Add
+ missing Visual studio project files.
+
+ * MSVC_Net2005/examples/*/Makefile.am:
+ * MSVC_Net2005/examples/Makefile.am:
+ * MSVC_Net2005/gendef/Makefile.am:
+ * MSVC_Net2005/libxml++/Makefile.am:
+ * MSVC_Net2008/examples/*/Makefile.am:
+ * MSVC_Net2008/examples/Makefile.am:
+ * MSVC_Net2008/gendef/Makefile.am:
+ * MSVC_Net2008/libxml++/Makefile.am: Remove from repository, and move
+ content to Makefile.am, making the MSVC project file build
+ non-recursive.
+
+ * README: Update.
+
+ * autogen.sh: Copy from gtkmm.
+
+ * configure.in: Move to configure.ac.
+
+ * configure.ac: Require autoconf 2.59 and automake 1.9. Use new-style
+ AC_INIT() with bug-report link and homepage URL. Use mm-common for
+ initialisation of version variables. Require libtool 2.2.6 for much
+ faster builds. Use MM_ARG_ENABLE_WARNINGS to configure compiler
+ warning flags. Use MM_CHECK_PERL to check for the required Perl
+ version. Use AC_CONFIG_FILES rather than AC_OUTPUT. Update for
+ Makefile.am changes.
+
+ * config.h.in: Remove from repository, as autoheader is now used.
+
+ * */.cvsignore: Remove old files.
+
+ * doc/manual/Makefile.am: Use the correct Perl.
+
+ * doc/reference/Doxyfile.in:
+ * MSVC_Net2005/libxml++/libxml++.rc.in:
+ * MSVC_Net2008/libxml++/libxml++.rc.in: Use new-style variable names.
+
+ * examples/Makefile.am_fragment:
+ * examples/Makefile.am:
+ * examples/*/Makefile.am: Remove from repository, and move content to
+ Makefile.am, making the examples build non-recursive.
+
+ * .gitignore: Update.
+
+ * libxml++/Makefile.am:
+ * libxml++/*/Makefile.am: Remove from repository, and move content to
+ Makefile.am, making the libxml++ build non-recursive.
+
+ * libxml++.spec.in:
+ * INSTALL: Remove from repository.
+
+ * scripts/README:
+ * scripts/Makfile.am: Remove from repository.
+
+ * scripts/reduced.m4: Move to macros/reduced.m4
+
2010-03-08 Murray Cumming <murrayc murrayc com>
- Use 0 instead of NULL.
+ Use 0 instead of NULL.
* MSVC_Net2005/gendef/gendef.cc:
* MSVC_Net2008/gendef/gendef.cc:
diff --git a/MSVC_Net2005/examples/dom_parser_raw/dom_parser_raw.vcproj b/MSVC_Net2005/examples/dom_parser_raw/dom_parser_raw.vcproj
new file mode 100755
index 0000000..de4ea54
--- /dev/null
+++ b/MSVC_Net2005/examples/dom_parser_raw/dom_parser_raw.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="examples_dom_parser_raw"
+ ProjectGUID="{947E2653-58AE-4BCC-8A77-B131850C8206}"
+ RootNamespace="examples_dispatcher"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/vd2"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../..;"../../libxml++""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glibmm-vc80-d-2_4.lib"
+ OutputFile="$(OutDir)/dom_parser_raw.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/vd2"
+ AdditionalIncludeDirectories="../../..;"../../libxml++""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glibmm-vc80-2_4.lib"
+ OutputFile="$(OutDir)/dom_parser_raw.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\blank.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\examples\dom_parser_raw\main.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/MSVC_Net2005/libxml++/libxml++.rc.in b/MSVC_Net2005/libxml++/libxml++.rc.in
index 14633d8..0adbec3 100755
--- a/MSVC_Net2005/libxml++/libxml++.rc.in
+++ b/MSVC_Net2005/libxml++/libxml++.rc.in
@@ -33,8 +33,8 @@ END
#endif // APSTUDIO_INVOKED
VS_VERSION_INFO VERSIONINFO
- FILEVERSION @GENERIC_MAJOR_VERSION@,@GENERIC_MINOR_VERSION@,@GENERIC_MICRO_VERSION@,1
- PRODUCTVERSION @GENERIC_MAJOR_VERSION@,@GENERIC_MINOR_VERSION@,@GENERIC_MICRO_VERSION@,1
+ FILEVERSION @LIBXMLXX_MAJOR_VERSION@,@LIBXMLXX_MINOR_VERSION@,@LIBXMLXX_MICRO_VERSION@,1
+ PRODUCTVERSION @LIBXMLXX_MAJOR_VERSION@,@LIBXMLXX_MINOR_VERSION@,@LIBXMLXX_MICRO_VERSION@,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -51,11 +51,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "The libxml++ development team (see AUTHORS)"
VALUE "FileDescription", "The official C++ wrapper for libxml2"
- VALUE "FileVersion", "@VERSION@"
+ VALUE "FileVersion", "@PACKAGE_VERSION@"
VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
VALUE "OriginalFilename", "libxml++-2.6"
- VALUE "ProductName", "libxml++"
- VALUE "ProductVersion", "@VERSION@"
+ VALUE "ProductName", "@PACKAGE_NAME@"
+ VALUE "ProductVersion", "@PACKAGE_VERSION@"
END
END
BLOCK "VarFileInfo"
diff --git a/MSVC_Net2008/examples/dom_parser_raw/dom_parser_raw.vcproj b/MSVC_Net2008/examples/dom_parser_raw/dom_parser_raw.vcproj
new file mode 100644
index 0000000..6a37d2a
--- /dev/null
+++ b/MSVC_Net2008/examples/dom_parser_raw/dom_parser_raw.vcproj
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="examples_dom_parser_raw"
+ ProjectGUID="{947E2653-58AE-4BCC-8A77-B131850C8206}"
+ RootNamespace="examples_dispatcher"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/vd2"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../..;"../../libxml++""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glibmm-vc90-d-2_4.lib"
+ OutputFile="$(OutDir)/dom_parser_raw.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/vd2"
+ AdditionalIncludeDirectories="../../..;"../../libxml++""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glibmm-vc90-2_4.lib"
+ OutputFile="$(OutDir)/dom_parser_raw.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\blank.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\examples\dom_parser_raw\main.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/MSVC_Net2008/libxml++/libxml++.rc.in b/MSVC_Net2008/libxml++/libxml++.rc.in
index 14633d8..0adbec3 100644
--- a/MSVC_Net2008/libxml++/libxml++.rc.in
+++ b/MSVC_Net2008/libxml++/libxml++.rc.in
@@ -33,8 +33,8 @@ END
#endif // APSTUDIO_INVOKED
VS_VERSION_INFO VERSIONINFO
- FILEVERSION @GENERIC_MAJOR_VERSION@,@GENERIC_MINOR_VERSION@,@GENERIC_MICRO_VERSION@,1
- PRODUCTVERSION @GENERIC_MAJOR_VERSION@,@GENERIC_MINOR_VERSION@,@GENERIC_MICRO_VERSION@,1
+ FILEVERSION @LIBXMLXX_MAJOR_VERSION@,@LIBXMLXX_MINOR_VERSION@,@LIBXMLXX_MICRO_VERSION@,1
+ PRODUCTVERSION @LIBXMLXX_MAJOR_VERSION@,@LIBXMLXX_MINOR_VERSION@,@LIBXMLXX_MICRO_VERSION@,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -51,11 +51,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "The libxml++ development team (see AUTHORS)"
VALUE "FileDescription", "The official C++ wrapper for libxml2"
- VALUE "FileVersion", "@VERSION@"
+ VALUE "FileVersion", "@PACKAGE_VERSION@"
VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
VALUE "OriginalFilename", "libxml++-2.6"
- VALUE "ProductName", "libxml++"
- VALUE "ProductVersion", "@VERSION@"
+ VALUE "ProductName", "@PACKAGE_NAME@"
+ VALUE "ProductVersion", "@PACKAGE_VERSION@"
END
END
BLOCK "VarFileInfo"
diff --git a/Makefile.am b/Makefile.am
index dfb8c01..8b59a83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,253 @@
-## Process this file with automake to produce Makefile.in
+ACLOCAL_AMFLAGS = -I macros ${ACLOCAL_FLAGS}
+DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal
-SUBDIRS = libxml++ docs scripts examples MSVC_Net2005 MSVC_Net2008
+SUBDIRS = docs
-EXTRA_DIST = libxml++-2.6.pc.in libxml++.spec.in
+library_configdir = $(libdir)/libxml++- LIBXMLXX_API_VERSION@/include
+library_config_DATA = libxml++config.h
-DIST_SUBDIRS = $(SUBDIRS)
-
-# Install the pkg-config file:
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libxml++-2.6.pc
+nodist_pkgconfig_DATA = libxml++- LIBXMLXX_API_VERSION@.pc
+
+lib_LTLIBRARIES = libxml++/libxml++- LIBXMLXX_API_VERSION@.la
+libxml___libxml___ LIBXMLXX_API_VERSION@_la_LDFLAGS = \
+ -version-info $(LIBXMLXX_SO_VERSION) -no-undefined
+libxml___libxml___ LIBXMLXX_API_VERSION@_la_LIBADD = $(LIBXMLXX_LIBS)
+libxml___libxml___ LIBXMLXX_API_VERSION@_la_SOURCES = $(cc_sources) $(h_sources_public)
+
+noinst_PROGRAMS = examples/dom_build/dom_build \
+ examples/dom_parse_entities/dom_parse_entities \
+ examples/dom_parser/dom_parser \
+ examples/dom_parser_raw/dom_parser_raw \
+ examples/dom_read_write/dom_read_write \
+ examples/dom_xpath/dom_xpath \
+ examples/dtdvalidation/dtdvalidation \
+ examples/import_node/import_node \
+ examples/sax_exception/sax_exception \
+ examples/sax_parser/sax_parser \
+ examples/sax_parser_build_dom/sax_parser_build_dom \
+ examples/sax_parser_entities/sax_parser_entities \
+ examples/schemavalidation/schemavalidation \
+ examples/textreader/textreader
+
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I. $(LIBXMLXX_CFLAGS)
+AM_CXXFLAGS = $(LIBXMLXX_WXXFLAGS)
+DEFS = @DEFS@ -DLIBXMLPP_BUILD
+
+h_root_sources_public = libxml++/libxml++.h \
+ libxml++/attribute.h \
+ libxml++/document.h \
+ libxml++/dtd.h \
+ libxml++/keepblanks.h \
+ libxml++/noncopyable.h \
+ libxml++/schema.h
+h_exceptions_sources_public = libxml++/exceptions/exception.h \
+ libxml++/exceptions/parse_error.h \
+ libxml++/exceptions/validity_error.h \
+ libxml++/exceptions/internal_error.h
+h_io_sources_public = libxml++/io/istreamparserinputbuffer.h \
+ libxml++/io/outputbuffer.h \
+ libxml++/io/ostreamoutputbuffer.h \
+ libxml++/io/parserinputbuffer.h
+h_nodes_sources_public = libxml++/nodes/cdatanode.h \
+ libxml++/nodes/commentnode.h \
+ libxml++/nodes/contentnode.h \
+ libxml++/nodes/element.h \
+ libxml++/nodes/entityreference.h \
+ libxml++/nodes/node.h \
+ libxml++/nodes/processinginstructionnode.h \
+ libxml++/nodes/textnode.h
+h_parsers_sources_public = libxml++/parsers/parser.h \
+ libxml++/parsers/saxparser.h \
+ libxml++/parsers/domparser.h \
+ libxml++/parsers/textreader.h
+h_validators_sources_public = libxml++/validators/dtdvalidator.h \
+ libxml++/validators/schemavalidator.h \
+ libxml++/validators/validator.h
+h_sources_public = $(h_root_sources_public) \
+ $(h_exceptions_sources_public) \
+ $(h_io_sources_public) \
+ $(h_nodes_sources_public) \
+ $(h_parsers_sources_public) \
+ $(h_validators_sources_public)
+
+cc_sources = libxml++/attribute.cc \
+ libxml++/document.cc \
+ libxml++/dtd.cc \
+ libxml++/keepblanks.cc \
+ libxml++/noncopyable.cc \
+ libxml++/schema.cc \
+ libxml++/exceptions/exception.cc \
+ libxml++/exceptions/parse_error.cc \
+ libxml++/exceptions/validity_error.cc \
+ libxml++/exceptions/internal_error.cc \
+ libxml++/io/istreamparserinputbuffer.cc \
+ libxml++/io/outputbuffer.cc \
+ libxml++/io/ostreamoutputbuffer.cc \
+ libxml++/io/parserinputbuffer.cc \
+ libxml++/nodes/cdatanode.cc \
+ libxml++/nodes/commentnode.cc \
+ libxml++/nodes/contentnode.cc \
+ libxml++/nodes/entityreference.cc \
+ libxml++/nodes/element.cc \
+ libxml++/nodes/node.cc \
+ libxml++/nodes/processinginstructionnode.cc \
+ libxml++/nodes/textnode.cc \
+ libxml++/parsers/parser.cc \
+ libxml++/parsers/saxparser.cc \
+ libxml++/parsers/domparser.cc \
+ libxml++/parsers/textreader.cc \
+ libxml++/validators/dtdvalidator.cc \
+ libxml++/validators/schemavalidator.cc \
+ libxml++/validators/validator.cc
+
+library_includedir = $(includedir)/libxml++-$(LIBXMLXX_API_VERSION)/libxml++
+library_exceptions_includedir = $(library_includedir)/exceptions
+library_io_includedir = $(library_includedir)/io
+library_nodes_includedir = $(library_includedir)/nodes
+library_parsers_includedir = $(library_includedir)/parsers
+library_validators_includedir = $(library_includedir)/validators
+
+library_include_HEADERS = $(h_root_sources_public)
+library_exceptions_include_HEADERS = $(h_exceptions_sources_public)
+library_io_include_HEADERS = $(h_io_sources_public)
+library_nodes_include_HEADERS = $(h_nodes_sources_public)
+library_parsers_include_HEADERS = $(h_parsers_sources_public)
+library_validators_include_HEADERS = $(h_validators_sources_public)
+
+examples_dom_build_dom_build_SOURCES = examples/dom_build/main.cc
+examples_dom_parse_entities_dom_parse_entities_SOURCES = \
+ examples/dom_parse_entities/main.cc
+examples_dom_parser_dom_parser_SOURCES = examples/dom_parser/main.cc
+examples_dom_parser_raw_dom_parser_raw_SOURCES = examples/dom_parser_raw/main.cc
+examples_dom_read_write_dom_read_write_SOURCES = examples/dom_read_write/main.cc
+examples_dom_xpath_dom_xpath_SOURCES = examples/dom_xpath/main.cc
+examples_dtdvalidation_dtdvalidation_SOURCES = examples/dtdvalidation/main.cc
+examples_import_node_import_node_SOURCES = examples/import_node/main.cc
+examples_sax_exception_sax_exception_SOURCES = examples/sax_exception/main.cc \
+ examples/sax_exception/myparser.cc \
+ examples/sax_exception/myparser.h
+examples_sax_parser_sax_parser_SOURCES = examples/sax_parser/main.cc \
+ examples/sax_parser/myparser.cc \
+ examples/sax_parser/myparser.h
+examples_sax_parser_build_dom_sax_parser_build_dom_SOURCES = \
+ examples/sax_parser_build_dom/main.cc \
+ examples/sax_parser_build_dom/svgparser.cc \
+ examples/sax_parser_build_dom/svgparser.h \
+ examples/sax_parser_build_dom/svgdocument.cc \
+ examples/sax_parser_build_dom/svgdocument.h \
+ examples/sax_parser_build_dom/svgelement.cc \
+ examples/sax_parser_build_dom/svgelement.h \
+ examples/sax_parser_build_dom/svgpath.h \
+ examples/sax_parser_build_dom/svggroup.h
+examples_sax_parser_entities_sax_parser_entities_SOURCES = \
+ examples/sax_parser_entities/main.cc \
+ examples/sax_parser_entities/myparser.cc \
+ examples/sax_parser_entities/myparser.h
+examples_schemavalidation_schemavalidation_SOURCES = \
+ examples/schemavalidation/main.cc
+examples_textreader_textreader_SOURCES = examples/textreader/main.cc
+
+examples_dom_build_dom_build_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_dom_parse_entities_dom_parse_entities_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_dom_parser_dom_parser_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_dom_parser_raw_dom_parser_raw_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_dom_read_write_dom_read_write_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_dom_xpath_dom_xpath_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_dtdvalidation_dtdvalidation_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_import_node_import_node_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_sax_exception_sax_exception_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_sax_parser_sax_parser_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_sax_parser_build_dom_sax_parser_build_dom_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_sax_parser_entities_sax_parser_entities_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_schemavalidation_schemavalidation_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+examples_textreader_textreader_LDADD = \
+ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
+dist_noinst_DATA = libxml++config.h.in \
+ libxml++-$(LIBXMLXX_API_VERSION).pc.in \
+ MAINTAINERS \
+ examples/README \
+ examples/dom_parser/example.xml \
+ examples/dom_parser/example_with_namespace.xml \
+ examples/dom_parser/example_invalid.xml \
+ examples/dom_parser/example.dtd \
+ examples/dom_parser_raw/example.xml \
+ examples/dom_parser_raw/example.dtd \
+ examples/dom_parse_entities/example.xml \
+ examples/dom_parse_entities/example.dtd \
+ examples/dom_read_write/README \
+ examples/dom_read_write/example.xml \
+ examples/dom_read_write/example.dtd \
+ examples/dom_xpath/example.xml \
+ examples/dtdvalidation/example.dtd \
+ examples/import_node/example1.xml \
+ examples/import_node/example2.xml \
+ examples/sax_parser/example.xml \
+ examples/sax_parser_entities/example.xml \
+ examples/sax_exception/example.xml \
+ examples/sax_parser_build_dom/README \
+ examples/sax_parser_build_dom/example.xml \
+ examples/schemavalidation/example.xml \
+ examples/schemavalidation/example.xsd \
+ examples/textreader/example.xml \
+ MSVC_Net2005/blank.cpp \
+ MSVC_Net2005/libxml++.sln \
+ MSVC_Net2005/README \
+ MSVC_Net2005/gendef/gendef.cc \
+ MSVC_Net2005/gendef/gendef.vcproj \
+ MSVC_Net2005/libxml++/libxml++.rc \
+ MSVC_Net2005/libxml++/libxml++.vcproj \
+ MSVC_Net2005/libxml++/libxml++config.h \
+ MSVC_Net2005/examples/dom_build/dom_build.vcproj \
+ MSVC_Net2005/examples/dom_parse_entities/dom_parse_entities.vcproj \
+ MSVC_Net2005/examples/dom_parser/dom_parser.vcproj \
+ MSVC_Net2005/examples/dom_parser_raw/dom_parser_raw.vcproj \
+ MSVC_Net2005/examples/dom_read_write/dom_read_write.vcproj \
+ MSVC_Net2005/examples/dom_xpath/dom_xpath.vcproj \
+ MSVC_Net2005/examples/dtdvalidation/dtdvalidation.vcproj \
+ MSVC_Net2005/examples/import_node/import_node.vcproj \
+ MSVC_Net2005/examples/sax_exception/sax_exception.vcproj \
+ MSVC_Net2005/examples/sax_parser/sax_parser.vcproj \
+ MSVC_Net2005/examples/sax_parser_build_dom/sax_parser_build_dom.vcproj \
+ MSVC_Net2005/examples/sax_parser_entities/sax_parser_entities.vcproj \
+ MSVC_Net2005/examples/schemavalidation/schemavalidation.vcproj \
+ MSVC_Net2005/examples/textreader/textreader.vcproj \
+ MSVC_Net2008/blank.cpp \
+ MSVC_Net2008/libxml++.sln \
+ MSVC_Net2008/README \
+ MSVC_Net2008/gendef/gendef.cc \
+ MSVC_Net2008/gendef/gendef.vcproj \
+ MSVC_Net2008/libxml++/libxml++.rc \
+ MSVC_Net2008/libxml++/libxml++.vcproj \
+ MSVC_Net2008/libxml++/libxml++config.h \
+ MSVC_Net2008/examples/dom_build/dom_build.vcproj \
+ MSVC_Net2008/examples/dom_parse_entities/dom_parse_entities.vcproj \
+ MSVC_Net2008/examples/dom_parser/dom_parser.vcproj \
+ MSVC_Net2008/examples/dom_parser_raw/dom_parser_raw.vcproj \
+ MSVC_Net2008/examples/dom_read_write/dom_read_write.vcproj \
+ MSVC_Net2008/examples/dom_xpath/dom_xpath.vcproj \
+ MSVC_Net2008/examples/dtdvalidation/dtdvalidation.vcproj \
+ MSVC_Net2008/examples/import_node/import_node.vcproj \
+ MSVC_Net2008/examples/sax_exception/sax_exception.vcproj \
+ MSVC_Net2008/examples/sax_parser/sax_parser.vcproj \
+ MSVC_Net2008/examples/sax_parser_build_dom/sax_parser_build_dom.vcproj \
+ MSVC_Net2008/examples/sax_parser_entities/sax_parser_entities.vcproj \
+ MSVC_Net2008/examples/schemavalidation/schemavalidation.vcproj \
+ MSVC_Net2008/examples/textreader/textreader.vcproj
+DISTCLEANFILES = MSVC_Net2005/libxml++/libxml++config.h \
+ MSVC_Net2008/libxml++/libxml++config.h
diff --git a/README b/README
index 00fdec9..7474a6a 100644
--- a/README
+++ b/README
@@ -1,19 +1,21 @@
libxml++
-------------
-This library provides a C++ interface to XML files. It uses
-libxml 2 to access the XML files, and in order to
-configure libxml++ you must have both libxml and pkg-config installed.
+This library provides a C++ interface to XML files. It uses libxml 2 to access
+the XML files, and in order to configure libxml++ you must have both libxml and
+pkg-config installed.
-To get the latest version of libxml++, see http://libxmlplusplus.sourceforge.net/
-To contact the developers, send e-mail to the mailing list. We welcome patches, but
-it helps to discuss them first.
+To get the latest version of libxml++, see
+http://libxmlplusplus.sourceforge.net/
+To contact the developers, send e-mail to the mailing list. We welcome patches,
+but it helps to discuss them first.
Read the file 'INSTALL' for instructions to compile and install the library.
See the examples directory for example code.
-Use pkg-config to discover the necessary include and linker arguments. For instance,
+Use pkg-config to discover the necessary include and linker arguments. For
+instance,
pkg-config libxml++-2.6 --cflags --libs
Ideally you would use PKG_CHECK_MODULES in your configure.ac file.
-See http://www.murrayc.com for generic help with that.
+See http://www.openismus.com for generic help with that.
diff --git a/autogen.sh b/autogen.sh
index 3b5c8dc..06b774d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,46 +1,7 @@
-#! /bin/sh
-
-# $Id$
-#
-# Copyright (c) 2002 Daniel Elstner <daniel elstner gmx net>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License VERSION 2 as
-# published by the Free Software Foundation. You are not allowed to
-# use any other version of the license; unless you got the explicit
-# permission from the author to do so.
-#
-# 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
-
-
-dir=`echo "$0" | sed 's,[^/]*$,,'`
-test "x${dir}" = "x" && dir='.'
-
-if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
-then
- echo "This script must be executed directly from the source directory."
- exit 1
-fi
-
-rm -f config.cache acconfig.h
-
-echo "- aclocal." && \
-aclocal -I "scripts" $ACLOCAL_FLAGS && \
-echo "- libtoolize." && \
-libtoolize --force && \
-echo "- autoconf." && \
-autoconf && \
-echo "- automake." && \
-automake --add-missing --gnu && \
-echo && \
-./configure "$@" && exit 0
-
-exit 1
+#! /bin/sh -e
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+mm-common-prepare --copy --force "$srcdir"
+autoreconf --force --install --verbose "$srcdir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..cdec70d
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,58 @@
+AC_INIT([libxml++], [2.26.1],
+ [https://bugzilla.gnome.org/enter_bug.cgi?product=libxml%2B%2B],
+ [libxml++], [http://libxmlplusplus.sourceforge.net/])
+AC_PREREQ([2.59])
+
+AC_CONFIG_SRCDIR([libxml++/libxml++.h])
+AC_CONFIG_AUX_DIR([macros])
+AC_CONFIG_MACRO_DIR([macros])
+AC_CONFIG_HEADERS([config.h libxml++config.h])
+
+AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 no-define nostdinc subdir-objects])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
+
+MM_PREREQ([0.8])
+MM_INIT_MODULE([libxml++-2.6])
+
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+AC_SUBST([LIBXMLXX_SO_VERSION], [2:7:0])
+
+AC_PROG_CXX
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen win32-dll disable-static])
+
+PKG_CHECK_MODULES([LIBXMLXX], [libxml-2.0 >= 2.6.1 glibmm-2.4 >= 2.4.0])
+
+AC_LANG([C++])
+AC_CHECK_HEADERS([string list map], [], [AC_MSG_ERROR([required headers not found])])
+
+# Offer the ability to omit some API from the library, to reduce the code size:
+LIBXMLCPP_ARG_ENABLE_API_EXCEPTIONS()
+
+MM_ARG_ENABLE_WARNINGS([LIBXMLXX_WXXFLAGS],
+ [-Wall],
+ [-pedantic -Wall -Wextra])
+
+MM_CHECK_PERL()
+
+AC_CONFIG_FILES([
+ Makefile
+
+ docs/Makefile
+ docs/reference/Makefile
+ docs/reference/Doxyfile
+ docs/manual/Makefile
+
+ MSVC_Net2005/libxml++/libxml++.rc
+ MSVC_Net2008/libxml++/libxml++.rc
+
+ libxml++-2.6.pc
+])
+
+AC_CONFIG_COMMANDS([MSVC_Net2005/libxml++/libxml++config.h],
+ [cp -f libxml++config.h MSVC_Net2005/libxml++/libxml++config.h])
+AC_CONFIG_COMMANDS([MSVC_Net2008/libxml++/libxml++config.h],
+ [cp -f libxml++config.h MSVC_Net2008/libxml++/libxml++config.h])
+
+AC_OUTPUT
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 4853fb6..fe467f5 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -2,7 +2,7 @@ EXTRA_DIST = $(docbook_docs) html libxml++.xml libxml++_without_code.xml insert_
# Create a DocBook source file with the code inline, instead of the special comments.
libxml++.xml: libxml++_without_code.xml insert_example_code.pl
- $(PERL_PATH) insert_example_code.pl ../../examples $< >$@
+ $(PERL) insert_example_code.pl ../../examples $< >$@
docbook_docs = $(srcdir)/libxml++.xml
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index ca7fa2e..4906242 100644
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -3,8 +3,8 @@
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
-PROJECT_NAME = @PACKAGE@
-PROJECT_NUMBER = @VERSION@
+PROJECT_NAME = @PACKAGE_NAME@
+PROJECT_NUMBER = @PACKAGE_VERSION@
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
diff --git a/libxml++-2.6.pc.in b/libxml++-2.6.pc.in
index 49200cc..1c083c4 100644
--- a/libxml++-2.6.pc.in
+++ b/libxml++-2.6.pc.in
@@ -6,7 +6,7 @@ includedir= includedir@
Name: libxml++
Description: C++ wrapper for libxml
Requires: libxml-2.0 glibmm-2.4
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lxml++-2.6
Cflags: -I${includedir}/libxml++-2.6 -I${libdir}/libxml++-2.6/include
diff --git a/libxml++/Makefile.am b/libxml++/Makefile.am
index 08fdd4e..e511103 100644
--- a/libxml++/Makefile.am
+++ b/libxml++/Makefile.am
@@ -1,36 +1,73 @@
-SUBDIRS = parsers exceptions nodes io validators
-
-EXTRA_DIST = libxml++config.h.in
-
-INCLUDES = -I$(top_srcdir) @LIBXML_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I. $(LIBXMLXX_CFLAGS)
DEFS = @DEFS@ -DLIBXMLPP_BUILD
-h_sources_public = libxml++.h attribute.h dtd.h document.h noncopyable.h keepblanks.h schema.h
-h_sources_private =
-cc_sources = attribute.cc dtd.cc document.cc noncopyable.cc keepblanks.cc schema.cc
-cc_sources_private =
+h_sources_public = libxml++.h \
+ attribute.h \
+ document.h \
+ dtd.h \
+ keepblanks.h \
+ noncopyable.h \
+ schema.h \
+ exceptions/exception.h \
+ exceptions/parse_error.h \
+ exceptions/validity_error.h \
+ exceptions/internal_error.h \
+ io/istreamparserinputbuffer.h \
+ io/outputbuffer.h \
+ io/ostreamoutputbuffer.h \
+ io/parserinputbuffer.h \
+ nodes/cdatanode.h \
+ nodes/commentnode.h \
+ nodes/contentnode.h \
+ nodes/element.h \
+ nodes/entityreference.h \
+ nodes/node.h \
+ nodes/processinginstructionnode.h \
+ nodes/textnode.h \
+ parsers/parser.h \
+ parsers/saxparser.h \
+ parsers/domparser.h \
+ parsers/textreader.h \
+ validators/dtdvalidator.h \
+ validators/schemavalidator.h \
+ validators/validator.h
+cc_sources = attribute.cc \
+ document.cc \
+ dtd.cc \
+ keepblanks.cc \
+ noncopyable.cc \
+ schema.cc \
+ exceptions/exception.cc \
+ exceptions/parse_error.cc \
+ exceptions/validity_error.cc \
+ exceptions/internal_error.cc \
+ io/istreamparserinputbuffer.cc \
+ io/outputbuffer.cc \
+ io/ostreamoutputbuffer.cc \
+ io/parserinputbuffer.cc \
+ nodes/cdatanode.cc \
+ nodes/commentnode.cc \
+ nodes/contentnode.cc \
+ nodes/entityreference.cc \
+ nodes/element.cc \
+ nodes/node.cc \
+ nodes/processinginstructionnode.cc \
+ nodes/textnode.cc \
+ parsers/parser.cc \
+ parsers/saxparser.cc \
+ parsers/domparser.cc \
+ parsers/textreader.cc \
+ validators/dtdvalidator.cc \
+ validators/schemavalidator.cc \
+ validators/validator.cc
-# Support for DLL on cygwin/mingw using libtool > 1.4
-if PLATFORM_WIN32
-win32_dlls_ldflags = -no-undefined -Wl,--export-all-symbols
-else
-win32_dlls_ldflags =
-endif
+win32_dlls_ldflags = -no-undefined
lib_LTLIBRARIES = libxml++-2.6.la
-libxml___2_6_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION) $(win32_dlls_ldflags)
-libxml___2_6_la_LIBADD = parsers/libparsers.la \
- validators/libvalidators.la \
- exceptions/libexceptions.la \
- nodes/libnodes.la \
- io/libio.la \
- @LIBXML_LIBS@
-libxml___2_6_la_SOURCES = $(cc_sources) $(h_sources_public) $(h_sources_private) $(cc_sources_private)
+libxml___2_6_la_LDFLAGS = -version-info $(LIBXMLXX_SO_VERSION) $(win32_dlls_ldflags)
+libxml___2_6_la_LIBADD = $(LIBXMLXX_LIBS)
+libxml___2_6_la_SOURCES = $(cc_sources) $(h_sources_public)
# Install the headers:
library_includedir=$(includedir)/libxml++-2.6/libxml++
library_include_HEADERS = $(h_sources_public)
-
-library_configdir = $(libdir)/libxml++-2.6/include
-library_config_DATA = libxml++config.h
-
diff --git a/libxml++/libxml++config.h.in b/libxml++config.h.in
similarity index 96%
rename from libxml++/libxml++config.h.in
rename to libxml++config.h.in
index ed13f3d..f3e571a 100755
--- a/libxml++/libxml++config.h.in
+++ b/libxml++config.h.in
@@ -16,7 +16,7 @@
#ifdef GLIBMM_DLL
#if defined(LIBXMLPP_BUILD) && defined(_WINDLL)
// Do not dllexport as it is handled by gendef on MSVC
- #define LIBXMLPP_API
+ #define LIBXMLPP_API
#elif !defined(LIBXMLPP_BUILD)
#define LIBXMLPP_API __declspec(dllimport)
#else
diff --git a/scripts/reduced.m4 b/macros/reduced.m4
similarity index 100%
rename from scripts/reduced.m4
rename to macros/reduced.m4
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
