Merge "Load Erlang path from manifest"

flavianmissi · Jan 6, 2012 · 52ac3c4 · 52ac3c4
2 parents 9e49dce + d0a47d7
commit 52ac3c4
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/cloud_controller/Gemfile b/cloud_controller/Gemfile
@@ -14,7 +14,7 @@ gem 'vcap_staging'
 
 # For queuing staging tasks
 gem 'em-hiredis'
-gem 'vcap_stager', '~> 0.1.7'
+gem 'vcap_stager', '~> 0.1.8'
 
 # Databases
 gem 'sqlite3'

diff --git a/cloud_controller/Gemfile.lock b/cloud_controller/Gemfile.lock
@@ -137,8 +137,8 @@ GEM
       thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
     vcap_logging (0.1.3)
-    vcap_stager (0.1.7)
-    vcap_staging (0.1.30)
+    vcap_stager (0.1.8)
+    vcap_staging (0.1.32)
       nokogiri (>= 1.4.4)
       rake
       rspec

diff --git a/...roller/vendor/cache/vcap_stager-0.1.7.gem → ...roller/vendor/cache/vcap_stager-0.1.8.gem b/...roller/vendor/cache/vcap_stager-0.1.7.gem → ...roller/vendor/cache/vcap_stager-0.1.8.gem
diff --git a/stager/vendor/cache/vcap_staging-0.1.31.gem → ...ller/vendor/cache/vcap_staging-0.1.32.gem b/stager/vendor/cache/vcap_staging-0.1.31.gem → ...ller/vendor/cache/vcap_staging-0.1.32.gem
diff --git a/stager/Gemfile b/stager/Gemfile
@@ -8,7 +8,7 @@ gem 'yajl-ruby', '>= 0.7.9'
 
 gem 'vcap_common', '~> 1.0.3'
 gem 'vcap_logging', '>= 0.1.3'
-gem 'vcap_staging', '~> 0.1.31'
+gem 'vcap_staging', '~> 0.1.32'
 
 group :test do
   gem 'rspec'

diff --git a/stager/Gemfile.lock b/stager/Gemfile.lock
@@ -43,11 +43,11 @@ GEM
       thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
     vcap_logging (0.1.3)
-    vcap_staging (0.1.31)
+    vcap_staging (0.1.32)
       nokogiri (>= 1.4.4)
       rake
       rspec
-      vcap_common
+      vcap_common (~> 1.0.3)
       yajl-ruby (>= 0.7.9)
     webmock (1.7.4)
       addressable (~> 2.2, > 2.2.5)
@@ -66,6 +66,6 @@ DEPENDENCIES
   sinatra
   vcap_common (~> 1.0.3)
   vcap_logging (>= 0.1.3)
-  vcap_staging (~> 0.1.31)
+  vcap_staging (~> 0.1.32)
   webmock
   yajl-ruby (>= 0.7.9)
diff --git a/stager/lib/vcap/stager/version.rb b/stager/lib/vcap/stager/version.rb
@@ -1,5 +1,5 @@
 module VCAP
   module Stager
-    VERSION = '0.1.7'
+    VERSION = '0.1.8'
   end
 end
diff --git a/...ller/vendor/cache/vcap_staging-0.1.30.gem → stager/vendor/cache/vcap_staging-0.1.32.gem b/...ller/vendor/cache/vcap_staging-0.1.30.gem → stager/vendor/cache/vcap_staging-0.1.32.gem
diff --git a/staging/lib/vcap/staging/plugin/otp_rebar/plugin.rb b/staging/lib/vcap/staging/plugin/otp_rebar/plugin.rb
@@ -57,7 +57,7 @@ def startup_script
   def rewrite_libs
     runtime_version = runtime['version']
     runtime_info = runtime_info_for(runtime_version)
-    runtime_dir = "/var/vcap/runtimes/erlang-#{runtime_version}"
+    runtime_dir = File.expand_path('../..', runtime['executable'])
 
     # Ensure that our runtime matches the one that the libraries were packaged for
     start_erl_data = File.read('app/releases/start_erl.data')

diff --git a/staging/lib/vcap/staging/version.rb b/staging/lib/vcap/staging/version.rb
@@ -1,5 +1,5 @@
 module VCAP
   module Staging
-    VERSION = '0.1.31'
+    VERSION = '0.1.32'
   end
 end