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

chore: stop using electron.gyp for branding and version (#14559)

Browse source 
* chore: stop using electron.gyp for version info

* chore: remove branding info from electron.gyp

* Use get_electron_branding instead of gn read

* Flip project_name/product_name
This commit is contained in:
Jeremy Apthorp 2018-09-27 13:53:08 -05:00 • committed by John Kleinschmidt
parent 6be69048e6
commit 77fb9cf416
12 changed files with 60 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

19
script/lib/util.py
View file

@ -4,6 +4,8 @@ import atexit
import contextlib
import datetime
import errno
import json
import os
import platform
import re
import shutil
@ -14,7 +16,6 @@ import sys
import tarfile
import tempfile
import urllib2
import os
import zipfile
from lib.config import is_verbose_mode, PLATFORM
@ -171,17 +172,17 @@ def execute_stdout(argv, env=None, cwd=None):
else:
execute(argv, env, cwd)
def electron_gyp():
# FIXME(alexeykuzmin): Use data from //BUILD.gn.
# electron.gyp is not used during the build.
def get_electron_branding():
SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
gyp = os.path.join(SOURCE_ROOT, 'electron.gyp')
with open(gyp) as f:
obj = eval(f.read());
return obj['variables']
branding_file_path = os.path.join(SOURCE_ROOT, 'atom', 'app', 'BRANDING.json')
with open(branding_file_path) as f:
return json.load(f)
def get_electron_version():
return 'v' + electron_gyp()['version%']
SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
version_file = os.path.join(SOURCE_ROOT, 'VERSION')
with open(version_file) as f:
return 'v' + f.read().strip()
def boto_path_dirs():
return [