Remove SourceForge references.

It was fun but we just love Bintray more than you.

Closes Homebrew/homebrew#37211.

Closes Homebrew/homebrew#37213.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Mike McQuaid 2015-02-26 11:15:32 +00:00
parent 328fa80f41
commit 17bfb0f804
6 changed files with 10 additions and 51 deletions

View File

@ -452,11 +452,7 @@ module Homebrew
bottle_args = ["--rb", formula_name] bottle_args = ["--rb", formula_name]
if @tap if @tap
tap_user, tap_repo = @tap.split "/" tap_user, tap_repo = @tap.split "/"
if ENV["HOMEBREW_SOURCEFORGE_TESTING"] bottle_args << "--root-url=#{BottleSpecification::DEFAULT_DOMAIN}/#{Bintray.repository(@tap)}"
bottle_args << "--root-url=#{BottleSpecification::DEFAULT_ROOT_URL}/#{tap_repo}"
else
bottle_args << "--root-url=#{BottleSpecification::DEFAULT_DOMAIN}/#{Bintray.repository(@tap)}"
end
end end
bottle_args << { :puts_output_on_success => true } bottle_args << { :puts_output_on_success => true }
test "brew", "bottle", *bottle_args test "brew", "bottle", *bottle_args
@ -746,7 +742,6 @@ module Homebrew
tag = pr ? "pr-#{pr}" : "testing-#{number}" tag = pr ? "pr-#{pr}" : "testing-#{number}"
safe_system "git", "push", "--force", remote, "master:master", ":refs/tags/#{tag}" safe_system "git", "push", "--force", remote, "master:master", ":refs/tags/#{tag}"
# Bintray upload (will take over soon)
bintray_repo = Bintray.repository(tap) bintray_repo = Bintray.repository(tap)
bintray_repo_url = "https://api.bintray.com/packages/homebrew/#{bintray_repo}" bintray_repo_url = "https://api.bintray.com/packages/homebrew/#{bintray_repo}"
formula_packaged = {} formula_packaged = {}
@ -775,19 +770,6 @@ module Homebrew
puts puts
end end
# SourceForge upload (will be removed soon)
path = "/home/frs/project/m/ma/machomebrew/Bottles/"
if tap
tap_user, tap_repo = tap.split "/"
path += "#{tap_repo}/"
end
url = "BrewTestBot,machomebrew@frs.sourceforge.net:#{path}"
rsync_args = %w[--partial --progress --human-readable --compress]
rsync_args += Dir["*.bottle*.tar.gz"] + [url]
safe_system "rsync", *rsync_args
safe_system "git", "tag", "--force", tag safe_system "git", "tag", "--force", tag
safe_system "git", "push", "--force", remote, "refs/tags/#{tag}" safe_system "git", "push", "--force", remote, "refs/tags/#{tag}"
return return

View File

@ -372,12 +372,6 @@ end
# This strategy extracts our binary packages. # This strategy extracts our binary packages.
class CurlBottleDownloadStrategy < CurlDownloadStrategy class CurlBottleDownloadStrategy < CurlDownloadStrategy
def curl(*args)
mirror = ENV["HOMEBREW_SOURCEFORGE_MIRROR"]
args << "-G" << "-d" << "use_mirror=#{mirror}" if mirror
super
end
def stage def stage
ohai "Pouring #{cached_location.basename}" ohai "Pouring #{cached_location.basename}"
super super

View File

@ -562,12 +562,6 @@ can take several different forms:
Text printed before the installation summary of each successful build. Text printed before the installation summary of each successful build.
Defaults to the beer emoji. Defaults to the beer emoji.
* HOMEBREW\_SOURCEFORGE\_MIRROR:
If set, Homebrew will use the value of `HOMEBREW_SOURCEFORGE_MIRROR` to
select a SourceForge mirror for downloading bottles.
*Example:* `export HOMEBREW_SOURCEFORGE_MIRROR='heanet'`
* HOMEBREW\_SVN: * HOMEBREW\_SVN:
When exporting from Subversion, Homebrew will use `HOMEBREW_SVN` if set, When exporting from Subversion, Homebrew will use `HOMEBREW_SVN` if set,
a Homebrew-built Subversion if installed, or the system-provided binary. a Homebrew-built Subversion if installed, or the system-provided binary.

View File

@ -251,12 +251,8 @@ end
class BottleSpecification class BottleSpecification
DEFAULT_PREFIX = "/usr/local".freeze DEFAULT_PREFIX = "/usr/local".freeze
DEFAULT_CELLAR = "/usr/local/Cellar".freeze DEFAULT_CELLAR = "/usr/local/Cellar".freeze
if ENV["HOMEBREW_SOURCEFORGE_TESTING"] DEFAULT_DOMAIN = "https://homebrew.bintray.com".freeze
DEFAULT_ROOT_URL = "https://downloads.sf.net/project/machomebrew/Bottles".freeze DEFAULT_ROOT_URL = "#{DEFAULT_DOMAIN}/bottles".freeze
else
DEFAULT_DOMAIN = "https://homebrew.bintray.com".freeze
DEFAULT_ROOT_URL = "#{DEFAULT_DOMAIN}/bottles".freeze
end
attr_rw :root_url, :prefix, :cellar, :revision attr_rw :root_url, :prefix, :cellar, :revision
attr_reader :checksum, :collector attr_reader :checksum, :collector

View File

@ -230,23 +230,23 @@ class VersionParsingTests < Homebrew::TestCase
end end
def test_bottle_style def test_bottle_style
assert_version_detected '4.8.0', 'https://downloads.sf.net/project/machomebrew/Bottles/qt-4.8.0.lion.bottle.tar.gz' assert_version_detected '4.8.0', 'https://homebrew.bintray.com/bottles/qt-4.8.0.lion.bottle.tar.gz'
end end
def test_versioned_bottle_style def test_versioned_bottle_style
assert_version_detected '4.8.1', 'https://downloads.sf.net/project/machomebrew/Bottles/qt-4.8.1.lion.bottle.1.tar.gz' assert_version_detected '4.8.1', 'https://homebrew.bintray.com/bottles/qt-4.8.1.lion.bottle.1.tar.gz'
end end
def test_erlang_bottle_style def test_erlang_bottle_style
assert_version_detected 'R15B', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B.lion.bottle.tar.gz' assert_version_detected 'R15B', 'https://homebrew.bintray.com/bottles/erlang-R15B.lion.bottle.tar.gz'
end end
def test_another_erlang_bottle_style def test_another_erlang_bottle_style
assert_version_detected 'R15B01', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B01.mountain_lion.bottle.tar.gz' assert_version_detected 'R15B01', 'https://homebrew.bintray.com/bottles/erlang-R15B01.mountain_lion.bottle.tar.gz'
end end
def test_yet_another_erlang_bottle_style def test_yet_another_erlang_bottle_style
assert_version_detected 'R15B03-1', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B03-1.mountainlion.bottle.tar.gz' assert_version_detected 'R15B03-1', 'https://homebrew.bintray.com/bottles/erlang-R15B03-1.mountainlion.bottle.tar.gz'
end end
def test_imagemagick_style def test_imagemagick_style
@ -254,11 +254,11 @@ class VersionParsingTests < Homebrew::TestCase
end end
def test_imagemagick_bottle_style def test_imagemagick_bottle_style
assert_version_detected '6.7.5-7', 'https://downloads.sf.net/project/machomebrew/Bottles/imagemagick-6.7.5-7.lion.bottle.tar.gz' assert_version_detected '6.7.5-7', 'https://homebrew.bintray.com/bottles/imagemagick-6.7.5-7.lion.bottle.tar.gz'
end end
def test_imagemagick_versioned_bottle_style def test_imagemagick_versioned_bottle_style
assert_version_detected '6.7.5-7', 'https://downloads.sf.net/project/machomebrew/Bottles/imagemagick-6.7.5-7.lion.bottle.1.tar.gz' assert_version_detected '6.7.5-7', 'https://homebrew.bintray.com/bottles/imagemagick-6.7.5-7.lion.bottle.1.tar.gz'
end end
def test_dash_version_dash_style def test_dash_version_dash_style

View File

@ -584,13 +584,6 @@ HOMEBREW_INSTALL_BADGE
Text printed before the installation summary of each successful build\. Defaults to the beer emoji\. Text printed before the installation summary of each successful build\. Defaults to the beer emoji\.
. .
.TP .TP
HOMEBREW_SOURCEFORGE_MIRROR
If set, Homebrew will use the value of \fBHOMEBREW_SOURCEFORGE_MIRROR\fR to select a SourceForge mirror for downloading bottles\.
.
.IP
\fIExample:\fR \fBexport HOMEBREW_SOURCEFORGE_MIRROR=\'heanet\'\fR
.
.TP
HOMEBREW_SVN HOMEBREW_SVN
When exporting from Subversion, Homebrew will use \fBHOMEBREW_SVN\fR if set, a Homebrew\-built Subversion if installed, or the system\-provided binary\. When exporting from Subversion, Homebrew will use \fBHOMEBREW_SVN\fR if set, a Homebrew\-built Subversion if installed, or the system\-provided binary\.
. .