seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2014-05-07 08:03:43 -05:00
parent 5f1ea4c754 1fa9ffcc3f
commit 97269133ba
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/Gemfile
View File

@ -7,6 +7,12 @@ if devenv
gem 'jam_db', :path=> "../db/target/ruby_package"
gem 'jampb', :path => "../pb/target/ruby/jampb"
gem 'jam_ruby', :path => "../ruby"
elsif ENV["TEST_WWW"] == "1"
#gem 'jam_db'
#gem 'jampb'
#gem 'jam_ruby'
#gem 'jam_websockets'
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
else
gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}"

4
ruby/Gemfile
View File

@ -9,6 +9,10 @@ devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment vari
if devenv
gem 'jam_db', :path=> "../db/target/ruby_package"
gem 'jampb', :path => "../pb/target/ruby/jampb"
elsif ENV["TEST_WWW"] == "1"
#gem 'jam_db'
#gem 'jampb'
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
else
gem 'jam_db'
gem 'jampb'

6
web/Gemfile
View File

@ -12,6 +12,12 @@ if devenv
gem 'jampb', :path => "../pb/target/ruby/jampb"
gem 'jam_ruby', :path => "../ruby"
gem 'jam_websockets', :path => "../websocket-gateway"
elsif ENV["TEST_WWW"] == "1"
#gem 'jam_db'
#gem 'jampb'
#gem 'jam_ruby'
#gem 'jam_websockets'
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
else
gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}"

5
websocket-gateway/Gemfile
View File

@ -11,6 +11,11 @@ if devenv
gem 'jam_db', :path=> "../db/target/ruby_package"
gem 'jampb', :path => "../pb/target/ruby/jampb"
gem 'jam_ruby', :path => "../ruby"
elsif ENV["TEST_WWW"] == "1"
#gem 'jam_db'
#gem 'jampb'
#gem 'jam_ruby'
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
else
gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}"