Skip to content

Commit

Permalink
[osx] Split GUI and agent
Browse files Browse the repository at this point in the history
This is a catchup on Quentin's work (yeah, for this one a cherrypick
would probably have been faster :) ). Here's the commit he made :
281fbf2#diff-9849a8f11967c29eaae01d79a6d361fdR18

See DataDog/dd-agent#1361 for `dd-agent`
* remove unecessary complex install of supervisor for Mac
* add record-files to modules needed by the GUI (to uninstall them properly)
  • Loading branch information
Etienne LAFARGE committed Jul 16, 2015
1 parent cfc9570 commit 2915780
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 20 deletions.
3 changes: 2 additions & 1 deletion config/software/guidata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
build do
patch :source => 'fix_blocking_import.patch'
patch :source => 'remove_default_image_path.patch' if ohai['platform_family'] == 'mac_os_x'
command "#{install_dir}/embedded/bin/python setup.py install", :env => env
command "#{install_dir}/embedded/bin/python setup.py install "\
"--record #{install_dir}/embedded/guidata-files.txt", :env => env
end
3 changes: 2 additions & 1 deletion config/software/pyside.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
}

build do
command "#{install_dir}/embedded/bin/python setup.py install", :env => env
command "#{install_dir}/embedded/bin/python setup.py install "\
"--record #{install_dir}/embedded/pyside-files.txt", :env => env
end
3 changes: 2 additions & 1 deletion config/software/spyderlib.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
}

build do
command "#{install_dir}/embedded/bin/python setup.py install", :env => env
command "#{install_dir}/embedded/bin/python setup.py install "\
"--record #{install_dir}/embedded/spyderlib-files.txt", :env => env
end
20 changes: 3 additions & 17 deletions config/software/supervisor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,7 @@
dependency "python"
dependency "pip"

if ohai['platform_family'] == 'mac_os_x'
source :url => "https://github.com/Supervisor/supervisor/archive/#{version}.tar.gz",
:md5 => '073f1912e8bfe5bf89e84b96495df62e'

relative_path "supervisor-#{version}"

dependency "meld3"

build do
ship_license "https://raw.githubusercontent.com/Supervisor/supervisor/master/LICENSES.txt"
command "#{install_dir}/embedded/bin/python setup.py install"
end
else
build do
ship_license "https://raw.githubusercontent.com/Supervisor/supervisor/master/LICENSES.txt"
command "#{install_dir}/embedded/bin/pip install -I --install-option=\"--install-scripts=#{install_dir}/bin\" #{name}==#{version}"
end
build do
ship_license "https://raw.githubusercontent.com/Supervisor/supervisor/master/LICENSES.txt"
command "#{install_dir}/embedded/bin/pip install -I --install-option=\"--install-scripts=#{install_dir}/bin\" #{name}==#{version}"
end

0 comments on commit 2915780

Please sign in to comment.