aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/cask/lib/hbc/macos.rb2
-rw-r--r--Library/Homebrew/compat/macos.rb278
-rw-r--r--Library/Homebrew/compat/xcode.rb10
-rw-r--r--Library/Homebrew/os/mac.rb4
-rw-r--r--Library/Homebrew/os/mac/xcode.rb2
-rw-r--r--Library/Homebrew/os/mac/xquartz.rb2
6 files changed, 150 insertions, 148 deletions
diff --git a/Library/Homebrew/cask/lib/hbc/macos.rb b/Library/Homebrew/cask/lib/hbc/macos.rb
index fb15be108..e7de82d6a 100644
--- a/Library/Homebrew/cask/lib/hbc/macos.rb
+++ b/Library/Homebrew/cask/lib/hbc/macos.rb
@@ -4,6 +4,8 @@ require "os/mac/version"
module OS
module Mac
+ module_function
+
SYSTEM_DIRS = [
"/",
"/Applications",
diff --git a/Library/Homebrew/compat/macos.rb b/Library/Homebrew/compat/macos.rb
index 6b0166e40..17f4670cc 100644
--- a/Library/Homebrew/compat/macos.rb
+++ b/Library/Homebrew/compat/macos.rb
@@ -2,145 +2,145 @@ require "development_tools"
module OS
module Mac
- class << self
- def xcode_folder
- odeprecated "MacOS.xcode_folder", "MacOS::Xcode.folder"
- Xcode.folder
- end
-
- def xcode_prefix
- odeprecated "MacOS.xcode_prefix", "MacOS::Xcode.prefix"
- Xcode.prefix
- end
-
- def xcode_installed?
- odeprecated "MacOS.xcode_installed?", "MacOS::Xcode.installed?"
- Xcode.installed?
- end
-
- def xcode_version
- odeprecated "MacOS.xcode_version", "MacOS::Xcode.version"
- Xcode.version
- end
-
- def clt_installed?
- odeprecated "MacOS.clt_installed?", "MacOS::CLT.installed?"
- CLT.installed?
- end
-
- def clt_version?
- odeprecated "MacOS.clt_version?", "MacOS::CLT.version"
- CLT.version
- end
-
- def x11_installed?
- odeprecated "MacOS.x11_installed?", "MacOS::X11.installed?"
- X11.installed?
- end
-
- def x11_prefix
- odeprecated "MacOS.x11_prefix", "MacOS::X11.prefix"
- X11.prefix
- end
-
- def leopard?
- odeprecated "MacOS.leopard?", "'MacOS.version == :leopard'"
- version == :leopard
- end
-
- def snow_leopard?
- odeprecated "MacOS.snow_leopard?", "'MacOS.version >= :snow_leopard'"
- version >= :snow_leopard
- end
-
- def snow_leopard_or_newer?
- odeprecated "MacOS.snow_leopard_or_newer?", "'MacOS.version >= :snow_leopard'"
- version >= :snow_leopard
- end
-
- def lion?
- odeprecated "MacOS.lion?", "'MacOS.version >= :lion'"
- version >= :lion
- end
-
- def lion_or_newer?
- odeprecated "MacOS.lion_or_newer?", "'MacOS.version >= :lion'"
- version >= :lion
- end
-
- def mountain_lion?
- odeprecated "MacOS.mountain_lion?", "'MacOS.version >= :mountain_lion'"
- version >= :mountain_lion
- end
-
- def mountain_lion_or_newer?
- odeprecated "MacOS.mountain_lion_or_newer?", "'MacOS.version >= :mountain_lion'"
- version >= :mountain_lion
- end
-
- def macports_or_fink_installed?
- odeprecated "MacOS.macports_or_fink_installed?", "!MacOS.macports_or_fink.empty?"
- !macports_or_fink.empty?
- end
-
- def locate(tool)
- odeprecated "MacOS.locate", "DevelopmentTools.locate"
- DevelopmentTools.locate(tool)
- end
-
- def default_cc
- odeprecated "MacOS.default_cc", "DevelopmentTools.default_cc"
- DevelopmentTools.default_cc
- end
-
- def default_compiler
- odeprecated "MacOS.default_compiler", "DevelopmentTools.default_compiler"
- DevelopmentTools.default_compiler
- end
-
- def gcc_40_build_version
- odeprecated "MacOS.gcc_40_build_version", "DevelopmentTools.gcc_40_build_version"
- DevelopmentTools.gcc_40_build_version
- end
-
- def gcc_4_0_build_version
- odeprecated "MacOS.gcc_4_0_build_version", "DevelopmentTools.gcc_40_build_version"
- DevelopmentTools.gcc_40_build_version
- end
-
- def gcc_42_build_version
- odeprecated "MacOS.gcc_42_build_version", "DevelopmentTools.gcc_42_build_version"
- DevelopmentTools.gcc_42_build_version
- end
-
- def gcc_build_version
- odeprecated "MacOS.gcc_build_version", "DevelopmentTools.gcc_42_build_version"
- DevelopmentTools.gcc_42_build_version
- end
-
- def llvm_build_version
- odeprecated "MacOS.llvm_build_version"
- end
-
- def clang_version
- odeprecated "MacOS.clang_version", "DevelopmentTools.clang_version"
- DevelopmentTools.clang_version
- end
-
- def clang_build_version
- odeprecated "MacOS.clang_build_version", "DevelopmentTools.clang_build_version"
- DevelopmentTools.clang_build_version
- end
-
- def has_apple_developer_tools?
- odeprecated "MacOS.has_apple_developer_tools?", "DevelopmentTools.installed?"
- DevelopmentTools.installed?
- end
-
- def release
- odeprecated "MacOS.release", "MacOS.version"
- version
- end
+ module_function
+
+ def xcode_folder
+ odeprecated "MacOS.xcode_folder", "MacOS::Xcode.folder"
+ Xcode.folder
+ end
+
+ def xcode_prefix
+ odeprecated "MacOS.xcode_prefix", "MacOS::Xcode.prefix"
+ Xcode.prefix
+ end
+
+ def xcode_installed?
+ odeprecated "MacOS.xcode_installed?", "MacOS::Xcode.installed?"
+ Xcode.installed?
+ end
+
+ def xcode_version
+ odeprecated "MacOS.xcode_version", "MacOS::Xcode.version"
+ Xcode.version
+ end
+
+ def clt_installed?
+ odeprecated "MacOS.clt_installed?", "MacOS::CLT.installed?"
+ CLT.installed?
+ end
+
+ def clt_version?
+ odeprecated "MacOS.clt_version?", "MacOS::CLT.version"
+ CLT.version
+ end
+
+ def x11_installed?
+ odeprecated "MacOS.x11_installed?", "MacOS::X11.installed?"
+ X11.installed?
+ end
+
+ def x11_prefix
+ odeprecated "MacOS.x11_prefix", "MacOS::X11.prefix"
+ X11.prefix
+ end
+
+ def leopard?
+ odeprecated "MacOS.leopard?", "'MacOS.version == :leopard'"
+ version == :leopard
+ end
+
+ def snow_leopard?
+ odeprecated "MacOS.snow_leopard?", "'MacOS.version >= :snow_leopard'"
+ version >= :snow_leopard
+ end
+
+ def snow_leopard_or_newer?
+ odeprecated "MacOS.snow_leopard_or_newer?", "'MacOS.version >= :snow_leopard'"
+ version >= :snow_leopard
+ end
+
+ def lion?
+ odeprecated "MacOS.lion?", "'MacOS.version >= :lion'"
+ version >= :lion
+ end
+
+ def lion_or_newer?
+ odeprecated "MacOS.lion_or_newer?", "'MacOS.version >= :lion'"
+ version >= :lion
+ end
+
+ def mountain_lion?
+ odeprecated "MacOS.mountain_lion?", "'MacOS.version >= :mountain_lion'"
+ version >= :mountain_lion
+ end
+
+ def mountain_lion_or_newer?
+ odeprecated "MacOS.mountain_lion_or_newer?", "'MacOS.version >= :mountain_lion'"
+ version >= :mountain_lion
+ end
+
+ def macports_or_fink_installed?
+ odeprecated "MacOS.macports_or_fink_installed?", "!MacOS.macports_or_fink.empty?"
+ !macports_or_fink.empty?
+ end
+
+ def locate(tool)
+ odeprecated "MacOS.locate", "DevelopmentTools.locate"
+ DevelopmentTools.locate(tool)
+ end
+
+ def default_cc
+ odeprecated "MacOS.default_cc", "DevelopmentTools.default_cc"
+ DevelopmentTools.default_cc
+ end
+
+ def default_compiler
+ odeprecated "MacOS.default_compiler", "DevelopmentTools.default_compiler"
+ DevelopmentTools.default_compiler
+ end
+
+ def gcc_40_build_version
+ odeprecated "MacOS.gcc_40_build_version", "DevelopmentTools.gcc_40_build_version"
+ DevelopmentTools.gcc_40_build_version
+ end
+
+ def gcc_4_0_build_version
+ odeprecated "MacOS.gcc_4_0_build_version", "DevelopmentTools.gcc_40_build_version"
+ DevelopmentTools.gcc_40_build_version
+ end
+
+ def gcc_42_build_version
+ odeprecated "MacOS.gcc_42_build_version", "DevelopmentTools.gcc_42_build_version"
+ DevelopmentTools.gcc_42_build_version
+ end
+
+ def gcc_build_version
+ odeprecated "MacOS.gcc_build_version", "DevelopmentTools.gcc_42_build_version"
+ DevelopmentTools.gcc_42_build_version
+ end
+
+ def llvm_build_version
+ odeprecated "MacOS.llvm_build_version"
+ end
+
+ def clang_version
+ odeprecated "MacOS.clang_version", "DevelopmentTools.clang_version"
+ DevelopmentTools.clang_version
+ end
+
+ def clang_build_version
+ odeprecated "MacOS.clang_build_version", "DevelopmentTools.clang_build_version"
+ DevelopmentTools.clang_build_version
+ end
+
+ def has_apple_developer_tools?
+ odeprecated "MacOS.has_apple_developer_tools?", "DevelopmentTools.installed?"
+ DevelopmentTools.installed?
+ end
+
+ def release
+ odeprecated "MacOS.release", "MacOS.version"
+ version
end
end
end
diff --git a/Library/Homebrew/compat/xcode.rb b/Library/Homebrew/compat/xcode.rb
index 69abbf4b1..14150cc7c 100644
--- a/Library/Homebrew/compat/xcode.rb
+++ b/Library/Homebrew/compat/xcode.rb
@@ -1,11 +1,11 @@
module OS
module Mac
module Xcode
- class << self
- def provides_autotools?
- odeprecated "OS::Mac::Xcode.provides_autotools?"
- version < "4.3"
- end
+ module_function
+
+ def provides_autotools?
+ odeprecated "OS::Mac::Xcode.provides_autotools?"
+ version < "4.3"
end
end
end
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 029c761f7..0b0147825 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -9,9 +9,9 @@ require "os/mac/keg"
module OS
module Mac
- extend self
+ module_function
- ::MacOS = self # compatibility
+ ::MacOS = self # rubocop:disable Style/ConstantName
raise "Loaded OS::Mac on generic OS!" if ENV["HOMEBREW_TEST_GENERIC_OS"]
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index 0f78e4412..8ec0b91de 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -1,7 +1,7 @@
module OS
module Mac
module Xcode
- extend self
+ module_function
V4_BUNDLE_ID = "com.apple.dt.Xcode".freeze
V3_BUNDLE_ID = "com.apple.Xcode".freeze
diff --git a/Library/Homebrew/os/mac/xquartz.rb b/Library/Homebrew/os/mac/xquartz.rb
index 9a610e29f..674e50c50 100644
--- a/Library/Homebrew/os/mac/xquartz.rb
+++ b/Library/Homebrew/os/mac/xquartz.rb
@@ -3,7 +3,7 @@ module OS
X11 = XQuartz = Module.new
module XQuartz
- extend self
+ module_function
FORGE_BUNDLE_ID = "org.macosforge.xquartz.X11".freeze
APPLE_BUNDLE_ID = "org.x.X11".freeze
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 13:40:43 +0000