Bump v2.0.0

Manually backport Support Policy docs from master

README.md

@@ -89,22 +89,8 @@ Find documentation translations in [electron/electron-i18n](https://github.com/e
 
 ## Community
 
-You can ask questions and interact with the community in the following
-locations:
-- [`electron`](https://discuss.atom.io/c/electron) category on the Atom
-forums
-- `#atom-shell` channel on Freenode
-- [`Atom`](https://atom-slack.herokuapp.com) channel on Slack
-- [`electron-ru`](https://telegram.me/electron_ru) *(Russian)*
-- [`electron-br`](https://electron-br.slack.com) *(Brazilian Portuguese)*
-- [`electron-kr`](https://electron-kr.github.io/electron-kr) *(Korean)*
-- [`electron-jp`](https://electron-jp.slack.com) *(Japanese)*
-- [`electron-tr`](https://electron-tr.herokuapp.com) *(Turkish)*
-- [`electron-id`](https://electron-id.slack.com) *(Indonesia)*
-- [`electron-pl`](https://electronpl.github.io) *(Poland)*
-
-Check out [awesome-electron](https://github.com/sindresorhus/awesome-electron)
-for a community maintained list of useful example apps, tools and resources.
+Info on reporting bugs, getting help, finding third-party tools and sample apps,
+and more can be found in the [support document](docs/tutorial/support.md#finding-support).
 
 ## License
 

atom/browser/resources/win/atom.rc

@@ -56,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,8
- PRODUCTVERSION 2,0,0,8
+ FILEVERSION 2,0,0,0
+ PRODUCTVERSION 2,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

atom/common/atom_version.h

@@ -8,7 +8,7 @@
 #define ATOM_MAJOR_VERSION 2
 #define ATOM_MINOR_VERSION 0
 #define ATOM_PATCH_VERSION 0
-#define ATOM_PRE_RELEASE_VERSION -beta.8
+// #define ATOM_PRE_RELEASE_VERSION
 
 #ifndef ATOM_STRINGIFY
 #define ATOM_STRINGIFY(n) ATOM_STRINGIFY_HELPER(n)

docs/README.md

@@ -17,7 +17,7 @@ an issue:
 ## Guides
 
 * [Glossary of Terms](glossary.md)
-* [Supported Platforms](tutorial/supported-platforms.md)
+* [Support](tutorial/support.md)
 * [Security](tutorial/security.md)
 * [Versioning](tutorial/electron-versioning.md)
 * [Application Distribution](tutorial/application-distribution.md)

docs/development/issues.md

@@ -26,10 +26,9 @@ contribute:
 
 ## Asking for General Help
 
-Because the level of activity in the `electron/electron` repository is
-so high, questions or requests for general help using Electron should
-be directed at the [community slack channel](https://atomio.slack.com)
-or the [forum](https://discuss.atom.io/c/electron).
+["Finding Support"](../tutorial/support.md#finding-support) has a
+list of resources for getting programming help, reporting security issues,
+contributing, and more. Please use the issue tracker for bugs only!
 
 ## Submitting a Bug Report
 

docs/tutorial/support.md

@@ -0,0 +1,94 @@
+# Electron Support
+
+## Finding Support
+
+If you have a security concern,
+please see the [security document](../../SECURITY.md).
+
+If you're looking for programming help,
+for answers to questions,
+or to join in discussion with other developers who use Electron,
+you can interact with the community in these locations:
+- [`electron`](https://discuss.atom.io/c/electron) category on the Atom
+forums
+- `#atom-shell` channel on Freenode
+- [`Electron`](https://atom-slack.herokuapp.com) channel on Atom's Slack
+- [`electron-ru`](https://telegram.me/electron_ru) *(Russian)*
+- [`electron-br`](https://electron-br.slack.com) *(Brazilian Portuguese)*
+- [`electron-kr`](https://electron-kr.github.io/electron-kr) *(Korean)*
+- [`electron-jp`](https://electron-jp.slack.com) *(Japanese)*
+- [`electron-tr`](https://electron-tr.herokuapp.com) *(Turkish)*
+- [`electron-id`](https://electron-id.slack.com) *(Indonesia)*
+- [`electron-pl`](https://electronpl.github.io) *(Poland)*
+
+If you'd like to contribute to Electron,
+see the [contributing document](../../CONTRIBUTING.md).
+
+If you've found a bug in a [supported version](#supported-versions) of Electron,
+please report it with the [issue tracker](../development/issues.md).
+
+[awesome-electron](https://github.com/sindresorhus/awesome-electron)
+is a community-maintained list of useful example apps,
+tools and resources.
+
+## Supported Versions
+
+The latest three release branches are supported by the Electron team.
+For example, if the latest release is 2.0.x, then the 2-0-x series
+is supported, as are the two previous release series 1-7-x and 1-8-x.
+
+When a release branch reaches the end of its support cycle, the series
+will be deprecated in NPM and a final end-of-support release will be
+made. This release will add a warning to inform that an unsupported
+version of Electron is in use.
+
+These steps are to help app developers learn when a branch they're
+using becomes unsupported, but without being excessively intrusive
+to end users.
+
+If an application has exceptional circumstances and needs to stay
+on an unsupported series of Electron, developers can silence the
+end-of-support warning by omitting the final release from the app's
+`package.json` `devDependencies`. For example, since the 1-6-x series
+ended with an end-of-support 1.6.18 release, developers could choose
+to stay in the 1-6-x series without warnings with `devDependency` of
+`"electron": 1.6.0 - 1.6.17`.
+
+## Supported Platforms
+
+Following platforms are supported by Electron:
+
+### macOS
+
+Only 64bit binaries are provided for macOS, and the minimum macOS version
+supported is macOS 10.9.
+
+### Windows
+
+Windows 7 and later are supported, older operating systems are not supported
+(and do not work).
+
+Both `ia32` (`x86`) and `x64` (`amd64`) binaries are provided for Windows.
+Running Electron apps on Windows for ARM devices is possible by using the
+ia32 binary.
+
+### Linux
+
+The prebuilt `ia32` (`i686`) and `x64` (`amd64`) binaries of Electron are built on
+Ubuntu 12.04, the `armv7l` binary is built against ARM v7 with hard-float ABI and
+NEON for Debian Wheezy.
+
+[Until the release of Electron 2.0][arm-breaking-change], Electron will also
+continue to release the `armv7l` binary with a simple `arm` suffix. Both binaries 
+are identical.
+
+Whether the prebuilt binary can run on a distribution depends on whether the
+distribution includes the libraries that Electron is linked to on the building
+platform, so only Ubuntu 12.04 is guaranteed to work, but following platforms
+are also verified to be able to run the prebuilt binaries of Electron:
+
+* Ubuntu 12.04 and newer
+* Fedora 21
+* Debian 8
+
+[arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/tutorial/planned-breaking-changes.md#duplicate-arm-assets

docs/tutorial/supported-platforms.md

@@ -1,37 +1 @@
-# Supported Platforms
-
-Following platforms are supported by Electron:
-
-### macOS
-
-Only 64bit binaries are provided for macOS, and the minimum macOS version
-supported is macOS 10.9.
-
-### Windows
-
-Windows 7 and later are supported, older operating systems are not supported
-(and do not work).
-
-Both `ia32` (`x86`) and `x64` (`amd64`) binaries are provided for Windows.
-Please note, the `ARM` version of Windows is not supported for now.
-
-### Linux
-
-The prebuilt `ia32` (`i686`) and `x64` (`amd64`) binaries of Electron are built on
-Ubuntu 12.04, the `armv7l` binary is built against ARM v7 with hard-float ABI and
-NEON for Debian Wheezy.
-
-[Until the release of Electron 2.0][arm-breaking-change], Electron will also
-continue to release the `armv7l` binary with a simple `arm` suffix. Both binaries 
-are identical.
-
-Whether the prebuilt binary can run on a distribution depends on whether the
-distribution includes the libraries that Electron is linked to on the building
-platform, so only Ubuntu 12.04 is guaranteed to work, but following platforms
-are also verified to be able to run the prebuilt binaries of Electron:
-
-* Ubuntu 12.04 and later
-* Fedora 21
-* Debian 8
-
-[arm-breaking-change]: https://github.com/electron/electron/blob/master/docs/tutorial/planned-breaking-changes.md#duplicate-arm-assets
+Moved to [support.md](support.md)

electron.gyp

@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '2.0.0-beta.8',
+    'version%': '2.0.0',
     'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c',
   },
   'includes': [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {

script/bootstrap.py

@@ -113,6 +113,8 @@ def parse_args():
                       help='The static library path of libchromiumcontent.')
   parser.add_argument('--defines', default='',
                       help='The build variables passed to gyp')
+  parser.add_argument('--cc_wrapper',
+                      help='Sets cc_wrapper for build. E.g. $(which sccache)')
   return parser.parse_args()
 
 
@@ -123,6 +125,8 @@ def args_to_defines(args):
   if args.clang_dir:
     defines += ' make_clang_dir=' + args.clang_dir
     defines += ' clang_use_chrome_plugins=0'
+  if args.cc_wrapper is not None:
+    defines += ' cc_wrapper=' + args.cc_wrapper
   return defines
 
 

toolchain.gypi

@@ -5,6 +5,9 @@
     # Set this to true when building with Clang.
     'clang%': 1,
 
+    # Set this to the absolute path to sccache when building with sccache
+    'cc_wrapper%': '',
+
     # Path to mips64el toolchain.
     'make_mips64_dir%': 'vendor/gcc-4.8.3-d197-n64-loongson/usr',
 
@@ -101,6 +104,15 @@
     ],
   },
   'conditions': [
+    # Setup cc_wrapper
+    ['cc_wrapper!=""', {
+      'make_global_settings': [
+        ['CC_wrapper', '<(cc_wrapper)'],
+        ['CXX_wrapper', '<(cc_wrapper)'],
+        ['CC.host_wrapper', '<(cc_wrapper)'],
+        ['CXX.host_wrapper', '<(cc_wrapper)']
+      ],
+    }],
     # Setup building with clang.
     ['clang==1', {
       'make_global_settings': [