Merge branch 'prebuilt-cef' into dev

.gitignore

@@ -9,3 +9,4 @@ build
 node_modules
 npm-debug.log
 /tags
+/cef/

.gitmodules

@@ -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

Rakefile

@@ -15,11 +15,19 @@ 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
+  exit 1 unless system %{prebuilt-cef/script/download -f cef}
+  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

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',
         ],
       }
     },