Merge pull request #5531 from bradking/update-expat

Add script to import expat from upstream.  Re-import expat 2.7.2 from upstream using our modern history structure.

Author: bradking

Modules/IO/XML/src/itkDOMNodeXMLReader.cxx

@@ -17,7 +17,7 @@
  *=========================================================================*/
 
 #include "itkDOMNodeXMLReader.h"
-#include "expat.h"
+#include "itk_expat.h"
 
 #include <fstream>
 

Modules/IO/XML/src/itkXMLFile.cxx

@@ -19,7 +19,7 @@
 #include "itksys/SystemTools.hxx"
 #include "itkMakeUniqueForOverwrite.h"
 #include <fstream>
-#include "expat.h"
+#include "itk_expat.h"
 
 namespace itk
 {

Modules/ThirdParty/Expat/.gitattributes

@@ -0,0 +1 @@
+src/itkexpat/lib/xmlparse.c        hooks-max-size=500000

Modules/ThirdParty/Expat/CMakeLists.txt

@@ -12,13 +12,16 @@ if(ITK_USE_SYSTEM_EXPAT)
   set(ITKExpat_NO_SRC 1)
 else()
   set(ITKExpat_INCLUDE_DIRS
-  ${ITKExpat_BINARY_DIR}/src/expat
-  ${ITKExpat_SOURCE_DIR}/src/expat/lib
+    ${ITKExpat_BINARY_DIR}/src
+    ${ITKExpat_BINARY_DIR}/src/itkexpat
+    ${ITKExpat_SOURCE_DIR}/src
   )
 set(ITKExpat_LIBRARIES ITKEXPAT)
 set(ITK_LIBRARY_PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS FALSE)
 set(EXPAT_GE ON CACHE BOOL   "Define to make general entity parsing functionality available" FORCE)
 set(XML_GE 1    CACHE STRING "Define to make general entity parsing functionality available" FORCE)
 endif()
 
+configure_file(src/itk_expat.h.in src/itk_expat.h)
+
 itk_module_impl()

Modules/ThirdParty/Expat/UpdateFromUpstream.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+set -e
+set -x
+shopt -s dotglob
+
+readonly name="expat"
+readonly ownership="Expat Upstream <[email protected]>"
+readonly subtree="Modules/ThirdParty/Expat/src/itk$name"
+readonly repo="https://github.com/libexpat/libexpat.git"
+readonly tag="R_2_7_2"
+readonly paths="
+expat/CMakeLists.txt
+expat/ConfigureChecks.cmake
+expat/COPYING
+expat/expat_config.h.cmake
+
+expat/lib/*.h
+expat/lib/*.c
+"
+
+extract_source () {
+    git_archive
+    pushd "${extractdir}/${name}-reduced"
+    echo "* -whitespace" >> .gitattributes
+    mv expat/* .
+    rmdir expat
+    fromdos ConfigureChecks.cmake CMakeLists.txt expat_config.h.cmake
+    chmod a-x ConfigureChecks.cmake CMakeLists.txt expat_config.h.cmake
+    popd
+}
+
+. "${BASH_SOURCE%/*}/../../../Utilities/Maintenance/update-third-party.bash"

Modules/ThirdParty/Expat/src/CMakeLists.txt

@@ -3,7 +3,7 @@ set(ITK3P_INSTALL_INCLUDE_DIR "${ITKExpat_INSTALL_INCLUDE_DIR}")
 set(ITK3P_INSTALL_RUNTIME_DIR "${ITKExpat_INSTALL_RUNTIME_DIR}")
 set(ITK3P_INSTALL_LIBRARY_DIR "${ITKExpat_INSTALL_LIBRARY_DIR}")
 set(ITK3P_INSTALL_ARCHIVE_DIR "${ITKExpat_INSTALL_ARCHIVE_DIR}")
-add_subdirectory(expat)
+add_subdirectory(itkexpat)
 itk_module_target(ITKEXPAT NO_INSTALL)
 mark_as_advanced(FORCE
   EXPAT_BUILD_DOCS

Modules/ThirdParty/Expat/src/itk_expat.h.in

@@ -0,0 +1,30 @@
+/*=========================================================================
+ *
+ *  Copyright NumFOCUS
+ *
+ *  Licensed 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.txt
+ *
+ *  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.
+ *
+ *=========================================================================*/
+
+#ifndef itk_expat_h
+#define itk_expat_h
+
+/* Use the expat library configured for ITK.  */
+#cmakedefine ITK_USE_SYSTEM_EXPAT
+#ifdef ITK_USE_SYSTEM_EXPAT
+# include <expat.h>
+#else
+# include "itkexpat/lib/expat.h"
+#endif
+
+#endif

Modules/ThirdParty/Expat/src/itkexpat/.gitattributes

@@ -0,0 +1 @@
+* -whitespace