Contain arch in distribution name.
This commit is contained in:
parent
d82ceda770
commit
232b8721fe
3 changed files with 35 additions and 23 deletions
|
@ -8,7 +8,8 @@ import subprocess
|
||||||
import sys
|
import sys
|
||||||
import tarfile
|
import tarfile
|
||||||
|
|
||||||
from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, NODE_VERSION
|
from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, NODE_VERSION, \
|
||||||
|
TARGET_PLATFORM, DIST_ARCH
|
||||||
from lib.util import scoped_cwd, rm_rf, get_atom_shell_version, make_zip, \
|
from lib.util import scoped_cwd, rm_rf, get_atom_shell_version, make_zip, \
|
||||||
safe_mkdir, execute
|
safe_mkdir, execute
|
||||||
|
|
||||||
|
@ -22,13 +23,6 @@ NODE_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'node')
|
||||||
DIST_HEADERS_NAME = 'node-{0}'.format(NODE_VERSION)
|
DIST_HEADERS_NAME = 'node-{0}'.format(NODE_VERSION)
|
||||||
DIST_HEADERS_DIR = os.path.join(DIST_DIR, DIST_HEADERS_NAME)
|
DIST_HEADERS_DIR = os.path.join(DIST_DIR, DIST_HEADERS_NAME)
|
||||||
|
|
||||||
TARGET_PLATFORM = {
|
|
||||||
'cygwin': 'win32',
|
|
||||||
'darwin': 'darwin',
|
|
||||||
'linux2': 'linux',
|
|
||||||
'win32': 'win32',
|
|
||||||
}[sys.platform]
|
|
||||||
|
|
||||||
SYMBOL_NAME = {
|
SYMBOL_NAME = {
|
||||||
'darwin': 'libchromiumcontent.dylib.dSYM',
|
'darwin': 'libchromiumcontent.dylib.dSYM',
|
||||||
'linux': 'libchromiumcontent.so.dbg',
|
'linux': 'libchromiumcontent.so.dbg',
|
||||||
|
@ -218,8 +212,8 @@ def create_symbols():
|
||||||
|
|
||||||
|
|
||||||
def create_dist_zip():
|
def create_dist_zip():
|
||||||
dist_name = 'atom-shell-{0}-{1}.zip'.format(ATOM_SHELL_VERSION,
|
dist_name = 'atom-shell-{0}-{1}-{2}.zip'.format(ATOM_SHELL_VERSION,
|
||||||
TARGET_PLATFORM)
|
TARGET_PLATFORM, DIST_ARCH)
|
||||||
zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
|
zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
|
||||||
|
|
||||||
with scoped_cwd(DIST_DIR):
|
with scoped_cwd(DIST_DIR):
|
||||||
|
@ -231,8 +225,9 @@ def create_dist_zip():
|
||||||
|
|
||||||
|
|
||||||
def create_symbols_zip():
|
def create_symbols_zip():
|
||||||
dist_name = 'atom-shell-{0}-{1}-symbols.zip'.format(ATOM_SHELL_VERSION,
|
dist_name = 'atom-shell-{0}-{1}-{2}-symbols.zip'.format(ATOM_SHELL_VERSION,
|
||||||
TARGET_PLATFORM)
|
TARGET_PLATFORM,
|
||||||
|
DIST_ARCH)
|
||||||
zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
|
zip_file = os.path.join(SOURCE_ROOT, 'dist', dist_name)
|
||||||
|
|
||||||
with scoped_cwd(DIST_DIR):
|
with scoped_cwd(DIST_DIR):
|
||||||
|
|
|
@ -1,5 +1,26 @@
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
|
import platform
|
||||||
|
import sys
|
||||||
|
|
||||||
NODE_VERSION = 'v0.11.10'
|
NODE_VERSION = 'v0.11.10'
|
||||||
BASE_URL = 'https://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent'
|
BASE_URL = 'https://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent'
|
||||||
LIBCHROMIUMCONTENT_COMMIT = '765ec5dcf192845fed4aec0b117f1e53050911d6'
|
LIBCHROMIUMCONTENT_COMMIT = '765ec5dcf192845fed4aec0b117f1e53050911d6'
|
||||||
|
|
||||||
|
ARCH = {
|
||||||
|
'cygwin': '32bit',
|
||||||
|
'darwin': '64bit',
|
||||||
|
'linux2': platform.architecture()[0],
|
||||||
|
'win32': '32bit',
|
||||||
|
}[sys.platform]
|
||||||
|
DIST_ARCH = {
|
||||||
|
'32bit': 'ia32',
|
||||||
|
'64bit': 'x64',
|
||||||
|
}[ARCH]
|
||||||
|
|
||||||
|
TARGET_PLATFORM = {
|
||||||
|
'cygwin': 'win32',
|
||||||
|
'darwin': 'darwin',
|
||||||
|
'linux2': 'linux',
|
||||||
|
'win32': 'win32',
|
||||||
|
}[sys.platform]
|
||||||
|
|
|
@ -8,27 +8,23 @@ import subprocess
|
||||||
import sys
|
import sys
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
from lib.config import NODE_VERSION
|
from lib.config import DIST_ARCH, NODE_VERSION, TARGET_PLATFORM
|
||||||
from lib.util import get_atom_shell_version, scoped_cwd, safe_mkdir, execute
|
from lib.util import get_atom_shell_version, scoped_cwd, safe_mkdir, execute
|
||||||
from lib.github import GitHub
|
from lib.github import GitHub
|
||||||
|
|
||||||
|
|
||||||
TARGET_PLATFORM = {
|
|
||||||
'cygwin': 'win32',
|
|
||||||
'darwin': 'darwin',
|
|
||||||
'linux2': 'linux',
|
|
||||||
'win32': 'win32',
|
|
||||||
}[sys.platform]
|
|
||||||
|
|
||||||
ATOM_SHELL_REPO = 'atom/atom-shell'
|
ATOM_SHELL_REPO = 'atom/atom-shell'
|
||||||
ATOM_SHELL_VERSION = get_atom_shell_version()
|
ATOM_SHELL_VERSION = get_atom_shell_version()
|
||||||
|
|
||||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||||
OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'Release')
|
OUT_DIR = os.path.join(SOURCE_ROOT, 'out', 'Release')
|
||||||
DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
|
DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
|
||||||
DIST_NAME = 'atom-shell-{0}-{1}.zip'.format(ATOM_SHELL_VERSION, TARGET_PLATFORM)
|
DIST_NAME = 'atom-shell-{0}-{1}-{2}.zip'.format(ATOM_SHELL_VERSION,
|
||||||
SYMBOLS_NAME = 'atom-shell-{0}-{1}-symbols.zip'.format(ATOM_SHELL_VERSION,
|
TARGET_PLATFORM,
|
||||||
TARGET_PLATFORM)
|
DIST_ARCH)
|
||||||
|
SYMBOLS_NAME = 'atom-shell-{0}-{1}-{2}-symbols.zip'.format(ATOM_SHELL_VERSION,
|
||||||
|
TARGET_PLATFORM,
|
||||||
|
DIST_ARCH)
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue