Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix it felix #113

Merged
merged 3 commits into from
Jun 14, 2016
Merged

fix it felix #113

merged 3 commits into from
Jun 14, 2016

Conversation

staticfloat
Copy link
Member

  • Divorce ourselves as thoroughly as possible from any knowledge of Homebrew internal mechanisms. Any pieces that assume anything about the internal layout of Homebrew live in private_API.jl.
  • Eradicate git completely from this package, use curl and tar.
  • Rework add() logic to step through dependencies in order, allowing us to finally use --force-bottle to eliminate much of the need for staticfloat/juliadeps
  • Document everything

note that I made a new prelibgit2 branch for this and made it the default on github.
master (also saved as libgit2dev, currently equivalent) has libgit2 work on it
which doesn't totally work yet so shouldn't be tagged. this may not be able to do
migrations of existing installs properly, but I think those are hosed right now anyway
@staticfloat
Copy link
Member Author

@tkelman I rebased from master, somehow one of your commits is still there, but I'm not too sad about it.

@staticfloat
Copy link
Member Author

As far as I can tell from my testing, this works in all cases. I'm sure I will eat those words, but I haven't made it fail spectacularly yet.

@coveralls
Copy link

coveralls commented Jun 6, 2016

Coverage Status

Coverage increased (+0.2%) to 61.842% when pulling e0e030b on sf/rewrite into f6e70f6 on master.

@staticfloat
Copy link
Member Author

I am mildly astounded that the coverage actually increased.

# If we don't have the command-line tools installed, then let's grab
# cctools, and `git` if we don't already have them, as they're important
if !installed("cctools")
add("cctools")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so this is an upstream formula now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. There's gonna be a lot of that over the next few days. I'm going to be
MIA for the next 24 hours or so, so if you want to merge, go ahead, but I
won't be available for questions for a bit.
-E

On Sun, Jun 5, 2016, 22:19 Tony Kelman notifications@github.com wrote:

In src/private_API.jl
#113 (comment):

  •        warn("Could not download/extract $BREW_URL/tarball/$BREW_BRANCH into $(brew_prefix)!")
    
  •        rethrow()
    
  •    end
    
  • end
  • Tap homebrew/core, always and forever

  • tap("homebrew/core")
  • Tap our own "overrides" tap

  • tap("staticfloat/juliadeps")
  • if !clt_installed()
  •    # If we don't have the command-line tools installed, then let's grab
    
  •    # cctools, and `git` if we don't already have them, as they're important
    
  •    if !installed("cctools")
    
  •        add("cctools")
    

so this is an upstream formula now?


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
https://github.com/JuliaLang/Homebrew.jl/pull/113/files/e0e030bdb88cc9c765b40251910b226ebc6d94fd#r65838119,
or mute the thread
https://github.com/notifications/unsubscribe/AAH_aLkRLeTX95daD7iMjTareh_D1ESIks5qI63jgaJpZM4IujLy
.

-E

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the heads-up. I may push a few trivial little nitpicks here, but I'm going to hold off on merging based on the upstream warning that --force-bottle shouldn't be relied upon.

# Tap homebrew/core, always and forever
tap("homebrew/core")

# Tap our own "overrides" tap
tap("staticfloat/juliadeps")

if !clt_installed()
# If we don't have the command-line tools installed, then let's grab
# cctools, and `git` if we don't already have them, as they're important
# If we don't have the command-lin!e tools installed, then let's grab
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo

end

# Now ask for all these names if we have any
if length(ask_names) > 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!isempty(ask_names)

@coveralls
Copy link

coveralls commented Jun 8, 2016

Coverage Status

Coverage increased (+11.3%) to 72.926% when pulling 0ddade3 on sf/rewrite into f6e70f6 on master.

Writes a BrewPkg to io, showing its version number and whether it's bottled.
"""
function show(io::IO, b::BrewPkg)
write(io, "$(b.name): $(b.version) $(b.bottled ? "(bottled)" : "")")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version_str contains strictly more information than version, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More or equal, yes. I should be printing that out as it's more useful (And more true to brew) than version.

* Divorce ourselves as thoroughly as possible from any knowledge of Homebrew internal mechanisms.  Any pieces that assume anything about the internal layout of Homebrew live in `private_API.jl`.

* Eradicate `git` completely from this package, use `curl` and `tar`.

* Rework `add()` logic to step through dependencies in order, allowing us to finally use `--force-bottle` to eliminate much of the need for `staticfloat/juliadeps`

* Document everything

const tappath = joinpath(brew_prefix,"Library","Taps","staticfloat","homebrew-juliadeps")
#const BREW_URL = "https://github.com/Homebrew/brew"
const BREW_URL = "https://github.com/staticfloat/brew"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

your fix was merged upstream

@coveralls
Copy link

coveralls commented Jun 9, 2016

Coverage Status

Coverage increased (+10.7%) to 72.277% when pulling 719204f on sf/rewrite into f6e70f6 on master.

@coveralls
Copy link

coveralls commented Jun 9, 2016

Coverage Status

Coverage increased (+10.7%) to 72.277% when pulling 719204f on sf/rewrite into f6e70f6 on master.

cellar_path = joinpath(brew_prefix, "Cellar", name)
version_str = info(name).version_str
return joinpath(brew_prefix, "Cellar", name, version_str)
return joinpath(brew_prefix, "Cellar", name, info(name).version)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brew uses our semver in their paths?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh should have kept reading, looks like you're removing the separation

@tkelman tkelman merged commit 719204f into master Jun 14, 2016
@tkelman tkelman deleted the sf/rewrite branch June 14, 2016 03:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants