From 35878846da952ebfe24f6d4ea801f4161d97463a Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 30 Dec 2016 07:58:19 +0000 Subject: [PATCH] Always rebuild Makefile for quad_tile extension before using it --- cookbooks/web/definitions/rails_port.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index 75d22d271..06a68504b 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -274,20 +274,21 @@ define :rails_port, :action => [:create, :enable] do cwd "#{rails_directory}/lib/quad_tile" user rails_user group rails_group - not_if { File.exist?("#{rails_directory}/lib/quad_tile/Makefile") && File.mtime("#{rails_directory}/lib/quad_tile/Makefile") >= File.mtime("#{rails_directory}/lib/quad_tile/extconf.rb") } + not_if do + File.exist?("#{rails_directory}/lib/quad_tile/quad_tile_so.so") && + File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/extconf.rb") && + File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.c") && + File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.h") + end + notifies :run, "execute[#{rails_directory}/lib/quad_tile/Makefile]" end execute "#{rails_directory}/lib/quad_tile/Makefile" do + action :nothing command "make" cwd "#{rails_directory}/lib/quad_tile" user rails_user group rails_group - not_if do - File.exist?("#{rails_directory}/lib/quad_tile/quad_tile_so.so") && - File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/Makefile") && - File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.c") && - File.mtime("#{rails_directory}/lib/quad_tile/quad_tile_so.so") >= File.mtime("#{rails_directory}/lib/quad_tile/quad_tile.h") - end notifies :run, "execute[#{rails_directory}]" end -- 2.43.2