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 jam-admin's build and Gemfile for merging into jam-cloud

This commit is contained in:
Seth Call 2013-09-16 03:19:10 +00:00
parent c8150c8aee
commit 1085686970
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/Gemfile
View File

@ -1,14 +1,12 @@
source 'https://rubygems.org'
source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/'
# 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_db', :path=> "../db/target/ruby_package"
gem 'jampb', :path => "../pb/target/ruby/jampb"
gem 'jam_ruby', :path => "../ruby"
else
gem 'jam_db'
gem 'jampb'
@ -52,7 +50,7 @@ gem 'eventmachine', '1.0.0'
gem 'amqp', '0.9.8'
gem 'logging-rails', :require => 'logging/rails'
gem 'pg_migrate' # ,'0.1.5' #:path => "#{workspace}/pg_migrate_ruby"
gem 'pg_migrate'
gem 'ruby-protocol-buffers', '1.2.2'
gem 'sendgrid', '1.1.0'

8
admin/build
View File

@ -8,7 +8,13 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
rm -rf $DIR/target
mkdir $DIR/target
mkdir $DIR/target/deb
# copy needed gems to cache so they'll be bundled up in the debian
mkdir -p vendor/cache
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
rm Gemfile.lock # if we don't want versions to float, pin it in the Gemfile, not count on Gemfile.lock