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

* fixing relative paths of gems VRFS-438

This commit is contained in:
Seth Call 2013-09-15 18:42:14 +00:00
parent a112391be1
commit 24315d63f1
5 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruby/Gemfile
View File

@ -4,8 +4,6 @@ unless ENV["LOCAL_DEV"] == "1"
source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/'
end
# Look for $WORKSPACE, otherwise use "workspace" as dev path.
workspace = ENV["WORKSPACE"] || "~/workspace"
devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable
gem 'pg', '0.15.1', :platform => [:mri, :mswin, :mingw]
@ -27,8 +25,8 @@ gem 'devise', '>= 1.1.2'
gem 'postgres-copy'
if devenv
gem 'jam_db', :path=> "#{workspace}/jam-db/target/ruby_package"
gem 'jampb', :path => "#{workspace}/jam-pb/target/ruby/jampb"
gem 'jam_db', :path=> "../db/target/ruby_package"
gem 'jampb', :path => "../pb/target/ruby/jampb"
else
gem 'jam_db'
gem 'jampb'

11
web/Gemfile
View File

@ -3,17 +3,14 @@ source 'https://rubygems.org'
unless ENV["LOCAL_DEV"] == "1"
source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/'
end
# Look for $WORKSPACE, otherwise use "workspace" as dev path.
workspace = ENV["WORKSPACE"] || "~/workspace"
devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable
if devenv
gem 'jam_db', :path=> "#{workspace}/jam-db/target/ruby_package"
gem 'jampb', :path => "#{workspace}/jam-pb/target/ruby/jampb"
gem 'jam_ruby', :path => "#{workspace}/jam-ruby"
gem 'jam_websockets', :path => "#{workspace}/websocket-gateway"
gem 'jam_db', :path=> "../db/target/ruby_package"
gem 'jampb', :path => "../pb/target/ruby/jampb"
gem 'jam_ruby', :path => "../ruby"
gem 'jam_websockets', :path => "../websocket-gateway"
else
gem 'jam_db', "0.0.#{ENV["BUILD_NUMBER"]}"
gem 'jampb', "0.0.#{ENV["BUILD_NUMBER"]}"

6
web/build
View File

@ -23,9 +23,9 @@ GEM_VERSION="0.0.${BUILD_NUMBER}"
# by putting these gems in vendor/cache, bundle will see them when running 'bundle install'
mkdir -p vendor/cache
cp ../jam-db/target/ruby_package/jam_db-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-db gem"; exit 1; }
cp ../jam-pb/target/ruby/jampb/jampb-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-pb gem"; exit 1; }
cp ../jam-ruby/jam_ruby-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-ruby gem"; exit 1; }
cp ../db/target/ruby_package/jam_db-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-db gem"; exit 1; }
cp ../pb/target/ruby/jampb/jampb-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-pb gem"; exit 1; }
cp ../ruby/jam_ruby-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-ruby gem"; exit 1; }
cp ../websocket-gateway/jam_websockets-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy websocket-gateway gem"; exit 1; }
echo "updating dependencies"

6
websocket-gateway/Gemfile
View File

@ -9,9 +9,9 @@ workspace = ENV["WORKSPACE"] || "~/workspace"
devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable
if devenv
gem 'jam_db', :path=> "#{workspace}/jam-db/target/ruby_package"
gem 'jampb', :path => "#{workspace}/jam-pb/target/ruby/jampb"
gem 'jam_ruby', :path => "#{workspace}/jam-ruby"
gem 'jam_db', :path=> "../db/target/ruby_package"
gem 'jampb', :path => "../pb/target/ruby/jampb"
gem 'jam_ruby', :path => "../ruby"
else
gem 'jam_db', "0.0.#{ENV["BUILD_NUMBER"]}"
gem 'jampb', "0.0.#{ENV["BUILD_NUMBER"]}"

6
websocket-gateway/build
View File

@ -16,9 +16,9 @@ GEM_VERSION="0.0.${BUILD_NUMBER}"
# by putting these gems in vendor/cache, bundle will see them when running 'bundle install'
mkdir -p vendor/cache
cp ../jam-db/target/ruby_package/jam_db-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-db gem"; exit 1; }
cp ../jam-pb/target/ruby/jampb/jampb-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-pb gem"; exit 1; }
cp ../jam-ruby/jam_ruby-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-ruby gem"; exit 1; }
cp ../db/target/ruby_package/jam_db-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-db gem"; exit 1; }
cp ../pb/target/ruby/jampb/jampb-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-pb gem"; exit 1; }
cp ../ruby/jam_ruby-${GEM_VERSION}.gem vendor/cache/ || { echo "unable to copy jam-ruby gem"; exit 1; }
# put all dependencies into vendor/bundle
rm -rf vendor/bundle