diff --git a/admin/Gemfile b/admin/Gemfile index d31c5ef8f..e1f493acc 100644 --- a/admin/Gemfile +++ b/admin/Gemfile @@ -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' diff --git a/admin/build b/admin/build index b0d5493d2..e0936e582 100755 --- a/admin/build +++ b/admin/build @@ -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