Merge branch 'master' into proj-8.0.0

scripts/expat/2.3.0/.travis.yml

@@ -0,0 +1,19 @@
+language: generic
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode12.0
+      compiler: clang
+    - os: linux
+      sudo: false
+      addons:
+        apt:
+          sources:
+           - ubuntu-toolchain-r-test
+          packages:
+           - libstdc++-6-dev
+
+script:
+- ./mason build ${MASON_NAME} ${MASON_VERSION}
+- ./mason publish ${MASON_NAME} ${MASON_VERSION}

scripts/expat/2.3.0/script.sh

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+MASON_NAME=expat
+MASON_VERSION=2.3.0
+MASON_VERSION2="R_${MASON_VERSION//./_}"
+MASON_LIB_FILE=lib/libexpat.a
+MASON_PKGCONFIG_FILE=lib/pkgconfig/expat.pc
+
+. ${MASON_DIR}/mason.sh
+
+function mason_load_source {
+    mason_download \
+        https://github.com/libexpat/libexpat/releases/download/${MASON_VERSION2}/expat-${MASON_VERSION}.tar.gz \
+        f6d07e2b059f7c17a0d16257d972268f66c4aec3
+    mason_extract_tar_gz
+
+    export MASON_BUILD_PATH=${MASON_ROOT}/.build/expat-${MASON_VERSION}
+}
+
+function mason_compile {
+    # Add optimization flags since CFLAGS overrides the default (-g -O2)
+    export CFLAGS="${CFLAGS} -O3 -DNDEBUG"
+    ./configure \
+        --prefix=${MASON_PREFIX} \
+        ${MASON_HOST_ARG} \
+        --without-xmlwf \
+        --enable-static \
+        --disable-shared \
+        --disable-dependency-tracking
+
+    make install -j${MASON_CONCURRENCY}
+}
+
+function mason_cflags {
+    echo -I${MASON_PREFIX}/include
+}
+
+function mason_ldflags {
+    echo -L${MASON_PREFIX}/lib -lexpat
+}
+
+
+function mason_clean {
+    make clean
+}
+
+mason_run "$@"

test/c_build.sh

@@ -3,8 +3,7 @@
 set -e -u
 set -o pipefail
 
-mason build expat 2.1.1
-mason build expat 2.2.0
+mason build expat 2.3.0
 mason build libzip 1.1.3
 mason build zlib 1.2.8
-mason build libuv 0.11.29
+mason build libuv 0.11.29