From 52ace99f14a9390f5bf71370d616f2ed6b98c034 Mon Sep 17 00:00:00 2001 From: Amos Wenger Date: Thu, 15 Aug 2013 21:50:13 +0200 Subject: Use File::PATH_SEPARATOR globally instead of ':' On Unix, the path separator is ':', whereas on Windows, it is ';'. This is the first of a series of patch to bring macbrew's and winbrew's codebases closer together. The main places the magic constant ':' was being used were: - the $PATH environment variable - CMAKE-related environment variables - pkg-config related environment variables Closes Homebrew/homebrew#21921. Signed-off-by: Jack Nagel --- Library/Homebrew/requirements/python_dependency.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Library/Homebrew/requirements/python_dependency.rb') diff --git a/Library/Homebrew/requirements/python_dependency.rb b/Library/Homebrew/requirements/python_dependency.rb index 5eca9cf30..6a18883df 100644 --- a/Library/Homebrew/requirements/python_dependency.rb +++ b/Library/Homebrew/requirements/python_dependency.rb @@ -122,7 +122,7 @@ class PythonInstalled < Requirement else # Using the ORIGINAL_PATHS here because in superenv, the user # installed external Python is not visible otherwise. - which(@name, ORIGINAL_PATHS.join(':')) + which(@name, ORIGINAL_PATHS.join(File::PATH_SEPARATOR)) end end end @@ -252,12 +252,12 @@ class PythonInstalled < Requirement file.write(sitecustomize) # For non-system python's we add the opt_prefix/bin of python to the path. - ENV.prepend 'PATH', binary.dirname, ':' unless from_osx? + ENV.prepend 'PATH', binary.dirname, File::PATH_SEPARATOR unless from_osx? ENV['PYTHONHOME'] = nil # to avoid fuck-ups. ENV['PYTHONPATH'] = if brewed? then nil; else global_site_packages.to_s; end - ENV.append 'CMAKE_INCLUDE_PATH', incdir, ':' - ENV.append 'PKG_CONFIG_PATH', pkg_config_path, ':' if pkg_config_path + ENV.append 'CMAKE_INCLUDE_PATH', incdir, File::PATH_SEPARATOR + ENV.append 'PKG_CONFIG_PATH', pkg_config_path, File::PATH_SEPARATOR if pkg_config_path # We don't set the -F#{framework} here, because if Python 2.x and 3.x are # used, `Python.framework` is ambiguous. However, in the `python do` block # we can set LDFLAGS+="-F#{framework}" because only one is temporarily set. -- cgit v1.2.3