Remove CEF from the repo and download it as needed
We now use github/prebuilt-cef to download CEF from S3, then build against that. This means we no longer need to have CEF committed to the repo. Fixes #280.
1
.gitignore
vendored
@ -9,3 +9,4 @@ build
|
||||
node_modules
|
||||
npm-debug.log
|
||||
/tags
|
||||
/cef/
|
||||
|
3
.gitmodules
vendored
@ -46,3 +46,6 @@
|
||||
[submodule "vendor/packages/python.tmbundle"]
|
||||
path = vendor/packages/python.tmbundle
|
||||
url = https://github.com/textmate/python.tmbundle
|
||||
[submodule "prebuilt-cef"]
|
||||
path = prebuilt-cef
|
||||
url = https://github.com/github/prebuilt-cef
|
||||
|
14
Rakefile
@ -15,11 +15,23 @@ task :build => "create-xcode-project" do
|
||||
end
|
||||
|
||||
desc "Create xcode project from gyp file"
|
||||
task "create-xcode-project" => "bootstrap" do
|
||||
task "create-xcode-project" => "update-cef" do
|
||||
`rm -rf atom.xcodeproj`
|
||||
`gyp --depth=. atom.gyp`
|
||||
end
|
||||
|
||||
desc "Update CEF to the latest version specified by the prebuilt-cef submodule"
|
||||
task "update-cef" => "bootstrap" do
|
||||
output = `prebuilt-cef/script/download -f cef 2>&1`
|
||||
if $?.exitstatus != 0
|
||||
$stderr.puts "Error #{$?.exitstatus}:\n#{output}"
|
||||
exit($?.exitstatus)
|
||||
end
|
||||
Dir.glob('cef/*.gypi').each do |filename|
|
||||
`sed -i '' -e "s/'include\\//'cef\\/include\\//" -e "s/'libcef_dll\\//'cef\\/libcef_dll\\//" #{filename}`
|
||||
end
|
||||
end
|
||||
|
||||
task "bootstrap" do
|
||||
`script/bootstrap`
|
||||
end
|
||||
|
6
atom.gyp
@ -132,8 +132,8 @@
|
||||
{
|
||||
'destination': '<(PRODUCT_DIR)/Atom.app/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/',
|
||||
'files': [
|
||||
'cef/frameworks/libcef.dylib',
|
||||
'cef/frameworks/ffmpegsumo.so',
|
||||
'cef/Release/libcef.dylib',
|
||||
'cef/Release/ffmpegsumo.so',
|
||||
],
|
||||
},
|
||||
{
|
||||
@ -246,7 +246,7 @@
|
||||
],
|
||||
'link_settings': {
|
||||
'libraries': [
|
||||
'cef/frameworks/libcef.dylib',
|
||||
'cef/Release/libcef.dylib',
|
||||
],
|
||||
}
|
||||
},
|
||||
|
Before Width: | Height: | Size: 752 B |
Before Width: | Height: | Size: 183 B |
Before Width: | Height: | Size: 523 B |
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 5.8 KiB |
Before Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 6.0 KiB |
Before Width: | Height: | Size: 123 B |
Before Width: | Height: | Size: 126 B |
Before Width: | Height: | Size: 239 B |
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 341 B |
Before Width: | Height: | Size: 411 B |
Before Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 175 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 90 B |
Before Width: | Height: | Size: 209 B |
Before Width: | Height: | Size: 212 B |
Before Width: | Height: | Size: 125 B |
Before Width: | Height: | Size: 144 B |
Before Width: | Height: | Size: 174 B |
Before Width: | Height: | Size: 193 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 7.0 KiB |
Before Width: | Height: | Size: 175 B |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 166 B |
Before Width: | Height: | Size: 128 B |
Before Width: | Height: | Size: 177 B |
Before Width: | Height: | Size: 146 B |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 819 B |
Before Width: | Height: | Size: 120 B |
Before Width: | Height: | Size: 125 B |
Before Width: | Height: | Size: 122 B |