admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #4011 from tschoonj/meson-template-fix

Browse Source 
brew create: fix meson template
This commit is contained in:
Mike McQuaid 2018-04-07 09:54:48 +01:00 committed by GitHub
commit 7c22c4b345
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/dev-cmd/create.rb
View File

@ -185,8 +185,9 @@ class FormulaCreator
<% if mode == :cmake %> <% if mode == :cmake %>
depends_on "cmake" => :build depends_on "cmake" => :build
<% elsif mode == :meson %> <% elsif mode == :meson %>
depends_on "meson" => :build depends_on "meson-internal" => :build
depends_on "ninja" => :build depends_on "ninja" => :build
depends_on "python" => :build
<% elsif mode.nil? %> <% elsif mode.nil? %>
# depends_on "cmake" => :build # depends_on "cmake" => :build
<% end %> <% end %>
@ -202,10 +203,11 @@ class FormulaCreator
"--disable-silent-rules", "--disable-silent-rules",
"--prefix=\#{prefix}" "--prefix=\#{prefix}"
<% elsif mode == :meson %> <% elsif mode == :meson %>
ENV.refurbish_args
mkdir "build" do mkdir "build" do
system "meson", "--prefix=\#{prefix}", ".." system "meson", "--prefix=\#{prefix}", ".."
system "ninja" system "ninja"
system "ninja", "test"
system "ninja", "install" system "ninja", "install"
end end
<% else %> <% else %>