mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7881 from electron/node-headers-url

Browse source 
Update dist url to be electron instead of atom-shell
This commit is contained in:
Kevin Sawicki 2016-11-04 16:22:34 -07:00 committed by GitHub
commit 0b86acfef4
15 changed files with 37 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs-translations/es/tutorial/using-native-node-modules.md
View file

@ -37,7 +37,7 @@ desde dónde descargar las cabeceras y cuál versión usar:
```bash ```bash
$ cd /path-to-module/ $ cd /path-to-module/
$ HOME=~/.electron-gyp node-gyp rebuild --target=0.29.1 --arch=x64 --dist-url=https://atom.io/download/atom-shell $ HOME=~/.electron-gyp node-gyp rebuild --target=0.29.1 --arch=x64 --dist-url=https://atom.io/download/electron
``` ```
Los cambios en `HOME=~/.electron-gyp` fueron para especificar la ruta de las cabeceras. Los cambios en `HOME=~/.electron-gyp` fueron para especificar la ruta de las cabeceras.
@ -50,7 +50,7 @@ También puedes usar `npm` para instalar módulos, los pasos son exactamente igu
con la excepción de que necesitas establecer algunas variables de entorno primero: con la excepción de que necesitas establecer algunas variables de entorno primero:
```bash ```bash
export npm_config_disturl=https://atom.io/download/atom-shell export npm_config_disturl=https://atom.io/download/electron
export npm_config_target=0.29.1 export npm_config_target=0.29.1
export npm_config_arch=x64 export npm_config_arch=x64
HOME=~/.electron-gyp npm install module-name HOME=~/.electron-gyp npm install module-name

4
docs-translations/jp/tutorial/debugging-main-process.md
View file

@ -35,8 +35,8 @@ $ npm install git+https://git@github.com/enlight/node-pre-gyp.git#detect-electro
### 4. Electron用の `node-inspector` `v8` モジュールをリコンパイルする(対象のElectronのバージョン番号を変更する) ### 4. Electron用の `node-inspector` `v8` モジュールをリコンパイルする(対象のElectronのバージョン番号を変更する)
```bash ```bash
$ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-debug/ --dist-url=https://atom.io/download/atom-shell reinstall $ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-debug/ --dist-url=https://atom.io/download/electron reinstall
$ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-profiler/ --dist-url=https://atom.io/download/atom-shell reinstall $ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-profiler/ --dist-url=https://atom.io/download/electron reinstall
``` ```
[How to install native modules](how-to-install-native-modules)を見る。 [How to install native modules](how-to-install-native-modules)を見る。

4
docs-translations/jp/tutorial/using-native-node-modules.md
View file

@ -31,7 +31,7 @@ npm install --save-dev electron-rebuild
モジュールをインストールするために`npm` を使用できます。環境変数の設定を除いて、Nodeモジュールと完全に同じ手順です。 モジュールをインストールするために`npm` を使用できます。環境変数の設定を除いて、Nodeモジュールと完全に同じ手順です。
```bash ```bash
export npm_config_disturl=https://atom.io/download/atom-shell export npm_config_disturl=https://atom.io/download/electron
export npm_config_target=0.33.1 export npm_config_target=0.33.1
export npm_config_arch=x64 export npm_config_arch=x64
export npm_config_runtime=electron export npm_config_runtime=electron
@ -44,7 +44,7 @@ ElectronのヘッダーでNodeモジュールをビルドするために、ど
```bash ```bash
$ cd /path-to-module/ $ cd /path-to-module/
$ HOME=~/.electron-gyp node-gyp rebuild --target=0.29.1 --arch=x64 --dist-url=https://atom.io/download/atom-shell $ HOME=~/.electron-gyp node-gyp rebuild --target=0.29.1 --arch=x64 --dist-url=https://atom.io/download/electron
``` ```
開発ヘッダーを探し、 `HOME=~/.electron-gyp` を変更します。`--target=0.29.1`がElectronのバージョンです。 `--dist-url=...` で、どこからヘッダーをダウンロードするかを指定します。`--arch=x64`を使用して、64bit システム用にモジュールをビルドします。 開発ヘッダーを探し、 `HOME=~/.electron-gyp` を変更します。`--target=0.29.1`がElectronのバージョンです。 `--dist-url=...` で、どこからヘッダーをダウンロードするかを指定します。`--arch=x64`を使用して、64bit システム用にモジュールをビルドします。

4
docs-translations/ko-KR/tutorial/debugging-main-process-node-inspector.md
View file

@ -88,8 +88,8 @@ $ npm install node-pre-gyp
**참고:** 사용하는 Electron의 버전에 맞춰 target 인수를 변경하세요. **참고:** 사용하는 Electron의 버전에 맞춰 target 인수를 변경하세요.
```bash ```bash
$ node_modules/.bin/node-pre-gyp --target=1.2.5 --runtime=electron --fallback-to-build --directory node_modules/v8-debug/ --dist-url=https://atom.io/download/atom-shell reinstall $ node_modules/.bin/node-pre-gyp --target=1.2.5 --runtime=electron --fallback-to-build --directory node_modules/v8-debug/ --dist-url=https://atom.io/download/electron reinstall
$ node_modules/.bin/node-pre-gyp --target=1.2.5 --runtime=electron --fallback-to-build --directory node_modules/v8-profiler/ --dist-url=https://atom.io/download/atom-shell reinstall $ node_modules/.bin/node-pre-gyp --target=1.2.5 --runtime=electron --fallback-to-build --directory node_modules/v8-profiler/ --dist-url=https://atom.io/download/electron reinstall
``` ```
또한 [네이티브 모듈 설치 방법][how-to-install-native-modules] 문서도 참고해보세요. 또한 [네이티브 모듈 설치 방법][how-to-install-native-modules] 문서도 참고해보세요.

4
docs-translations/ko-KR/tutorial/using-native-node-modules.md
View file

@ -22,7 +22,7 @@ export npm_config_target=1.2.3
export npm_config_arch=x64 export npm_config_arch=x64
export npm_config_target_arch=x64 export npm_config_target_arch=x64
# Electron에 대한 헤더 다운로드 링크. # Electron에 대한 헤더 다운로드 링크.
export npm_config_disturl=https://atom.io/download/atom-shell export npm_config_disturl=https://atom.io/download/electron
# node-pre-gyp에 Electron을 빌드한다는 것을 알려줍니다. # node-pre-gyp에 Electron을 빌드한다는 것을 알려줍니다.
export npm_config_runtime=electron export npm_config_runtime=electron
# node-pre-gyp에 소스 코드로부터 모듈을 빌드한다는 것을 알려줍니다. # node-pre-gyp에 소스 코드로부터 모듈을 빌드한다는 것을 알려줍니다.
@ -60,7 +60,7 @@ npm install --save-dev electron-rebuild
```bash ```bash
cd /path-to-module/ cd /path-to-module/
HOME=~/.electron-gyp node-gyp rebuild --target=1.2.3 --arch=x64 --dist-url=https://atom.io/download/atom-shell HOME=~/.electron-gyp node-gyp rebuild --target=1.2.3 --arch=x64 --dist-url=https://atom.io/download/electron
``` ```
`HOME=~/.electron-gyp`은 변경할 헤더의 위치를 찾습니다. `--target=0.29.1`은 `HOME=~/.electron-gyp`은 변경할 헤더의 위치를 찾습니다. `--target=0.29.1`은

4
docs-translations/pt-BR/tutorial/using-native-node-modules.md
View file

@ -46,7 +46,7 @@ os mesmos com os módulos Node, exceto que você precisa configurar algumas
variáveis da ambiente: variáveis da ambiente:
```bash ```bash
export npm_config_disturl=https://atom.io/download/atom-shell export npm_config_disturl=https://atom.io/download/electron
export npm_config_target=0.33.1 export npm_config_target=0.33.1
export npm_config_arch=x64 export npm_config_arch=x64
export npm_config_runtime=electron export npm_config_runtime=electron
@ -60,7 +60,7 @@ ao `node-gyp` onde baixar as headers e qual versão usar:
```bash ```bash
$ cd /path-to-module/ $ cd /path-to-module/
$ HOME=~/.electron-gyp node-gyp rebuild --target=0.29.1 --arch=x64 --dist-url=https://atom.io/download/atom-shell $ HOME=~/.electron-gyp node-gyp rebuild --target=0.29.1 --arch=x64 --dist-url=https://atom.io/download/electron
``` ```
A tag `HOME=~/.electron-gyp` altera onde encontrar as headers de desenvolvimento. A tag `HOME=~/.electron-gyp` altera onde encontrar as headers de desenvolvimento.

4
docs-translations/zh-CN/tutorial/debugging-main-process.md
View file

@ -38,8 +38,8 @@ $ npm install git+https://git@github.com/enlight/node-pre-gyp.git#detect-electro
### 4. 为 Electron 重新编译 `node-inspector` `v8` 模块（将 target 参数修改为你的 Electron 的版本号） ### 4. 为 Electron 重新编译 `node-inspector` `v8` 模块（将 target 参数修改为你的 Electron 的版本号）
```bash ```bash
$ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-debug/ --dist-url=https://atom.io/download/atom-shell reinstall $ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-debug/ --dist-url=https://atom.io/download/electron reinstall
$ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-profiler/ --dist-url=https://atom.io/download/atom-shell reinstall $ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-profiler/ --dist-url=https://atom.io/download/electron reinstall
``` ```
[How to install native modules][how-to-install-native-modules]. [How to install native modules][how-to-install-native-modules].

4
docs-translations/zh-CN/tutorial/using-native-node-modules.md
View file

@ -31,7 +31,7 @@ npm install --save-dev electron-rebuild
你当然也可以通过 `npm` 安装原生模块。大部分步骤和安装普通模块时一样，除了以下一些系统环境变量你需要自己操作： 你当然也可以通过 `npm` 安装原生模块。大部分步骤和安装普通模块时一样，除了以下一些系统环境变量你需要自己操作：
```bash ```bash
export npm_config_disturl=https://atom.io/download/atom-shell export npm_config_disturl=https://atom.io/download/electron
export npm_config_target=0.33.1 export npm_config_target=0.33.1
export npm_config_arch=x64 export npm_config_arch=x64
export npm_config_runtime=electron export npm_config_runtime=electron
@ -44,7 +44,7 @@ HOME=~/.electron-gyp npm install module-name
```bash ```bash
$ cd /path-to-module/ $ cd /path-to-module/
$ HOME=~/.electron-gyp node-gyp rebuild --target=0.29.1 --arch=x64 --dist-url=https://atom.io/download/atom-shell $ HOME=~/.electron-gyp node-gyp rebuild --target=0.29.1 --arch=x64 --dist-url=https://atom.io/download/electron
``` ```
`HOME=~/.electron-gyp` 设置去哪找开发时的 headers。 `HOME=~/.electron-gyp` 设置去哪找开发时的 headers。

4
docs-translations/zh-TW/tutorial/debugging-main-process.md
View file

@ -35,8 +35,8 @@ $ npm install git+https://git@github.com/enlight/node-pre-gyp.git#detect-electro
### 4. 除心編譯 `node-inspector` `v8` 模組給 Electron (變更 target 為你的 Electron 編號) ### 4. 除心編譯 `node-inspector` `v8` 模組給 Electron (變更 target 為你的 Electron 編號)
```bash ```bash
$ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-debug/ --dist-url=https://atom.io/download/atom-shell reinstall $ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-debug/ --dist-url=https://atom.io/download/electron reinstall
$ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-profiler/ --dist-url=https://atom.io/download/atom-shell reinstall $ node_modules/.bin/node-pre-gyp --target=0.36.2 --runtime=electron --fallback-to-build --directory node_modules/v8-profiler/ --dist-url=https://atom.io/download/electron reinstall
``` ```
參閱 [如何安裝原生模組](how-to-install-native-modules). 參閱 [如何安裝原生模組](how-to-install-native-modules).

4
docs-translations/zh-TW/tutorial/using-native-node-modules.md
View file

@ -31,7 +31,7 @@ npm install --save-dev electron-rebuild
你也可以使用 `npm` 安裝模組，步驟與 Node 模組的安裝相同，除了你需要設定一些環境變數： 你也可以使用 `npm` 安裝模組，步驟與 Node 模組的安裝相同，除了你需要設定一些環境變數：
```bash ```bash
export npm_config_disturl=https://atom.io/download/atom-shell export npm_config_disturl=https://atom.io/download/electron
export npm_config_target=0.33.1 export npm_config_target=0.33.1
export npm_config_arch=x64 export npm_config_arch=x64
export npm_config_runtime=electron export npm_config_runtime=electron
@ -44,7 +44,7 @@ HOME=~/.electron-gyp npm install module-name
```bash ```bash
$ cd /path-to-module/ $ cd /path-to-module/
$ HOME=~/.electron-gyp node-gyp rebuild --target=0.29.1 --arch=x64 --dist-url=https://atom.io/download/atom-shell $ HOME=~/.electron-gyp node-gyp rebuild --target=0.29.1 --arch=x64 --dist-url=https://atom.io/download/electron
``` ```
`HOME=~/.electron-gyp` 改變了尋找開發標頭的地方，`--target=0.29.1` 是 Eletron 的版本， `--dist-url=...` 指定了下載標頭到哪， `--arch=x64` 指出模組要建置在 64 位元系統。 `HOME=~/.electron-gyp` 改變了尋找開發標頭的地方，`--target=0.29.1` 是 Eletron 的版本， `--dist-url=...` 指定了下載標頭到哪， `--arch=x64` 指出模組要建置在 64 位元系統。

9
docs/tutorial/planned-breaking-changes.md
View file

@ -85,3 +85,12 @@ webContents.openDevTools({detach: true})
// Replace with // Replace with
webContents.openDevTools({mode: 'detach'}) webContents.openDevTools({mode: 'detach'})
``` ```
## Node Headers URL
This is the URL specified as `disturl` in a `.npmrc` file or as the `--dist-url`
command line flag when building native Node modules.
Deprecated: https://atom.io/download/atom-shell
Replace with: https://atom.io/download/electron

4
docs/tutorial/using-native-node-modules.md
View file

@ -23,7 +23,7 @@ export npm_config_target=1.2.3
export npm_config_arch=x64 export npm_config_arch=x64
export npm_config_target_arch=x64 export npm_config_target_arch=x64
# Download headers for Electron. # Download headers for Electron.
export npm_config_disturl=https://atom.io/download/atom-shell export npm_config_disturl=https://atom.io/download/electron
# Tell node-pre-gyp that we are building for Electron. # Tell node-pre-gyp that we are building for Electron.
export npm_config_runtime=electron export npm_config_runtime=electron
# Tell node-pre-gyp to build module from source code. # Tell node-pre-gyp to build module from source code.
@ -59,7 +59,7 @@ use `node-gyp` directly to build for Electron:
```bash ```bash
cd /path-to-module/ cd /path-to-module/
HOME=~/.electron-gyp node-gyp rebuild --target=1.2.3 --arch=x64 --dist-url=https://atom.io/download/atom-shell HOME=~/.electron-gyp node-gyp rebuild --target=1.2.3 --arch=x64 --dist-url=https://atom.io/download/electron
``` ```
The `HOME=~/.electron-gyp` changes where to find development headers. The The `HOME=~/.electron-gyp` changes where to find development headers. The

2
script/bootstrap.py
View file

@ -186,7 +186,7 @@ def update_electron_modules(dirname, target_arch):
env = os.environ.copy() env = os.environ.copy()
env['npm_config_arch'] = target_arch env['npm_config_arch'] = target_arch
env['npm_config_target'] = get_electron_version() env['npm_config_target'] = get_electron_version()
env['npm_config_disturl'] = 'https://atom.io/download/atom-shell' env['npm_config_disturl'] = 'https://atom.io/download/electron'
update_node_modules(dirname, env) update_node_modules(dirname, env)

2
script/upload-node-checksums.py
View file

@ -9,7 +9,7 @@ from lib.config import s3_config
from lib.util import download, rm_rf, s3put from lib.util import download, rm_rf, s3put
DIST_URL = 'https://atom.io/download/atom-shell/' DIST_URL = 'https://atom.io/download/electron/'
def main(): def main():

2
tools/dump-version-info.js
View file

@ -2,7 +2,7 @@ var app = require('electron').app
var fs = require('fs') var fs = require('fs')
var request = require('request') var request = require('request')
var TARGET_URL = 'https://atom.io/download/atom-shell/index.json' var TARGET_URL = 'https://atom.io/download/electron/index.json'
function getDate () { function getDate () {
var today = new Date() var today = new Date()