зеркало из https://github.com/electron/electron.git
atom_gyp -> electron_gyp
This commit is contained in:
Родитель
6c8cf16508
Коммит
9684f61e12
|
@ -6,7 +6,7 @@ import subprocess
|
|||
import sys
|
||||
|
||||
from lib.config import get_target_arch
|
||||
from lib.util import atom_gyp, import_vs_env
|
||||
from lib.util import electron_gyp, import_vs_env
|
||||
|
||||
|
||||
CONFIGURATIONS = ['Release', 'Debug']
|
||||
|
@ -40,7 +40,7 @@ def parse_args():
|
|||
required=False)
|
||||
parser.add_argument('-t', '--target',
|
||||
help='Build specified target',
|
||||
default=atom_gyp()['project_name%'],
|
||||
default=electron_gyp()['project_name%'],
|
||||
required=False)
|
||||
return parser.parse_args()
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ def main():
|
|||
version = '.'.join(versions[:3])
|
||||
|
||||
with scoped_cwd(SOURCE_ROOT):
|
||||
update_atom_gyp(version)
|
||||
update_electron_gyp(version)
|
||||
update_win_rc(version, versions)
|
||||
update_version_h(versions)
|
||||
update_info_plist(version)
|
||||
|
@ -42,7 +42,7 @@ def increase_version(versions, index):
|
|||
return versions
|
||||
|
||||
|
||||
def update_atom_gyp(version):
|
||||
def update_electron_gyp(version):
|
||||
pattern = re.compile(" *'version%' *: *'[0-9.]+'")
|
||||
with open('electron.gyp', 'r') as f:
|
||||
lines = f.readlines()
|
||||
|
|
|
@ -12,7 +12,7 @@ from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, PLATFORM, \
|
|||
get_target_arch, get_chromedriver_version, \
|
||||
get_platform_key
|
||||
from lib.util import scoped_cwd, rm_rf, get_electron_version, make_zip, \
|
||||
execute, atom_gyp
|
||||
execute, electron_gyp
|
||||
|
||||
|
||||
ELECTRON_VERSION = get_electron_version()
|
||||
|
@ -23,8 +23,8 @@ OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
|
|||
CHROMIUM_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor',
|
||||
'download', 'libchromiumcontent', 'static_library')
|
||||
|
||||
PROJECT_NAME = atom_gyp()['project_name%']
|
||||
PRODUCT_NAME = atom_gyp()['product_name%']
|
||||
PROJECT_NAME = electron_gyp()['project_name%']
|
||||
PRODUCT_NAME = electron_gyp()['product_name%']
|
||||
|
||||
TARGET_BINARIES = {
|
||||
'darwin': [
|
||||
|
|
|
@ -4,7 +4,7 @@ import os
|
|||
import sys
|
||||
|
||||
from lib.config import PLATFORM
|
||||
from lib.util import atom_gyp, execute, rm_rf
|
||||
from lib.util import electron_gyp, execute, rm_rf
|
||||
|
||||
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
|
@ -56,7 +56,7 @@ def register_required_dll():
|
|||
|
||||
|
||||
def get_names_from_gyp():
|
||||
variables = atom_gyp()
|
||||
variables = electron_gyp()
|
||||
return (variables['project_name%'], variables['product_name%'])
|
||||
|
||||
|
||||
|
|
|
@ -179,7 +179,7 @@ def execute_stdout(argv, env=os.environ):
|
|||
execute(argv, env)
|
||||
|
||||
|
||||
def atom_gyp():
|
||||
def electron_gyp():
|
||||
SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
|
||||
gyp = os.path.join(SOURCE_ROOT, 'electron.gyp')
|
||||
with open(gyp) as f:
|
||||
|
@ -188,7 +188,7 @@ def atom_gyp():
|
|||
|
||||
|
||||
def get_electron_version():
|
||||
return 'v' + atom_gyp()['version%']
|
||||
return 'v' + electron_gyp()['version%']
|
||||
|
||||
|
||||
def parse_version(version):
|
||||
|
|
|
@ -4,13 +4,13 @@ import os
|
|||
import subprocess
|
||||
import sys
|
||||
|
||||
from lib.util import atom_gyp
|
||||
from lib.util import electron_gyp
|
||||
|
||||
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
|
||||
PROJECT_NAME = atom_gyp()['project_name%']
|
||||
PRODUCT_NAME = atom_gyp()['product_name%']
|
||||
PROJECT_NAME = electron_gyp()['project_name%']
|
||||
PRODUCT_NAME = electron_gyp()['product_name%']
|
||||
|
||||
|
||||
def main():
|
||||
|
|
|
@ -4,13 +4,13 @@ import os
|
|||
import subprocess
|
||||
import sys
|
||||
|
||||
from lib.util import atom_gyp, rm_rf
|
||||
from lib.util import electron_gyp, rm_rf
|
||||
|
||||
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
|
||||
PROJECT_NAME = atom_gyp()['project_name%']
|
||||
PRODUCT_NAME = atom_gyp()['product_name%']
|
||||
PROJECT_NAME = electron_gyp()['project_name%']
|
||||
PRODUCT_NAME = electron_gyp()['product_name%']
|
||||
|
||||
|
||||
def main():
|
||||
|
|
|
@ -4,14 +4,14 @@ import os
|
|||
import sys
|
||||
|
||||
from lib.config import PLATFORM, s3_config
|
||||
from lib.util import atom_gyp, execute, s3put, scoped_cwd
|
||||
from lib.util import electron_gyp, execute, s3put, scoped_cwd
|
||||
|
||||
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'D')
|
||||
|
||||
PROJECT_NAME = atom_gyp()['project_name%']
|
||||
PRODUCT_NAME = atom_gyp()['product_name%']
|
||||
PROJECT_NAME = electron_gyp()['project_name%']
|
||||
PRODUCT_NAME = electron_gyp()['product_name%']
|
||||
|
||||
|
||||
def main():
|
||||
|
|
|
@ -5,15 +5,15 @@ import glob
|
|||
import sys
|
||||
|
||||
from lib.config import s3_config
|
||||
from lib.util import atom_gyp, execute, rm_rf, safe_mkdir, s3put
|
||||
from lib.util import electron_gyp, execute, rm_rf, safe_mkdir, s3put
|
||||
|
||||
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
SYMBOLS_DIR = 'dist\\symbols'
|
||||
DOWNLOAD_DIR = 'vendor\\brightray\\vendor\\download\\libchromiumcontent'
|
||||
|
||||
PROJECT_NAME = atom_gyp()['project_name%']
|
||||
PRODUCT_NAME = atom_gyp()['product_name%']
|
||||
PROJECT_NAME = electron_gyp()['project_name%']
|
||||
PRODUCT_NAME = electron_gyp()['product_name%']
|
||||
|
||||
PDB_LIST = [
|
||||
'out\\R\\{0}.exe.pdb'.format(PROJECT_NAME),
|
||||
|
|
|
@ -9,7 +9,7 @@ import tempfile
|
|||
|
||||
from lib.config import PLATFORM, get_target_arch, get_chromedriver_version, \
|
||||
get_platform_key, get_env_var
|
||||
from lib.util import atom_gyp, execute, get_electron_version, parse_version, \
|
||||
from lib.util import electron_gyp, execute, get_electron_version, parse_version, \
|
||||
scoped_cwd
|
||||
from lib.github import GitHub
|
||||
|
||||
|
@ -17,8 +17,8 @@ from lib.github import GitHub
|
|||
ELECTRON_REPO = 'electron/electron'
|
||||
ELECTRON_VERSION = get_electron_version()
|
||||
|
||||
PROJECT_NAME = atom_gyp()['project_name%']
|
||||
PRODUCT_NAME = atom_gyp()['product_name%']
|
||||
PROJECT_NAME = electron_gyp()['project_name%']
|
||||
PRODUCT_NAME = electron_gyp()['product_name%']
|
||||
|
||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||
OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
|
||||
|
@ -80,7 +80,7 @@ def main():
|
|||
# Do not upload other files when passed "-p".
|
||||
return
|
||||
|
||||
# Upload atom-shell with GitHub Releases API.
|
||||
# Upload Electron with GitHub Releases API.
|
||||
upload_electron(github, release, os.path.join(DIST_DIR, DIST_NAME))
|
||||
upload_electron(github, release, os.path.join(DIST_DIR, SYMBOLS_NAME))
|
||||
if PLATFORM == 'darwin':
|
||||
|
|
Загрузка…
Ссылка в новой задаче