(xmlsec-build) Fixed minor issues build scripts and makefiles (#1390)

Author: lsh123

autogen.sh

@@ -1,6 +1,12 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 # This is just a trivial wrapper around autoreconf and configure.
+#
+# The generated configure script runs in the current working directory, so
+# for an out-of-tree build create a build directory first, e.g.:
+#   mkdir build
+#   cd build
+#   ../autogen.sh [configure options]
 
 set -e
 

configure.ac

@@ -662,7 +662,7 @@ AC_MSG_RESULT([$LIBXSLT_FOUND])
 dnl Finally set variables
 if test "z$LIBXSLT_FOUND" = "zyes" ; then
     XMLSEC_NO_LIBXSLT="0"
-    LIBXSLT_PC_FILE_COND=", libxslt >= $LIBXSLT_MIN_VERSION"
+    LIBXSLT_PC_FILE_COND="libxslt >= $LIBXSLT_MIN_VERSION"
 else
     XMLSEC_NO_LIBXSLT="1"
     LIBXSLT_PC_FILE_COND=""
@@ -745,7 +745,7 @@ dnl Priority 3: Guess with pkg_config
 if test "z$OPENSSL_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
     PKG_CHECK_MODULES(OPENSSL, openssl >= $OPENSSL_MIN_VERSION,
         [OPENSSL_FOUND=yes
-         OPENSSL_PC_REQUIRES="openssl >= $OPENSSL_MIN_VERSION, "],
+         OPENSSL_PC_REQUIRES="openssl >= $OPENSSL_MIN_VERSION"],
         [OPENSSL_FOUND=no])
 fi
 
@@ -1051,39 +1051,39 @@ if test "z$NSPR_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" -a "z$with_mozill
     if test "z$NSPR_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(NSPR, mozilla-nspr >= $MOZILLA_MIN_VERSION,
             [NSPR_FOUND=yes NSPR_PACKAGE=mozilla-nspr
-                NSPR_PC_REQUIRES="mozilla-nspr >= $MOZILLA_MIN_VERSION, "],
+                NSPR_PC_REQUIRES="mozilla-nspr >= $MOZILLA_MIN_VERSION"],
             [NSPR_FOUND=no])
     fi
     if test "z$NSPR_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(NSPR, xulrunner-nspr >= $NSPR_MIN_VERSION,
             [NSPR_FOUND=yes NSPR_PACKAGE=xulrunner-nspr
-                NSPR_PC_REQUIRES="xulrunner-nspr >= $NSPR_MIN_VERSION, "],
+                NSPR_PC_REQUIRES="xulrunner-nspr >= $NSPR_MIN_VERSION"],
             [NSPR_FOUND=no])
     fi
     if test "z$NSPR_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(NSPR, nspr >= $NSPR_MIN_VERSION,
             [NSPR_FOUND=yes NSPR_PACKAGE=nspr
-                NSPR_PC_REQUIRES="nspr >= $NSPR_MIN_VERSION, "],
+                NSPR_PC_REQUIRES="nspr >= $NSPR_MIN_VERSION"],
             [NSPR_FOUND=no])
     fi
 fi
 if test "z$NSS_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" -a "z$with_mozilla_ver" = "z" ; then
     if test "z$NSS_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(NSS, mozilla-nss >= $MOZILLA_MIN_VERSION,
             [NSS_FOUND=yes NSS_PACKAGE=mozilla-nss
-                NSS_PC_REQUIRES="mozilla-nss >= $MOZILLA_MIN_VERSION, "],
+                NSS_PC_REQUIRES="mozilla-nss >= $MOZILLA_MIN_VERSION"],
             [NSS_FOUND=no])
     fi
     if test "z$NSS_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(NSS, xulrunner-nss >= $NSS_MIN_VERSION,
             [NSS_FOUND=yes NSS_PACKAGE=xulrunner-nss
-                NSS_PC_REQUIRES="xulrunner-nss >= $NSS_MIN_VERSION, "],
+                NSS_PC_REQUIRES="xulrunner-nss >= $NSS_MIN_VERSION"],
             [NSS_FOUND=no])
     fi
     if test "z$NSS_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(NSS, nss >= $NSS_MIN_VERSION,
             [NSS_FOUND=yes NSS_PACKAGE=nss
-                NSS_PC_REQUIRES="nss >= $NSS_MIN_VERSION, "],
+                NSS_PC_REQUIRES="nss >= $NSS_MIN_VERSION"],
             [NSS_FOUND=no])
     fi
 fi
@@ -1321,13 +1321,13 @@ if test "z$GNUTLS_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
     if test "z$GNUTLS_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_MIN_VERSION,
             [GNUTLS_FOUND=yes GNUTLS_PACKAGE=gnutls
-             GNUTLS_PC_REQUIRES="gnutls >= $GNUTLS_MIN_VERSION, "],
+             GNUTLS_PC_REQUIRES="gnutls >= $GNUTLS_MIN_VERSION"],
             [GNUTLS_FOUND=no])
     fi
     if test "z$GNUTLS_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(GNUTLS, libgnutls >= $GNUTLS_MIN_VERSION,
             [GNUTLS_FOUND=yes GNUTLS_PACKAGE=libgnutls
-             GNUTLS_PC_REQUIRES="libgnutls >= $GNUTLS_MIN_VERSION, "],
+             GNUTLS_PC_REQUIRES="libgnutls >= $GNUTLS_MIN_VERSION"],
             [GNUTLS_FOUND=no])
     fi
 fi
@@ -1642,25 +1642,25 @@ if test "z$GCRYPT_FOUND" = "zno" -a "z$PKGCONFIG_FOUND" = "zyes" ; then
     if test "z$GCRYPT_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(GCRYPT, gcrypt >= $GCRYPT_MIN_VERSION,
             [GCRYPT_FOUND=yes GCRYPT_PACKAGE=gcrypt
-             GCRYPT_PC_REQUIRES="gcrypt >= $GCRYPT_MIN_VERSION, "],
+             GCRYPT_PC_REQUIRES="gcrypt >= $GCRYPT_MIN_VERSION"],
             [GCRYPT_FOUND=no])
     fi
     if test "z$GCRYPT_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(GCRYPT, libgcrypt20 >= $GCRYPT_MIN_VERSION,
             [GCRYPT_FOUND=yes GCRYPT_PACKAGE=libgcrypt20
-             GCRYPT_PC_REQUIRES="libgcrypt20 >= $GCRYPT_MIN_VERSION, "],
+             GCRYPT_PC_REQUIRES="libgcrypt20 >= $GCRYPT_MIN_VERSION"],
             [GCRYPT_FOUND=no])
     fi
     if test "z$GCRYPT_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(GCRYPT, libgcrypt11 >= $GCRYPT_MIN_VERSION,
             [GCRYPT_FOUND=yes GCRYPT_PACKAGE=libgcrypt11
-             GCRYPT_PC_REQUIRES="libgcrypt11 >= $GCRYPT_MIN_VERSION, "],
+             GCRYPT_PC_REQUIRES="libgcrypt11 >= $GCRYPT_MIN_VERSION"],
             [GCRYPT_FOUND=no])
     fi
     if test "z$GCRYPT_FOUND" = "zno" ; then
         PKG_CHECK_MODULES(GCRYPT, libgcrypt >= $GCRYPT_MIN_VERSION,
             [GCRYPT_FOUND=yes GCRYPT_PACKAGE=libgcrypt
-             GCRYPT_PC_REQUIRES="libgcrypt >= $GCRYPT_MIN_VERSION, "],
+             GCRYPT_PC_REQUIRES="libgcrypt >= $GCRYPT_MIN_VERSION"],
             [GCRYPT_FOUND=no])
     fi
 fi

docs/md/Makefile.am

@@ -59,7 +59,7 @@ endif
 
 else
 
-docs, docs-copy, docs-manpages:
+docs docs-copy docs-manpages:
 	@(echo "=== ERROR: To build Markdown docs, make sure pandoc and python3 are installed" ; exit 1; )
 
 endif

scripts/README-WINDOWS.md.in

@@ -10,7 +10,7 @@ CMAKE_XMLSEC_RUNTIME="MultiThreadedDLL"
 CMAKE_XMLSEC_CONFIG=Release
 CMAKE_XMLSEC_SHARED_LIBS=ON
 
-cmake -B <build-path>" -A "${CMAKE_XMLSEC_ARCH}" -G "${CMAKE_XMLSEC_GENERATOR}" \
+cmake -B "<build-path>" -A "${CMAKE_XMLSEC_ARCH}" -G "${CMAKE_XMLSEC_GENERATOR}" \
     -D CMAKE_MSVC_RUNTIME_LIBRARY="${CMAKE_XMLSEC_RUNTIME}" \
     -D BUILD_SHARED_LIBS="${CMAKE_XMLSEC_SHARED_LIBS}" \
     -D CMAKE_PREFIX_PATH="<top-install-path>" \
@@ -20,7 +20,7 @@ cmake -B <build-path>" -A "${CMAKE_XMLSEC_ARCH}" -G "${CMAKE_XMLSEC_GENERATOR}"
     -D LIBXML2_WITH_ZLIB=OFF \
     -D LIBXML2_WITH_TESTS=OFF
 
-cmake --build <build-path>" --config "${CMAKE_XMLSEC_CONFIG}" 
+cmake --build "<build-path>" --config "${CMAKE_XMLSEC_CONFIG}"
 
 cmake --install "<build-path>" --config "${CMAKE_XMLSEC_CONFIG}"
 

scripts/build_coverity.sh

@@ -14,11 +14,20 @@ cov_url="https://scan.coverity.com/builds?project=xmlsec"
 cov_email="aleksey@aleksey.com"
 cur_pwd=`pwd`
 script_pwd=$(dirname "$0")
+srcdir=$(cd "$script_pwd/.." && pwd)
 today=`date +%F-%H-%M-%S`
 tar_file="xmlsec1-$version-$today.tar.gz"
 
+# Restore the caller's working directory on any exit (including 'set -e'
+# failures), since the script builds in the source tree.
+trap 'cd "$cur_pwd"' EXIT
+
 echo "============== Building xmlsec"
-"$script_pwd/../configure" --enable-legacy-features --enable-ftp --enable-http --with-gcrypt
+cd "$srcdir"
+# Regenerate the build system so that configure always matches the current
+# configure.ac, even if a stale configure was left over from a previous run.
+autoreconf -i -f
+./configure --enable-legacy-features --enable-ftp --enable-http --with-gcrypt
 make clean
 rm -rf cov-int/
 cov-build --dir cov-int make -j4

scripts/build_release.sh

@@ -3,6 +3,12 @@ set -e
 #
 # Usage: build_release.sh <version> [<release-candidate-tag>]
 #
+# Note: the temporary build area under /tmp ($build_root, created at the
+# start of the run) is intentionally left in place when the script finishes,
+# so that the cloned source and the built artifacts can be inspected;
+# remove it manually when it is no longer needed, e.g. with
+# 'rm -rf /tmp/xmlsec-build-area-<date-time>'.
+#
 
 
 # Configuration.

xmlsec-gcrypt.pc.in

@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: xmlsec1-gcrypt
 Version: @VERSION@
 Description: XML Security Library implements XML Signature and XML Encryption standards
-Requires: @GCRYPT_PC_REQUIRES@libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
+Requires: @GCRYPT_PC_REQUIRES@ libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
 Cflags: @XMLSEC_GCRYPT_CFLAGS@
 Cflags.private: -DXMLSEC_STATIC
 Libs: @XMLSEC_GCRYPT_LIBS@

xmlsec-gnutls.pc.in

@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: xmlsec1-gnutls
 Version: @VERSION@
 Description: XML Security Library implements XML Signature and XML Encryption standards
-Requires: @GNUTLS_PC_REQUIRES@libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
+Requires: @GNUTLS_PC_REQUIRES@ libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
 Cflags: @XMLSEC_GNUTLS_CFLAGS@
 Cflags.private: -DXMLSEC_STATIC
 Libs: @XMLSEC_GNUTLS_LIBS@

xmlsec-nss.pc.in

@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: xmlsec1-nss
 Version: @VERSION@
 Description: XML Security Library implements XML Signature and XML Encryption standards
-Requires: @NSS_PC_REQUIRES@@NSPR_PC_REQUIRES@libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
+Requires: @NSS_PC_REQUIRES@ @NSPR_PC_REQUIRES@ libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
 Cflags: @XMLSEC_NSS_CFLAGS@
 Cflags.private: -DXMLSEC_STATIC
 Libs: @XMLSEC_NSS_LIBS@

xmlsec-openssl.pc.in

@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: xmlsec1-openssl
 Version: @VERSION@
 Description: XML Security Library implements XML Signature and XML Encryption standards
-Requires: @OPENSSL_PC_REQUIRES@libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
+Requires: @OPENSSL_PC_REQUIRES@ libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
 Cflags: @XMLSEC_OPENSSL_CFLAGS@
 Cflags.private: -DXMLSEC_STATIC
 Libs: @XMLSEC_OPENSSL_LIBS@