Added: xerces/c/trunk/doc/Makefile.am URL: http://svn.apache.org/viewvc/xerces/c/trunk/doc/Makefile.am?rev=1824295&view=auto ============================================================================== --- xerces/c/trunk/doc/Makefile.am (added) +++ xerces/c/trunk/doc/Makefile.am Thu Feb 15 11:17:15 2018 @@ -0,0 +1,154 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +DOCS_CLASSPATH=$(abs_top_srcdir)/tools/jars/stylebook-1.0-b2.jar:$(abs_top_srcdir)/tools/jars/xalan.jar:$(abs_top_srcdir)/tools/jars/xerces.jar +DOCS_SRCSTYLE=$(abs_top_srcdir)/doc/style +DOCS_BUILDSTYLE=$(abs_top_builddir)/doc/style +DOCS_SOURCE=$(abs_top_srcdir)/doc/xerces-c_book.xml +DOCS_TARGET=$(abs_top_builddir)/doc/html + +createapidocs: + doxygen Doxyfile + +# stylebook doesn't like the same style directory being specified +# twice for in-source builds. +createdocs: + $(MKDIR_P) "$(DOCS_TARGET)"; \ + if [ "$(abs_top_srcdir)" != "$(abs_top_builddir)" ]; then \ + for file in $(STYLE_FILES); do \ + $(INSTALL) -d $(builddir)/$$(dirname $$file); \ + $(INSTALL_DATA) $(srcdir)/$$file $(builddir)/$$file; \ + done; \ + fi; \ + java -Djava.awt.headless=true -classpath "$(DOCS_CLASSPATH)" \ + org.apache.stylebook.StyleBook \ + "targetDirectory=$(DOCS_TARGET)" \ + "$(DOCS_SOURCE)" \ + "$(DOCS_BUILDSTYLE)" + +STYLE_FILES = \ + style/dtd/blocks.ent \ + style/dtd/book.dtd \ + style/dtd/changes.dtd \ + style/dtd/characters.ent \ + style/dtd/document.dtd \ + style/dtd/entities.ent.in \ + style/dtd/faqs.dtd \ + style/dtd/links.ent \ + style/dtd/markup.ent \ + style/graphics/button-a.gif \ + style/graphics/button-b.gif \ + style/graphics/section.gif \ + style/loader.xml \ + style/resources/bottom.gif \ + style/resources/button-asf-hi.gif \ + style/resources/button-asf-lo.gif \ + style/resources/button-w3c-hi.gif \ + style/resources/button-w3c-lo.gif \ + style/resources/button-xml-hi.gif \ + style/resources/button-xml-lo.gif \ + style/resources/close.gif \ + style/resources/dot.gif \ + style/resources/join.gif \ + style/resources/line.gif \ + style/resources/logo.gif \ + style/resources/note.gif \ + style/resources/right.gif \ + style/resources/script.js \ + style/resources/separator-space.gif \ + style/resources/separator.gif \ + style/resources/void.gif \ + style/stylesheets/any2header.xsl \ + style/stylesheets/any2project.xsl \ + style/stylesheets/book2group.xsl \ + style/stylesheets/book2project.xsl \ + style/stylesheets/changes2document.xsl \ + style/stylesheets/context2footer.xsl \ + style/stylesheets/context2label.xsl \ + style/stylesheets/context2section.xsl \ + style/stylesheets/directory2project.xsl \ + style/stylesheets/document2html.xsl \ + style/stylesheets/faqs2document.xsl \ + style/stylesheets/group2document.xsl + +EXTRA_DIST = CMakeLists.txt \ + Doxyfile.in \ + Makefile.am \ + apidocs.xml \ + applications.xml \ + bug-report.xml \ + build.xml \ + charter.xml \ + createdoc.xml \ + domcount.xml \ + domprint.xml \ + download.xml \ + enumval.xml \ + faq-build.xml \ + faq-contributing.xml \ + faq-distrib.xml \ + faq-other.xml \ + faq-parse.xml \ + feedback.xml \ + html/ApacheDOMC++Binding.html \ + html/secadv/CVE-2015-0252.txt \ + html/secadv/CVE-2016-0729.txt \ + html/secadv/CVE-2016-4463.txt \ + install.xml \ + mailing-lists.xml \ + memparse.xml \ + migration.xml \ + migration_archive.xml \ + pparse.xml \ + program-dom.xml \ + program-others.xml \ + program-sax.xml \ + program-sax2.xml \ + program.xml \ + psviwriter.xml \ + readme.xml \ + redirect.xml \ + releases.xml \ + releases_archive.xml \ + releases_plan.xml \ + samples.xml \ + sax2count.xml \ + sax2print.xml \ + saxcount.xml \ + saxprint.xml \ + schema.xml \ + scmprint.xml \ + secadv.xml \ + senumval.xml \ + source-repository.xml \ + stdinparse.xml \ + xerces-c_book.xml \ + xinclude.xml \ + $(STYLE_FILES) + +dist-hook: createapidocs createdocs + $(MKDIR_P) "$(distdir)/html"; \ + cp -r html/* "$(distdir)/html" + +# Clean up copied style files and generated documentation +clean-local: + if [ "$(abs_top_srcdir)" != "$(abs_top_builddir)" ]; then \ + for file in $(STYLE_FILES); do rm -f $(builddir)/$$file; done; \ + rm -rf html; \ + fi + +.PHONY: createapidocs createdocs
Modified: xerces/c/trunk/doc/source-repository.xml URL: http://svn.apache.org/viewvc/xerces/c/trunk/doc/source-repository.xml?rev=1824295&r1=1824294&r2=1824295&view=diff ============================================================================== --- xerces/c/trunk/doc/source-repository.xml (original) +++ xerces/c/trunk/doc/source-repository.xml Thu Feb 15 11:17:15 2018 @@ -50,10 +50,10 @@ svn co https://svn.apache.org/repos/asf/ svn co https://svn.apache.org/repos/asf/xerces/c/branches/xerces-3.1 </source> - <p>To check out the code for the 3.2.0 release, execute:</p> + <p>To check out the code for the &XercesC3Version; release, execute:</p> <source> -svn co https://svn.apache.org/repos/asf/xerces/c/tags/Xerces-C_3_2_0 +svn co https://svn.apache.org/repos/asf/xerces/c/tags/Xerces-C_&XercesC3UVersion; </source> <p>You can also browse the repository and examine individual Added: xerces/c/trunk/doc/style/dtd/entities.ent.in URL: http://svn.apache.org/viewvc/xerces/c/trunk/doc/style/dtd/entities.ent.in?rev=1824295&view=auto ============================================================================== --- xerces/c/trunk/doc/style/dtd/entities.ent.in (added) +++ xerces/c/trunk/doc/style/dtd/entities.ent.in Thu Feb 15 11:17:15 2018 @@ -0,0 +1,39 @@ +<?xml encoding="ISO-8859-1"?> + +<!ENTITY XercesCProjectName "Xerces"> <!-- projectname --> +<!ENTITY XercesCFullName "Xerces-C++ XML Parser"> <!-- fullproductname --> +<!ENTITY XercesCName "Xerces-C++"> <!-- productname --> +<!ENTITY XercesCLatest "@VERSION@"> <!-- versionnumber --> +<!ENTITY XercesCDevelEmailAddress "[email protected]"> <!-- emailaddress --> +<!ENTITY XercesCDevelSAddress "[email protected]"> <!-- emailaddress --> +<!ENTITY XercesCDevelUAddress "[email protected]"> <!-- emailaddress --> +<!ENTITY XercesCDevelHAddress "[email protected]"> <!-- emailaddress --> +<!ENTITY XercesCUserEmailAddress "[email protected]"> <!-- emailaddress --> +<!ENTITY XercesCUserSAddress "[email protected]"> <!-- emailaddress --> +<!ENTITY XercesCUserUAddress "[email protected]"> <!-- emailaddress --> +<!ENTITY XercesCUserHAddress "[email protected]"> <!-- emailaddress --> +<!ENTITY JiraURL "http://issues.apache.org/jira/browse/XERCESC "> <!-- url --> +<!ENTITY XercesDistDir "xerces.apache.org/xerces-c/download.cgi"> <!-- download directory --> + +<!ENTITY colon ":"> +<!ENTITY percent "%"> + +<!-- The following entities are used in project documentation --> + +<!ENTITY HelpURI "http://xerces.apache.org/xerces-c/feedback.html";> <!-- help and feedback --> +<!ENTITY BugURI "http://xerces.apache.org/xerces-c/bug-report.html";> <!-- bug reporting --> +<!ENTITY MailURI "http://xerces.apache.org/xerces-c/mailing-lists.html";> <!-- mailing lists --> +<!ENTITY RepURI "http://xerces.apache.org/xerces-c/source-repository.html";> <!-- mailing lists --> + +<!ENTITY XercesC3Series "@XERCES_VERSION_MAJOR@"> <!-- release series --> +<!ENTITY XercesC3Version "@VERSION@"> <!-- 3-series version number --> +<!ENTITY XercesC3UVersion "@XERCES_VERSION_MAJOR@_@XERCES_VERSION_MINOR@_@XERCES_VERSION_REVISION@"> <!-- 3-series version number with underscores--> +<!ENTITY XercesC3InstallDir "xerces-c-@VERSION@"> <!-- installdirname --> +<!ENTITY XercesC3SrcInstallDir "xerces-c-@VERSION@"> <!-- sourcedirectory --> +<!ENTITY XercesC3ToolsInstallDir "xerces-c-tools-@VERSION@"> <!-- sourcedirectory --> +<!ENTITY XercesC3WindowsLib "xerces-c_@INTERFACE_VERSION_MAJOR@"> <!-- windowslibname --> +<!ENTITY XercesC3WindowsDLL "xerces-c_@INTERFACE_VERSION_U@"> <!-- windowsDLLname --> +<!ENTITY XercesC3UnixSoVersion "@INTERFACE_VERSION_D@"> <!-- unixlibversion --> +<!ENTITY XercesC3UnixLib "libxerces-c"> <!-- unixlibname --> +<!ENTITY XercesC3Namespace "xercesc"> <!-- C++ namespace name --> +<!ENTITY XercesC3NSVersion "xercesc_@XERCES_VERSION_MAJOR@_@XERCES_VERSION_MINOR@"> <!-- C++ namespace name with Version --> Modified: xerces/c/trunk/src/CMakeLists.txt URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/CMakeLists.txt?rev=1824295&r1=1824294&r2=1824295&view=diff ============================================================================== --- xerces/c/trunk/src/CMakeLists.txt (original) +++ xerces/c/trunk/src/CMakeLists.txt Thu Feb 15 11:17:15 2018 @@ -25,8 +25,8 @@ set(EXTRA_DIST xercesc/NLS xercesc/util/Xerces_autoconf_config.hpp.cmake.in xercesc/util/Xerces_autoconf_config.hpp.in - xercesc/util/Xerces_autoconf_config.msvc.hpp - xercesc/util/Xerces_autoconf_config.borland.hpp + xercesc/util/XercesVersion.hpp.cmake.in + xercesc/util/XercesVersion.hpp.in xercesc/util/MsgLoaders/ICU/resources ) @@ -1140,7 +1140,7 @@ if(XERCES_USE_MSGLOADER_ICU) list(APPEND libxerces_c_DEPS ICU::uc ICU::data) # Resource shortname - set(PKGNAME xercesc_messages_${LIB_INTERFACE_VER_U}) + set(PKGNAME xercesc_messages_${INTERFACE_VERSION_U}) add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/xercesc_messages.c" @@ -1256,15 +1256,15 @@ if(MSVC) target_compile_definitions(xerces-c PRIVATE "XERCES_DLL_NAME=\"$<TARGET_FILE_NAME:xerces-c>\\0\"") # Different naming for Windows than for Unix builds for backward # compatibility with the existing project files. - set_target_properties(xerces-c PROPERTIES OUTPUT_NAME "xerces-c_${LIB_INTERFACE_VER_U_MAJOR}") - set_target_properties(xerces-c PROPERTIES RUNTIME_OUTPUT_NAME "xerces-c_${LIB_INTERFACE_VER_U}") + set_target_properties(xerces-c PROPERTIES OUTPUT_NAME "xerces-c_${INTERFACE_VERSION_U_MAJOR}") + set_target_properties(xerces-c PROPERTIES RUNTIME_OUTPUT_NAME "xerces-c_${INTERFACE_VERSION_U}") set_target_properties(xerces-c PROPERTIES DEBUG_POSTFIX "D") elseif(UNIX) # For strict libtool compatibility on Unix. It's a horrible hack to # set the version in the filename, and create the symlink at install # time. Note: could be dropped when the SONAME is updated and # libtool compatibility is no longer required. - set_target_properties(xerces-c PROPERTIES OUTPUT_NAME "xerces-c-${LIB_INTERFACE_VER_D}") + set_target_properties(xerces-c PROPERTIES OUTPUT_NAME "xerces-c-${INTERFACE_VERSION_D}") file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/InstallLibrarySymlink.cmake" CONTENT "execute_process(COMMAND ln -sf \"$<TARGET_FILE_NAME:xerces-c>\" \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBDIR}/libxerces-c.so\")") @@ -1272,13 +1272,13 @@ elseif(UNIX) else() # Not used for the common cases, though this would be the default if # not for libtool compatibility. - set_target_properties(xerces-c PROPERTIES SOVERSION ${LIB_INTERFACE_VER_D}) + set_target_properties(xerces-c PROPERTIES SOVERSION ${INTERFACE_VERSION_D}) if(NOT CYGWIN) # This property causes shared libraries on Linux to have the full # version encoded into their final filename. We disable this on # Cygwin because it causes xerces-c-${XERCES_C_FULL_VERSION}.dll # to be created when xerces-c.dll seems to be the default. - set_target_properties(xerces-c PROPERTIES VERSION ${LIB_INTERFACE_VER_D}) + set_target_properties(xerces-c PROPERTIES VERSION ${INTERFACE_VERSION_D}) endif() endif() set_target_properties(xerces-c PROPERTIES FOLDER "Library") @@ -1344,9 +1344,10 @@ endif() unset(group_dir) unset(group_files) -# Make sure cmake-generated Xerces_autoconf_config.hpp ends up in a -# proper place when installed. +# Make sure cmake-generated Xerces_autoconf_config.hpp and +# Xerces_version_config.hpp end up in a proper place when installed. install( FILES "${CMAKE_CURRENT_BINARY_DIR}/xercesc/util/Xerces_autoconf_config.hpp" + "${CMAKE_CURRENT_BINARY_DIR}/xercesc/util/Xerces_version_config.hpp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/xercesc/util" COMPONENT "development") Modified: xerces/c/trunk/src/Makefile.am URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/Makefile.am?rev=1824295&r1=1824294&r2=1824295&view=diff ============================================================================== --- xerces/c/trunk/src/Makefile.am (original) +++ xerces/c/trunk/src/Makefile.am Thu Feb 15 11:17:15 2018 @@ -19,8 +19,6 @@ # $Id$ # -include ${top_srcdir}/version.incl - DEFS += -DXERCES_BUILDING_LIBRARY # @@ -32,7 +30,7 @@ lib_LTLIBRARIES = libxerces-c.la # AM_CPPFLAGS = -libxerces_c_la_LDFLAGS = -release ${INTERFACE_VER_D} +libxerces_c_la_LDFLAGS = -release @INTERFACE_VERSION_D@ # This sets {install}/include as target for the headers libxerces_c_ladir = ${includedir} @@ -47,11 +45,13 @@ ${domimpl_headers} ${framework_headers} ${parsers_headers} ${sax_headers} ${sax2_headers} ${validators_headers} \ ${xinclude_headers} -# Make sure autoconf-generated Xerces_autoconf_config.hpp ends up in a -# proper place when installed. +# Make sure autoconf-generated Xerces_autoconf_config.hpp and +# Xerces_version_config.hpp end up in a proper place when installed. # autoconfheadersdir = $(includedir)/xercesc/util -nodist_autoconfheaders_HEADERS = ${top_builddir}/src/xercesc/util/Xerces_autoconf_config.hpp +nodist_autoconfheaders_HEADERS = \ + ${top_builddir}/src/xercesc/util/Xerces_autoconf_config.hpp \ + ${top_builddir}/src/xercesc/util/Xerces_version_config.hpp # Compatibility library. # @@ -60,6 +60,7 @@ EXTRA_DIST = CMakeLists.txt \ stricmp.h strnicmp.h towlower.h towupper.h \ xercesc/NLS \ xercesc/util/Xerces_autoconf_config.hpp.cmake.in \ + xercesc/util/Xerces_version_config.hpp.cmake.in \ xercesc/util/MsgLoaders/ICU/resources libxerces_c_la_LIBADD = ${LTLIBOBJS} @@ -131,7 +132,7 @@ nobase_libxerces_c_la_HEADERS += ${msgic AM_CPPFLAGS += ${ICU_FLAGS} # Resource shortname -PKGNAME=xercesc_messages_${INTERFACE_VER_U} +PKGNAME=xercesc_messages_@INTERFACE_VERSION_U@ CLEANFILES = xercesc_messages.c root_res.c root.res BUILT_SOURCES = xercesc_messages.c root_res.c Modified: xerces/c/trunk/src/xercesc/util/XercesVersion.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XercesVersion.hpp?rev=1824295&r1=1824294&r2=1824295&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/XercesVersion.hpp (original) +++ xerces/c/trunk/src/xercesc/util/XercesVersion.hpp Thu Feb 15 11:17:15 2018 @@ -126,9 +126,8 @@ * AND DO NOT MODIFY ANYTHING ELSE IN THIS VERSION HEADER FILE */ -#define XERCES_VERSION_MAJOR 3 -#define XERCES_VERSION_MINOR 2 -#define XERCES_VERSION_REVISION 0 +// XERCES_VERSION_MAJOR, XERCES_VERSION_MINOR and XERCES_VERSION_REVISION +#include <xercesc/util/Xerces_version_config.hpp> /*** * Modified: xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.in URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.in?rev=1824295&r1=1824294&r2=1824295&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.in (original) +++ xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.in Thu Feb 15 11:17:15 2018 @@ -48,6 +48,7 @@ // --------------------------------------------------------------------------- // These defines are set by configure as appropriate for the platform. // --------------------------------------------------------------------------- + #undef XERCES_AUTOCONF #undef XERCES_HAVE_CSTDINT #undef XERCES_HAVE_STDINT_H Added: xerces/c/trunk/src/xercesc/util/Xerces_version_config.hpp.cmake.in URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Xerces_version_config.hpp.cmake.in?rev=1824295&view=auto ============================================================================== --- xerces/c/trunk/src/xercesc/util/Xerces_version_config.hpp.cmake.in (added) +++ xerces/c/trunk/src/xercesc/util/Xerces_version_config.hpp.cmake.in Thu Feb 15 11:17:15 2018 @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * $Id$ + */ + +#ifndef XERCES_VERSION_CONFIG_HPP +#define XERCES_VERSION_CONFIG_HPP + +// --------------------------------------------------------------------------- +// These defines are set by configure as appropriate for the platform. +// --------------------------------------------------------------------------- + +#define XERCES_VERSION_MAJOR @XERCES_VERSION_MAJOR@ +#define XERCES_VERSION_MINOR @XERCES_VERSION_MINOR@ +#define XERCES_VERSION_REVISION @XERCES_VERSION_REVISION@ + +#endif Added: xerces/c/trunk/src/xercesc/util/Xerces_version_config.hpp.in URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Xerces_version_config.hpp.in?rev=1824295&view=auto ============================================================================== --- xerces/c/trunk/src/xercesc/util/Xerces_version_config.hpp.in (added) +++ xerces/c/trunk/src/xercesc/util/Xerces_version_config.hpp.in Thu Feb 15 11:17:15 2018 @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * $Id$ + */ + +#ifndef XERCES_VERSION_CONFIG_HPP +#define XERCES_VERSION_CONFIG_HPP + +// --------------------------------------------------------------------------- +// These defines are set by configure as appropriate for the platform. +// --------------------------------------------------------------------------- + +#undef XERCES_VERSION_MAJOR +#undef XERCES_VERSION_MINOR +#undef XERCES_VERSION_REVISION + +#endif Modified: xerces/c/trunk/xerces-c.spec URL: http://svn.apache.org/viewvc/xerces/c/trunk/xerces-c.spec?rev=1824295&r1=1824294&r2=1824295&view=diff ============================================================================== --- xerces/c/trunk/xerces-c.spec (original) +++ xerces/c/trunk/xerces-c.spec Thu Feb 15 11:17:15 2018 @@ -1,6 +1,6 @@ Summary: Xerces-C++ validating XML parser Name: xerces-c -Version: 3.2.0 +Version: 3.2.1 Release: 1 URL: http://xerces.apache.org/xerces-c/ Source0: %{name}-%{version}.tar.gz --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
