rmagick 4.1.0.rc2 → 4.1.0

data/before_install_linux.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 set -euox pipefail
 
 gem install bundler
@@ -13,66 +15,54 @@ if [ ! -v IMAGEMAGICK_VERSION ]; then
   exit 1
 fi
 
+sudo apt-get clean
+sudo apt-get update
+
 # remove all existing imagemagick related packages
 sudo apt-get autoremove -y imagemagick* libmagick* --purge
 
-if [ ! -v TRAVIS ]; then
-  sudo apt-get update
-
-  # install build tools, ImageMagick delegates
-  sudo apt-get install -y build-essential libx11-dev libxext-dev zlib1g-dev \
-    liblcms2-dev libpng-dev libjpeg-dev libfreetype6-dev libxml2-dev \
-    libtiff5-dev libwebp-dev vim ghostscript ccache
-fi
+# install build tools, ImageMagick delegates
+sudo apt-get install -y build-essential libx11-dev libxext-dev zlib1g-dev \
+  liblcms2-dev libpng-dev libjpeg-dev libfreetype6-dev libxml2-dev \
+  libtiff5-dev libwebp-dev vim gsfonts ghostscript ccache
 
 if [ ! -d /usr/include/freetype ]; then
   # If `/usr/include/freetype` is not existed, ImageMagick 6.7 configuration fails about Freetype.
   sudo ln -sf /usr/include/freetype2 /usr/include/freetype
 fi
 
-project_dir=`pwd`
-build_dir=${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}
+project_dir=$(pwd)
+build_dir="${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}"
 if [ -v CONFIGURE_OPTIONS ]; then
-  build_dir=${build_dir}-${CONFIGURE_OPTIONS}
+  build_dir="${build_dir}-${CONFIGURE_OPTIONS}"
 fi
 
 build_imagemagick() {
   mkdir -p build-ImageMagick
 
   version=(${IMAGEMAGICK_VERSION//./ })
-  if (( "${version[0]}" >= 7 )); then
-    wget https://github.com/ImageMagick/ImageMagick/archive/${IMAGEMAGICK_VERSION}.tar.gz
-    tar -xf ${IMAGEMAGICK_VERSION}.tar.gz
-    mv ImageMagick-${IMAGEMAGICK_VERSION} $build_dir
-  elif (( "${version[0]}${version[1]}" >= 69 )); then
-    wget https://github.com/ImageMagick/ImageMagick6/archive/${IMAGEMAGICK_VERSION}.tar.gz
-    tar -xf ${IMAGEMAGICK_VERSION}.tar.gz
-    rm ${IMAGEMAGICK_VERSION}.tar.gz
-    mv ImageMagick6-${IMAGEMAGICK_VERSION} $build_dir
-  else
-    wget https://www.imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz
-    tar -xf ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz
-    rm ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz
-    mv ImageMagick-${IMAGEMAGICK_VERSION} $build_dir
-  fi
+  wget "https://imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
+  tar -xf "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
+  rm "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
+  mv "ImageMagick-${IMAGEMAGICK_VERSION}" "${build_dir}"
 
   options="--with-magick-plus-plus=no --disable-docs"
   if [ -v CONFIGURE_OPTIONS ]; then
-    options="${CONFIGURE_OPTIONS} $options"
+    options="${CONFIGURE_OPTIONS} ${options}"
   fi
 
-  cd $build_dir
-  CC="ccache cc" CXX="ccache c++" ./configure --prefix=/usr $options
+  cd "${build_dir}"
+  CC="ccache cc" CXX="ccache c++" ./configure --prefix=/usr "${options}"
   make -j
 }
 
-if [ ! -d $build_dir ]; then
+if [ ! -d "${build_dir}" ]; then
   build_imagemagick
 fi
 
-cd $build_dir
+cd "${build_dir}"
 sudo make install -j
-cd $project_dir
+cd "${project_dir}"
 
 sudo ldconfig
 

data/before_install_osx.sh

@@ -1,2 +1,56 @@
-brew update
-brew install imagemagick
+#!/usr/bin/env bash
+
+set -euox pipefail
+
+gem install bundler
+
+if [ -v STYLE_CHECKS ]; then
+  set +ux
+  exit 0
+fi
+
+if [ ! -v IMAGEMAGICK_VERSION ]; then
+  echo "you must specify an ImageMagick version."
+  echo "example: 'IMAGEMAGICK_VERSION=6.8.9-10 bash ./before_install_osx.sh'"
+  exit 1
+fi
+
+brew install wget pkg-config ghostscript freetype jpeg little-cms2 libomp libpng libtiff libtool libxml2 zlib webp
+
+export LDFLAGS="-L/usr/local/opt/libxml2/lib -L/usr/local/opt/zlib/li"
+export CPPFLAGS="-I/usr/local/opt/libxml2/include/libxml2 -I/usr/local/opt/zlib/include"
+
+project_dir=$(pwd)
+build_dir="${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}"
+if [ -v CONFIGURE_OPTIONS ]; then
+  build_dir="${build_dir}-${CONFIGURE_OPTIONS}"
+fi
+
+build_imagemagick() {
+  mkdir -p build-ImageMagick
+
+  version=(${IMAGEMAGICK_VERSION//./ })
+  wget "https://imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
+  tar -xf "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
+  rm "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
+  mv "ImageMagick-${IMAGEMAGICK_VERSION}" "${build_dir}"
+
+  options="--with-magick-plus-plus=no --disable-docs"
+  if [ -v CONFIGURE_OPTIONS ]; then
+    options="${CONFIGURE_OPTIONS} ${options}"
+  fi
+
+  cd "${build_dir}"
+  ./configure --prefix=/usr/local "${options}"
+  make -j
+}
+
+if [ ! -d "${build_dir}" ]; then
+  build_imagemagick
+fi
+
+cd "${build_dir}"
+make install -j
+cd "${project_dir}"
+
+set +ux

data/ext/RMagick/extconf.rb

@@ -2,7 +2,6 @@ lib_dir = File.expand_path('../../lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 require 'rubygems'
 require 'mkmf'
-require 'date'
 
 module RMagick
   class Extconf
@@ -16,12 +15,14 @@ module RMagick
       @stdout = $stdout.dup
 
       setup_pkg_config_path
-      configure_compile_options
       assert_can_compile!
+      configure_compile_options
       configure_headers
     end
 
     def setup_pkg_config_path
+      return if RUBY_PLATFORM =~ /mswin|mingw/
+
       if find_executable('brew')
         pkg_config_path = "#{`brew --prefix imagemagick@6`.strip}/lib/pkgconfig"
       elsif find_executable('pacman')
@@ -64,55 +65,32 @@ module RMagick
       # Magick-config is not available on Windows
       if RUBY_PLATFORM !~ /mswin|mingw/
 
-        # Check for compiler. Extract first word so ENV['CC'] can be a program name with arguments.
-        config = defined?(RbConfig) ? ::RbConfig : ::Config
-        cc = (ENV['CC'] || config::CONFIG['CC'] || 'gcc').split(' ').first
-        exit_failure "No C compiler found in ${ENV['PATH']}. See mkmf.log for details." unless find_executable(cc)
-
-        magick_package = determine_imagemagick_package
-
-        $magick_version = `pkg-config #{magick_package} --modversion`[/^(\d+\.\d+\.\d+)/]
-
         check_multiple_imagemagick_versions
         check_partial_imagemagick_versions
 
-        # Ensure minimum ImageMagick version
-        # Check minimum ImageMagick version if possible
-        checking_for("outdated ImageMagick version (<= #{Magick::MIN_IM_VERSION})") do
-          Logging.message("Detected ImageMagick version: #{$magick_version}\n")
-
-          exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{Magick::MIN_IM_VERSION} or later.\n" if Gem::Version.new($magick_version) < Gem::Version.new(Magick::MIN_IM_VERSION)
-        end
-
         # Save flags
-        $CFLAGS = ENV['CFLAGS'].to_s + ' ' + `pkg-config --cflags #{magick_package}`.chomp
-        $CPPFLAGS = ENV['CPPFLAGS'].to_s + ' ' + `pkg-config --cflags #{magick_package}`.chomp
-        $LDFLAGS = ENV['LDFLAGS'].to_s + ' ' + `pkg-config --libs #{magick_package}`.chomp
-        $LOCAL_LIBS = ENV['LIBS'].to_s + ' ' + `pkg-config --libs #{magick_package}`.chomp
+        $CFLAGS     = "#{ENV['CFLAGS']} "   + `pkg-config --cflags #{$magick_package}`.chomp
+        $CPPFLAGS   = "#{ENV['CPPFLAGS']} " + `pkg-config --cflags #{$magick_package}`.chomp
+        $LDFLAGS    = "#{ENV['LDFLAGS']} "  + `pkg-config --libs #{$magick_package}`.chomp
+        $LOCAL_LIBS = "#{ENV['LIBS']} "     + `pkg-config --libs #{$magick_package}`.chomp
 
-        set_archflags_for_osx if RUBY_PLATFORM =~ /darwin/ # osx
+        configure_archflags_for_osx($magick_package) if RUBY_PLATFORM =~ /darwin/ # osx
 
       elsif RUBY_PLATFORM =~ /mingw/ # mingw
 
-        `#{magick_command} -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
-        abort 'Unable to get ImageMagick version' unless Regexp.last_match(1)
-        $magick_version = Regexp.last_match(1)
-
         dir_paths = search_paths_for_library_for_windows
         $CPPFLAGS = %(-I"#{dir_paths[:include]}")
         $LDFLAGS = %(-L"#{dir_paths[:lib]}")
+        $LDFLAGS << ' -lucrt' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
 
         have_library(im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_' : 'CORE_RL_magick_')
 
       else # mswin
 
-        `#{magick_command} -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
-        abort 'Unable to get ImageMagick version' unless Regexp.last_match(1)
-        $magick_version = Regexp.last_match(1)
-
         dir_paths = search_paths_for_library_for_windows
         $CPPFLAGS << %( -I"#{dir_paths[:include]}")
         $LDFLAGS << %( -libpath:"#{dir_paths[:lib]}")
+        $LDFLAGS << ' -libpath:ucrt' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
 
         $LOCAL_LIBS = im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_.lib' : 'CORE_RL_magick_.lib'
 
@@ -121,30 +99,6 @@ module RMagick
       $CFLAGS << (have_macro('__GNUC__') ? ' -std=gnu99' : ' -std=c99')
     end
 
-    # Test for a specific value in an enum type
-    def have_enum_value(enum, value, headers = nil, &b)
-      checking_for "#{enum}.#{value}" do
-        if try_compile(<<"SRC", &b)
-#{COMMON_HEADERS}
-        #{cpp_include(headers)}
-/*top*/
-int main() { #{enum} t = #{value}; t = t; return 0; }
-SRC
-          $defs.push(format('-DHAVE_ENUM_%s', value.upcase))
-          true
-        else
-          false
-        end
-      end
-    end
-
-    # Test for multiple values of the same enum type
-    def have_enum_values(enum, values, headers = nil, &b)
-      values.each do |value|
-        have_enum_value(enum, value, headers, &b)
-      end
-    end
-
     def exit_failure(msg)
       msg = "ERROR: #{msg}"
 
@@ -163,10 +117,6 @@ SRC
     end
 
     def determine_imagemagick_package
-      unless find_executable('pkg-config')
-        exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find pkg-config in #{ENV['PATH']}\n"
-      end
-
       packages = `pkg-config --list-all`.scan(/(ImageMagick\-[\.A-Z0-9]+) .*/).flatten
 
       # For ancient version of ImageMagick 6 we need a different regex
@@ -245,21 +195,33 @@ SRC
       matches.delete_if(&:empty?)
       return unless !matches.empty? && matches.length < 3
 
-      msg = "\nWarning: Found a partial ImageMagick installation. Your operating system likely has some built-in ImageMagick libraries but not all of ImageMagick. This will most likely cause problems at both compile and runtime.\nFound partial installation at: " + prefix + "\n"
+      msg = <<~MESSAGE
+
+        Warning: Found a partial ImageMagick installation. Your operating
+        system likely has some built-in ImageMagick libraries but not all of
+        ImageMagick. This will most likely cause problems at both compile and
+        runtime.
+        Found partial installation at: #{prefix}
+
+      MESSAGE
+
       Logging.message msg
       message msg
     end
 
     # issue #169
     # set ARCHFLAGS appropriately for OSX
-    def set_archflags_for_osx
-      archflags = []
-      fullpath = `which convert`
-      fileinfo = `file #{fullpath}`
+    def configure_archflags_for_osx(magick_package)
+      return unless `pkg-config #{magick_package} --libs-only-L`.match(%r{-L(.+)/lib})
+
+      imagemagick_dir = Regexp.last_match(1)
+      command = Dir.glob(File.join(imagemagick_dir, "bin/*")).select { |file| File.executable? file }.first
+      fileinfo = `file #{command}`
 
       # default ARCHFLAGS
       archs = $ARCH_FLAG.scan(/-arch\s+(\S+)/).flatten
 
+      archflags = []
       archs.each do |arch|
         archflags << "-arch #{arch}" if fileinfo.include?(arch)
       end
@@ -290,44 +252,84 @@ SRC
 
       return dir_paths if found_lib
 
-      exit_failure <<END_MINGW
-Can't install RMagick #{RMAGICK_VERS}.
-Can't find the ImageMagick library.
-Retry with '--with-opt-dir' option.
-Usage: gem install rmagick -- '--with-opt-dir=\"[path to ImageMagick]\"'
-e.g.
-  gem install rmagick -- '--with-opt-dir=\"C:\Program Files\ImageMagick-6.9.1-Q16\"'
-END_MINGW
+      exit_failure <<~END_MINGW
+        Can't install RMagick #{RMAGICK_VERS}.
+        Can't find the ImageMagick library.
+        Retry with '--with-opt-dir' option.
+        Usage: gem install rmagick -- '--with-opt-dir=\"[path to ImageMagick]\"'
+        e.g.
+          gem install rmagick -- '--with-opt-dir=\"C:\Program Files\ImageMagick-6.9.1-Q16\"'
+      END_MINGW
     end
 
     def assert_can_compile!
       assert_minimum_ruby_version!
       assert_has_dev_libs!
+
+      # Check for compiler. Extract first word so ENV['CC'] can be a program name with arguments.
+      cc = (ENV['CC'] || RbConfig::CONFIG['CC'] || 'gcc').split(' ').first
+      exit_failure "No C compiler found in ${ENV['PATH']}. See mkmf.log for details." unless find_executable(cc)
     end
 
     def assert_minimum_ruby_version!
-      unless checking_for("Ruby version >= #{MIN_RUBY_VERS}") do
+      supported = checking_for("Ruby version >= #{MIN_RUBY_VERS}") do
         Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(MIN_RUBY_VERS)
       end
-        exit_failure "Can't install RMagick #{RMAGICK_VERS}. Ruby #{MIN_RUBY_VERS} or later required.\n"
-      end
+
+      exit_failure "Can't install RMagick #{RMAGICK_VERS}. Ruby #{MIN_RUBY_VERS} or later required.\n" unless supported
     end
 
     def assert_has_dev_libs!
-      return unless RUBY_PLATFORM !~ /mswin|mingw/
+      failure_message = <<~END_FAILURE
+        Can't install RMagick #{RMAGICK_VERS}.
+        Can't find the ImageMagick library or one of the dependent libraries.
+        Check the mkmf.log file for more detailed information.
+      END_FAILURE
+
+      if RUBY_PLATFORM !~ /mswin|mingw/
+        unless find_executable('pkg-config')
+          exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find pkg-config in #{ENV['PATH']}\n"
+        end
 
-      unless `pkg-config --libs MagickCore`[/\bl\s*(MagickCore|Magick)6?\b/]
-        exit_failure "Can't install RMagick #{RMAGICK_VERS}. " \
-                   "Can't find the ImageMagick library or one of the dependent libraries. " \
-                   "Check the mkmf.log file for more detailed information.\n"
+        unless `pkg-config --libs MagickCore`[/\bl\s*(MagickCore|Magick)6?\b/]
+          exit_failure failure_message
+        end
+
+        $magick_package = determine_imagemagick_package
+        $magick_version = `pkg-config #{$magick_package} --modversion`[/^(\d+\.\d+\.\d+)/]
+      else
+        `#{magick_command} -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
+        $magick_version = Regexp.last_match(1)
+        exit_failure failure_message unless $magick_version
+      end
+
+      # Ensure minimum ImageMagick version
+      # Check minimum ImageMagick version if possible
+      checking_for("outdated ImageMagick version (<= #{Magick::MIN_IM_VERSION})") do
+        Logging.message("Detected ImageMagick version: #{$magick_version}\n")
+
+        exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{Magick::MIN_IM_VERSION} or later.\n" if Gem::Version.new($magick_version) < Gem::Version.new(Magick::MIN_IM_VERSION)
       end
     end
 
     def create_header_file
-      [
+      ruby_api = [
+        'rb_gc_adjust_memory_usage' # Ruby 2.4.0
+      ]
+      memory_api = %w[
+        posix_memalign
+        malloc_usable_size
+        malloc_size
+        _aligned_msize
+      ]
+      imagemagick_api = [
         'GetImageChannelEntropy', # 6.9.0-0
-        'SetImageGray' # 6.9.1-10
-      ].each do |func|
+        'SetImageGray', # 6.9.1-10
+        'SetMagickAlignedMemoryMethods' # 7.0.9-0
+      ]
+
+      check_api = ruby_api + memory_api + imagemagick_api
+      check_api.each do |func|
         have_func(func, headers)
       end
 
@@ -356,7 +358,13 @@ END_MINGW
     end
 
     def magick_command
-      @magick_command ||= find_executable('magick') ? 'magick' : 'identify'
+      @magick_command ||= if find_executable('magick')
+                            'magick'
+                          elsif find_executable('identify')
+                            'identify'
+                          else
+                            raise NotImplementedError, "no executable found for ImageMagick"
+                          end
     end
 
     def im_version_at_least?(version)
@@ -364,17 +372,15 @@ END_MINGW
     end
 
     def print_summary
-      summary = <<"END_SUMMARY"
-
-
-#{'=' * 70}
-#{DateTime.now.strftime('%a %d %b %y %T')}
-This installation of RMagick #{RMAGICK_VERS} is configured for
-Ruby #{RUBY_VERSION} (#{RUBY_PLATFORM}) and ImageMagick #{$magick_version}
-#{'=' * 70}
+      summary = <<~"END_SUMMARY"
+        #{'=' * 70}
+        #{Time.now.strftime('%a %d %b %y %T')}
+        This installation of RMagick #{RMAGICK_VERS} is configured for
+        Ruby #{RUBY_VERSION} (#{RUBY_PLATFORM}) and ImageMagick #{$magick_version}
+        #{'=' * 70}
 
 
-END_SUMMARY
+      END_SUMMARY
 
       Logging.message summary
       message summary