diff --git a/.gitignore b/.gitignore index 75b47ca5..5fee4d2f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ coverage test/bench/node_modules test/fixtures/output* test/leak/libvips.supp - -# Mac OS X +lib +include .DS_Store diff --git a/.npmignore b/.npmignore index 0132a284..dda57203 100644 --- a/.npmignore +++ b/.npmignore @@ -8,3 +8,5 @@ test .travis.yml appveyor.yml mkdocs.yml +lib +include diff --git a/appveyor.yml b/appveyor.yml index a42a1940..095b85a1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,8 +3,8 @@ version: "{build}" build: off platform: x64 environment: - VIPS_VERSION_MAJOR_MINOR: 8.0 - VIPS_VERSION_PATCH: 2 + VIPS_VERSION_MAJOR_MINOR: 8.1 + VIPS_VERSION_PATCH: 0 VIPS_WARNING: 0 matrix: - nodejs_version: "0.12" diff --git a/docs/install.md b/docs/install.md index e06e8734..2dbe635a 100644 --- a/docs/install.md +++ b/docs/install.md @@ -19,11 +19,12 @@ For a system-wide installation of the most suitable version of libvips and its dependencies on the following Operating Systems: * Debian 7, 8 -* Ubuntu 12.04, 14.04, 14.10, 15.04 +* Ubuntu 12.04, 14.04, 14.10, 15.04, 15.10 * Mint 13, 17 +* Elementary 0.3 * RHEL/Centos/Scientific 6, 7 * Fedora 21, 22 -* Amazon Linux 2014.09, 2015.03 +* Amazon Linux 2015.03, 2015.09 * OpenSuse 13 run the following as a user with `sudo` access: diff --git a/preinstall.sh b/preinstall.sh index a66ac0e0..127a62f1 100755 --- a/preinstall.sh +++ b/preinstall.sh @@ -4,16 +4,18 @@ # Currently supports: # * Debian Linux # * Debian 7, 8 -# * Ubuntu 12.04, 14.04, 14.10, 15.04 +# * Ubuntu 12.04, 14.04, 14.10, 15.04, 15.10 # * Mint 13, 17 +# * Elementary 0.3 # * Red Hat Linux # * RHEL/Centos/Scientific 6, 7 # * Fedora 21, 22 -# * Amazon Linux 2014.09, 2015.03 +# * Amazon Linux 2015.03, 2015.09 +# * OpenSuse 13 vips_version_minimum=7.40.0 -vips_version_latest_major_minor=8.0 -vips_version_latest_patch=2 +vips_version_latest_major_minor=8.1 +vips_version_latest_patch=0 openslide_version_minimum=3.4.0 openslide_version_latest_major_minor=3.4 @@ -24,7 +26,7 @@ install_libvips_from_source() { curl -O http://www.vips.ecs.soton.ac.uk/supported/$vips_version_latest_major_minor/vips-$vips_version_latest_major_minor.$vips_version_latest_patch.tar.gz tar zvxf vips-$vips_version_latest_major_minor.$vips_version_latest_patch.tar.gz cd vips-$vips_version_latest_major_minor.$vips_version_latest_patch - ./configure --disable-debug --disable-docs --disable-static --disable-introspection --enable-cxx=yes --without-python --without-orc --without-fftw $1 + ./configure --disable-debug --disable-docs --disable-static --disable-introspection --disable-dependency-tracking --enable-cxx=yes --without-python --without-orc --without-fftw $1 make make install cd .. @@ -283,12 +285,12 @@ elif [ -f /etc/system-release ]; then # Probably Amazon Linux RELEASE=$(cat /etc/system-release) case $RELEASE in - "Amazon Linux AMI release 2014.09"|"Amazon Linux AMI release 2015.03") + "Amazon Linux AMI release 2015.03"|"Amazon Linux AMI release 2015.09") # Amazon Linux echo "Detected '$RELEASE'" echo "Installing libvips dependencies via yum" yum groupinstall -y "Development Tools" - yum install -y gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel libgsf-devel lcms-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl + yum install -y gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel libgsf-devel lcms2-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl install_libvips_from_source "--prefix=/usr" ;; *)