Permalink
Browse files

Removed additional references to Erlang build

  • Loading branch information...
1 parent 5081823 commit 29d1117e5c2eb2ac147c60202e8c9cc6b5fd25c0 @neuhausler committed Dec 31, 2011
Showing with 2 additions and 10 deletions.
  1. +0 −1 dependencies/otp
  2. +1 −2 tasks/all.rake
  3. +1 −5 tasks/couchdb.rake
  4. +0 −2 tasks/shortcuts.rake
Submodule otp deleted from b6dc1a
View
@@ -17,7 +17,7 @@ namespace :build do
task :ruby_inabox => :couchdb
# Submodules
- submodules = ["#{DEPS}/otp/otp_build", "#{DEPS}/couchdb/bootstrap"]
+ submodules = ["#{DEPS}/couchdb/bootstrap"]
submodules.each do |submodule_file|
file submodule_file do
human_friendly = File.dirname(submodule_file)
@@ -26,7 +26,6 @@ namespace :build do
end
task :couch_git_submodules => ["#{DEPS}/couchdb/bootstrap"]
- task :otp_git_submodules => ["#{DEPS}/otp/otp_build"]
desc 'Confirm (and install if possible) the OS dependencies'
task :os_dependencies => [:mac_dependencies, :ubuntu_dependencies, :debian_dependencies, :opensuse_dependencies, :solaris_dependencies]
View
@@ -6,7 +6,7 @@ require 'fileutils'
namespace :couchdb do
- couchdb_build_deps = ['erlang:build', 'build:couch_git_submodules', 'build:os_dependencies', 'tracemonkey:build', 'icu:build', 'curl:build', :known_distro, 'environment:path']
+ couchdb_build_deps = [ 'build:couch_git_submodules', 'build:os_dependencies', 'tracemonkey:build', 'icu:build', 'curl:build', :known_distro, 'environment:path']
desc 'Build the requirements for CouchDB'
task :deps => couchdb_build_deps
@@ -24,10 +24,6 @@ namespace :couchdb do
ENV.delete("otp_keep")
end
- %w[ erlang toolchain ].each do |section|
- run_task "#{section}:clean"
- end
-
%w[ include ].each do |dir|
FileUtils.rm_rf "#{BUILD}/#{dir}"
end
View
@@ -10,5 +10,3 @@ task :sh => 'environment:shell'
desc Rake::Task['environment:code'].comment
task :env => 'environment:code'
-desc Rake::Task['erlang:build'].comment
-task :erlang => 'erlang:build'

0 comments on commit 29d1117

Please sign in to comment.