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

Replace deprecated scons calls. #35699

Merged
merged 17 commits into from
Jan 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Formula/bsponmpi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def install
# Don't install 'CVS' folders from tarball
rm_rf "include/CVS"
rm_rf "include/tools/CVS"
scons "-Q", "mode=release"
system "scons", "-Q", "mode=release"
prefix.install "lib", "include"
end
end
2 changes: 1 addition & 1 deletion Formula/fceux.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def install

# gdlib required for logo insertion, but headers are not detected
# https://sourceforge.net/p/fceultra/bugs/756/
scons "RELEASE=1", "GTK=0", "GTK3=1", "LOGO=0"
system "scons", "RELEASE=1", "GTK=0", "GTK3=1", "LOGO=0"
libexec.install "src/fceux"
pkgshare.install ["output/luaScripts", "output/palettes", "output/tools"]
(bin/"fceux").write <<~EOS
Expand Down
2 changes: 1 addition & 1 deletion Formula/ffmpeg2theora.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def install
"mandir=PREFIX/share/man",
"APPEND_LINKFLAGS=-headerpad_max_install_names",
]
scons "install", *args
system "scons", "install", *args
end

test do
Expand Down
2 changes: 1 addition & 1 deletion Formula/gmtl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Gmtl < Formula
end

def install
scons "install", "prefix=#{prefix}"
system "scons", "install", "prefix=#{prefix}"
end
end

Expand Down
4 changes: 2 additions & 2 deletions Formula/gpsd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class Gpsd < Formula
depends_on "libusb" => :optional

def install
scons "chrpath=False", "python=False", "strip=False", "prefix=#{prefix}/"
scons "install"
system "scons", "chrpath=False", "python=False", "strip=False", "prefix=#{prefix}/"
system "scons", "install"
end

def caveats; <<~EOS
Expand Down
2 changes: 1 addition & 1 deletion Formula/makensis.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def install
"STRIP=0",
"VERSION=#{version}",
]
scons "makensis", *args
system "scons", "makensis", *args
bin.install "build/urelease/makensis/makensis"
(share/"nsis").install resource("nsis")
end
Expand Down
2 changes: 1 addition & 1 deletion Formula/mongodb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def install
LINKFLAGS=-L#{Formula["openssl"].opt_lib}
]

scons "install", *args
system "scons", "install", *args

(buildpath/"mongod.conf").write mongodb_conf
etc.install "mongod.conf"
Expand Down
2 changes: 1 addition & 1 deletion Formula/mongodb@3.0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def install

args << "--disable-warnings-as-errors" if MacOS.version >= :yosemite

scons "install", *args
system "scons", "install", *args

(buildpath/"mongod.conf").write mongodb_conf
etc.install "mongod.conf"
Expand Down
2 changes: 1 addition & 1 deletion Formula/mongodb@3.2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def install

args << "--disable-warnings-as-errors" if MacOS.version >= :yosemite

scons "install", *args
system "scons", "install", *args

(buildpath/"mongod.conf").write mongodb_conf
etc.install "mongod.conf"
Expand Down
2 changes: 1 addition & 1 deletion Formula/mongodb@3.4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def install

args << "--disable-warnings-as-errors" if MacOS.version >= :yosemite

scons "install", *args
system "scons", "install", *args

(buildpath/"mongod.conf").write mongodb_conf
etc.install "mongod.conf"
Expand Down
2 changes: 1 addition & 1 deletion Formula/mongodb@3.6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def install

args << "--disable-warnings-as-errors" if MacOS.version >= :yosemite

scons "install", *args
system "scons", "install", *args

(buildpath/"mongod.conf").write mongodb_conf
etc.install "mongod.conf"
Expand Down
4 changes: 2 additions & 2 deletions Formula/ori.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class Ori < Formula
depends_on :osxfuse

def install
scons "BUILDTYPE=RELEASE"
scons "install", "PREFIX=#{prefix}"
system "scons", "BUILDTYPE=RELEASE"
system "scons", "install", "PREFIX=#{prefix}"
end

test do
Expand Down
2 changes: 1 addition & 1 deletion Formula/percona-server-mongodb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def install

args << "--disable-warnings-as-errors" if MacOS.version >= :yosemite

scons "install", *args
system "scons", "install", *args

(buildpath/"mongod.conf").write <<~EOS
systemLog:
Expand Down
2 changes: 1 addition & 1 deletion Formula/rlvm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def install
'\1("pkg-config --libs sdl SDL_image SDL_mixer SDL_ttf freetype2").Append(FRAMEWORKS=["OpenGL"])'
s.gsub! /(full_static_build) = True/, '\1 = False'
end
scons "--release"
system "scons", "--release"
prefix.install "build/rlvm.app"
bin.write_exec_script "#{prefix}/rlvm.app/Contents/MacOS/rlvm"
end
Expand Down
2 changes: 1 addition & 1 deletion Formula/rmlint.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Rmlint < Formula
depends_on "libelf"

def install
scons "config"
system "scons", "config"
scons
bin.install "rmlint"
man1.install "docs/rmlint.1.gz"
Expand Down
2 changes: 1 addition & 1 deletion Formula/subversion.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def install
APU=#{Formula["apr-util"].opt_prefix}
]
scons(*args)
scons "install"
system "scons", "install"
end

if build.with? "java"
Expand Down
2 changes: 1 addition & 1 deletion Formula/subversion@1.8.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def install
end

scons(*args)
scons "install"
system "scons", "install"
end

if build.include? "unicode-path"
Expand Down