diff --git a/.circleci/config.yml b/.circleci/config.yml index cffac9a6677..e3a808718b9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -172,6 +172,63 @@ jobs: else echo 'Skipping upload distribution because build is not for release' fi + electron-linux-mips64el: + docker: + - image: electronbuilds/electron:0.0.3 + environment: + TARGET_ARCH: mips64el + resource_class: xlarge + steps: + - checkout + - run: + name: Check for release + command: | + if [ -n "${RUN_RELEASE_BUILD}" ]; then + echo 'release build triggered from api' + echo 'export ELECTRON_RELEASE=1 TRIGGERED_BY_API=1' >> $BASH_ENV + fi + - run: + name: Bootstrap + command: | + if [ "$ELECTRON_RELEASE" == "1" ]; then + echo 'Bootstrapping Electron for release build' + script/bootstrap.py --target_arch=$TARGET_ARCH + else + echo 'Bootstrapping Electron for debug build' + script/bootstrap.py --target_arch=$TARGET_ARCH --dev + fi + - run: npm run lint + - run: + name: Build + command: | + if [ "$ELECTRON_RELEASE" == "1" ]; then + echo 'Building Electron for release' + script/build.py -c R + else + echo 'Building Electron for debug' + script/build.py -c D + fi + - run: + name: Create distribution + command: | + if [ "$ELECTRON_RELEASE" == "1" ]; then + echo 'Creating Electron release distribution' + script/create-dist.py + else + echo 'Skipping create distribution because build is not for release' + fi + - run: + name: Upload distribution + command: | + if [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" != "1" ]; then + echo 'Uploading Electron release distribution to github releases' + script/upload.py + elif [ "$ELECTRON_RELEASE" == "1" ] && [ "$TRIGGERED_BY_API" == "1" ]; then + echo 'Uploading Electron release distribution to s3' + script/upload.py --upload_to_s3 + else + echo 'Skipping upload distribution because build is not for release' + fi electron-linux-x64: docker: diff --git a/.gitignore b/.gitignore index 76bfa72b49d..eb045368b7a 100644 --- a/.gitignore +++ b/.gitignore @@ -32,9 +32,12 @@ /vendor/debian_jessie_arm-sysroot/ /vendor/debian_jessie_arm64-sysroot/ /vendor/debian_jessie_i386-sysroot/ +/vendor/debian_jessie_mips64-sysroot/ /vendor/debian_wheezy_amd64-sysroot/ /vendor/debian_wheezy_arm-sysroot/ /vendor/debian_wheezy_i386-sysroot/ +/vendor/gcc-4.8.3-d197-n64-loongson/ +/vendor/readme-gcc483-loongson.txt /vendor/download/ /vendor/llvm-build/ /vendor/llvm/ diff --git a/atom/browser/api/atom_api_browser_view.cc b/atom/browser/api/atom_api_browser_view.cc index 454ec3d5371..4bd88a5a43c 100644 --- a/atom/browser/api/atom_api_browser_view.cc +++ b/atom/browser/api/atom_api_browser_view.cc @@ -114,7 +114,7 @@ void BrowserView::SetBackgroundColor(const std::string& color_name) { view_->SetBackgroundColor(ParseHexColor(color_name)); } -v8::Local BrowserView::WebContents() { +v8::Local BrowserView::GetWebContents() { if (web_contents_.IsEmpty()) { return v8::Null(isolate()); } @@ -131,7 +131,7 @@ void BrowserView::BuildPrototype(v8::Isolate* isolate, .SetMethod("setAutoResize", &BrowserView::SetAutoResize) .SetMethod("setBounds", &BrowserView::SetBounds) .SetMethod("setBackgroundColor", &BrowserView::SetBackgroundColor) - .SetProperty("webContents", &BrowserView::WebContents) + .SetProperty("webContents", &BrowserView::GetWebContents) .SetProperty("id", &BrowserView::ID); } diff --git a/atom/browser/api/atom_api_browser_view.h b/atom/browser/api/atom_api_browser_view.h index 36992bc6942..f6f45c5dbbd 100644 --- a/atom/browser/api/atom_api_browser_view.h +++ b/atom/browser/api/atom_api_browser_view.h @@ -56,7 +56,7 @@ class BrowserView : public mate::TrackableObject { void SetBounds(const gfx::Rect& bounds); void SetBackgroundColor(const std::string& color_name); - v8::Local WebContents(); + v8::Local GetWebContents(); v8::Global web_contents_; class WebContents* api_web_contents_; diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index c385a6f024a..98315395b69 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -1,7 +1,12 @@ { 'variables': { # The libraries brightray will be compiled to. - 'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss' + 'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss', + 'conditions': [ + ['target_arch=="mips64el"', { + 'linux_system_libraries': '<(linux_system_libraries) libpulse', + }], + ], }, 'includes': [ 'filenames.gypi', @@ -69,21 +74,29 @@ }, 'cflags': [ '