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

Merge pull request #1275 from lygstate/master

Browse source 
Add runas as devDependencies, or the python script will install it again...
This commit is contained in:
Cheng Zhao 2015-03-23 09:49:10 +08:00
commit adce07785a
3 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
package.json
View file

@ -1,24 +1,21 @@
{ {
"name": "atom-shell", "name": "atom-shell",
"version": "0.22.1", "version": "0.22.1",
"licenses": [ "licenses": [
{ {
"type": "MIT", "type": "MIT",
"url": "http://github.com/atom/atom-shell/raw/master/LICENSE.md" "url": "http://github.com/atom/atom-shell/raw/master/LICENSE.md"
} }
], ],
"devDependencies": { "devDependencies": {
"atom-package-manager": "0.144.0",
"asar": "0.2.2", "asar": "0.2.2",
"atom-package-manager": "0.144.0",
"coffee-script": "~1.7.1", "coffee-script": "~1.7.1",
"coffeelint": "~1.3.0", "coffeelint": "~1.3.0",
"request": "*" "request": "*",
"runas": "^2.0.0"
}, },
"private": true, "private": true,
"scripts": { "scripts": {
"preinstall": "node -e 'process.exit(0)'" "preinstall": "node -e 'process.exit(0)'"
} }

10
script/bootstrap.py
View file

@ -29,8 +29,6 @@ def main():
update_submodules() update_submodules()
update_node_modules('.') update_node_modules('.')
bootstrap_brightray(args.url) bootstrap_brightray(args.url)
if sys.platform in ['win32', 'cygwin']:
install_runas()
create_chrome_version_h() create_chrome_version_h()
touch_config_gypi() touch_config_gypi()
@ -96,14 +94,6 @@ def update_win32_python():
if not os.path.exists('python_26'): if not os.path.exists('python_26'):
execute_stdout(['git', 'clone', PYTHON_26_URL]) execute_stdout(['git', 'clone', PYTHON_26_URL])
def install_runas():
# TODO This is needed by the tools/win/register_msdia80_dll.js, should move
# this to a better place.
with scoped_cwd(os.path.join(SOURCE_ROOT, 'tools', 'win')):
execute_stdout([NPM, 'install', 'runas'])
def create_chrome_version_h(): def create_chrome_version_h():
version_file = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', version_file = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor',
'libchromiumcontent', 'VERSION') 'libchromiumcontent', 'VERSION')

11
tools/win/register_msdia80_dll.js
View file

@ -2,11 +2,16 @@ var fs = require('fs');
var path = require('path'); var path = require('path');
var runas = require('runas'); var runas = require('runas');
/* FIXME: C:\\Program Files\\ should comes from env variable
And for 32 bit msdia80 is should be placed at %ProgramFiles(x86)% */
var source = path.resolve(__dirname, '..', '..', 'vendor', 'breakpad', 'msdia80.dll'); var source = path.resolve(__dirname, '..', '..', 'vendor', 'breakpad', 'msdia80.dll');
var target = 'C:\\Program Files\\Common Files\\Microsoft Shared\\VC\\msdia80.dll'; var target = 'C:\\Program Files\\Common Files\\Microsoft Shared\\VC\\msdia80.dll';
if (fs.existsSync(target)) if (fs.existsSync(target))
return; return;
var copy = 'copy "' + source + '" "' + target + '"'; runas('cmd', ['/K',
var register = 'regsvr32 "' + target + '"'; 'copy', source, target,
runas('cmd', ['/K', copy + ' & ' + register + ' & exit']); '&', 'regsvr32', '/s', target,
'&', 'exit'],
{admin:true}
);