chore: remove unused files to simply out_dir replacements
This commit is contained in:
parent
4b0f335aba
commit
2adb44a402
5 changed files with 5 additions and 71 deletions
|
@ -97,7 +97,7 @@ This is an overview of the steps needed to upgrade Chromium in Electron.
|
|||
- Add more build flags to disable features in build-time.
|
||||
|
||||
When a Debug build of Electron succeeds, run the tests:
|
||||
`$ ./script/test.py`
|
||||
`$ npm run tst`
|
||||
Fix the failing tests.
|
||||
|
||||
Follow all the steps above to fix Electron code on all supported platforms.
|
||||
|
|
|
@ -5,11 +5,11 @@ import os
|
|||
import sys
|
||||
|
||||
from lib.config import PLATFORM, enable_verbose_mode, is_verbose_mode
|
||||
from lib.util import get_electron_branding, execute, rm_rf
|
||||
from lib.util import get_electron_branding, execute, rm_rf, get_out_dir
|
||||
|
||||
ELECTRON_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(ELECTRON_ROOT))
|
||||
RELEASE_PATH = os.path.join('out', 'Default')
|
||||
RELEASE_PATH = get_out_dir()
|
||||
|
||||
def main():
|
||||
args = parse_args()
|
||||
|
|
|
@ -1,66 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
import argparse
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
from lib.config import PLATFORM, enable_verbose_mode, get_target_arch
|
||||
from lib.util import execute_stdout, get_electron_version, safe_mkdir, \
|
||||
update_node_modules, update_electron_modules
|
||||
|
||||
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
|
||||
|
||||
def main():
|
||||
os.chdir(SOURCE_ROOT)
|
||||
|
||||
args = parse_args()
|
||||
config = args.configuration
|
||||
|
||||
if args.verbose:
|
||||
enable_verbose_mode()
|
||||
|
||||
spec_modules = os.path.join(SOURCE_ROOT, 'spec', 'node_modules')
|
||||
out_dir = os.path.join(SOURCE_ROOT, 'out', config)
|
||||
version = get_electron_version()
|
||||
node_dir = os.path.join(out_dir, 'node-{0}'.format(version))
|
||||
|
||||
# Create node headers
|
||||
script_path = os.path.join(SOURCE_ROOT, 'script', 'create-node-headers.py')
|
||||
execute_stdout([sys.executable, script_path, '--version', version,
|
||||
'--directory', out_dir])
|
||||
|
||||
if PLATFORM == 'win32':
|
||||
lib_dir = os.path.join(node_dir, 'Release')
|
||||
safe_mkdir(lib_dir)
|
||||
iojs_lib = os.path.join(lib_dir, 'iojs.lib')
|
||||
atom_lib = os.path.join(out_dir, 'node.dll.lib')
|
||||
shutil.copy2(atom_lib, iojs_lib)
|
||||
node_lib = os.path.join(lib_dir, 'node.lib')
|
||||
shutil.copy2(atom_lib, node_lib)
|
||||
|
||||
# Native modules can only be compiled against release builds on Windows
|
||||
if config[0] == 'R' or PLATFORM != 'win32':
|
||||
update_electron_modules(os.path.dirname(spec_modules), get_target_arch(),
|
||||
node_dir)
|
||||
else:
|
||||
update_node_modules(os.path.dirname(spec_modules))
|
||||
|
||||
|
||||
def parse_args():
|
||||
parser = argparse.ArgumentParser(description='Rebuild native test modules')
|
||||
parser.add_argument('-v', '--verbose',
|
||||
action='store_true',
|
||||
help='Prints the output of the subprocesses')
|
||||
parser.add_argument('-c', '--configuration',
|
||||
help='Build configuration to rebuild modules against',
|
||||
default='D',
|
||||
required=False)
|
||||
return parser.parse_args()
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
|
@ -2,7 +2,7 @@
|
|||
// with the session bus. This requires python-dbusmock to be installed and
|
||||
// running at $DBUS_SESSION_BUS_ADDRESS.
|
||||
//
|
||||
// script/test.py spawns dbusmock, which sets DBUS_SESSION_BUS_ADDRESS.
|
||||
// script/spec-runner.js spawns dbusmock, which sets DBUS_SESSION_BUS_ADDRESS.
|
||||
//
|
||||
// See https://pypi.python.org/pypi/python-dbusmock to read about dbusmock.
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
// For these tests we use a fake DBus daemon to verify powerMonitor module
|
||||
// interaction with the system bus. This requires python-dbusmock installed and
|
||||
// running (with the DBUS_SYSTEM_BUS_ADDRESS environment variable set).
|
||||
// script/test.py will take care of spawning the fake DBus daemon and setting
|
||||
// script/spec-runner.js will take care of spawning the fake DBus daemon and setting
|
||||
// DBUS_SYSTEM_BUS_ADDRESS when python-dbusmock is installed.
|
||||
//
|
||||
// See https://pypi.python.org/pypi/python-dbusmock for more information about
|
||||
|
|
Loading…
Reference in a new issue