proj: add head and vdatum option #31098

Closed
wants to merge 1 commit into
from

Projects

None yet

2 participants

@dakcarto

Followup to #30985

@dakcarto

Hmm. I don't quite understand the build bot failure for Mavericks. I think it is unrelated to this PR.

@MikeMcQuaid MikeMcQuaid commented on an outdated diff Jul 24, 2014
Library/Formula/proj.rb
@@ -25,8 +74,12 @@ class Proj < Formula
def install
(buildpath/'nad').install resource('datumgrid')
+ resources.each do |r|
+ (share/"proj").install r unless r.name == "datumgrid"
+ end if build.with? "vdatum"
@MikeMcQuaid
MikeMcQuaid Jul 24, 2014

The if and unless are a bit confusing here; I'd use a block for the with? and use an if/else for datumgrid vs the other resources.

@dakcarto

@mikemcquaid Is the above formating clearer?

@dakcarto dakcarto commented on the diff Jul 24, 2014
Library/Formula/proj.rb
@@ -24,9 +73,16 @@ class Proj < Formula
end
def install
- (buildpath/'nad').install resource('datumgrid')
+ resources.each do |r|
+ if r.name == "datumgrid"
+ (buildpath/"nad").install r
+ elsif build.with? "vdatum"
+ (share/"proj").install r
+ end
+ end
+
@dakcarto
dakcarto Jul 24, 2014

@mikemcquaid Is the above formatting clearer?

@MikeMcQuaid
MikeMcQuaid Jul 25, 2014

Perfect, thanks.

@BrewTestBot BrewTestBot added a commit that closed this pull request Jul 25, 2014
@BrewTestBot BrewTestBot proj: update 4.8.0 bottle.
Closes #31098.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
e5826aa
@aerickson aerickson added a commit to aerickson/homebrew that referenced this pull request Aug 3, 2014
@BrewTestBot BrewTestBot proj: update 4.8.0 bottle.
Closes #31098.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
c61a8cb
@xu-cheng xu-cheng locked and limited conversation to collaborators Feb 17, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.