summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-06 10:26:55 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-06 10:26:55 +0000
commit7d458e0b2739772a041532dcf635604de3d7c8e8 (patch)
treeb107cc50c0fc88494e69b51e33751d0ec7ab4b38 /Gemfile
parent725ff27c37d7143e91d40c453e70c2db238112cd (diff)
downloadredmine-7d458e0b2739772a041532dcf635604de3d7c8e8.tar.gz
redmine-7d458e0b2739772a041532dcf635604de3d7c8e8.zip
Do not install rmagick gem with jruby.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9341 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile14
1 files changed, 8 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index e6181298a..50439f10a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,12 +16,14 @@ group :openid do
gem "ruby-openid", "~> 2.1.4", :require => "openid"
end
-# Optional gem for exporting the gantt to a PNG file
-group :rmagick do
- # RMagick 2 supports ruby 1.9
- # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
- # different requirements for the same gem on different platforms
- gem "rmagick", ">= 2.0.0"
+# Optional gem for exporting the gantt to a PNG file, not supported with jruby
+platforms :mri, :mingw do
+ group :rmagick do
+ # RMagick 2 supports ruby 1.9
+ # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
+ # different requirements for the same gem on different platforms
+ gem "rmagick", ">= 2.0.0"
+ end
end
# Database gems