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

Build with jessie sysroot image

Browse source
This commit is contained in:
Cheng Zhao 2017-05-22 16:52:40 +09:00
parent 94be438ab9
commit 28f11516fe
6 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -6,9 +6,10 @@
/external_binaries/ /external_binaries/
/out/ /out/
/vendor/download/ /vendor/download/
/vendor/debian_wheezy_amd64-sysroot/ /vendor/debian_jessie_amd64-sysroot/
/vendor/debian_wheezy_arm-sysroot/ /vendor/debian_jessie_arm-sysroot/
/vendor/debian_wheezy_i386-sysroot/ /vendor/debian_jessie_arm64-sysroot/
/vendor/debian_jessie_i386-sysroot/
/vendor/python_26/ /vendor/python_26/
/vendor/npm/ /vendor/npm/
/vendor/llvm/ /vendor/llvm/

3
script/bootstrap.py
View file

@ -227,7 +227,8 @@ def download_sysroot(target_arch):
target_arch = 'amd64' target_arch = 'amd64'
execute_stdout([sys.executable, execute_stdout([sys.executable,
os.path.join(SOURCE_ROOT, 'script', 'install-sysroot.py'), os.path.join(SOURCE_ROOT, 'script', 'install-sysroot.py'),
'--arch', target_arch]) '--arch', target_arch],
cwd=VENDOR_DIR)
def create_chrome_version_h(): def create_chrome_version_h():
version_file = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'VERSION') version_file = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'VERSION')

2
script/install-sysroot.py
View file

@ -121,7 +121,7 @@ def InstallSysroot(target_platform, target_arch):
revision = sysroot_dict['Revision'] revision = sysroot_dict['Revision']
tarball_filename = sysroot_dict['Tarball'] tarball_filename = sysroot_dict['Tarball']
tarball_sha1sum = sysroot_dict['Sha1Sum'] tarball_sha1sum = sysroot_dict['Sha1Sum']
sysroot = os.path.join(linux_dir, sysroot_dict['SysrootDir']) sysroot = os.path.join(linux_dir, 'vendor', sysroot_dict['SysrootDir'])
url = '%s/%s/%s/%s' % (URL_PREFIX, URL_PATH, revision, tarball_filename) url = '%s/%s/%s/%s' % (URL_PREFIX, URL_PATH, revision, tarball_filename)

4
script/lib/util.py
View file

@ -170,11 +170,11 @@ def execute(argv, env=os.environ):
raise e raise e
def execute_stdout(argv, env=os.environ): def execute_stdout(argv, env=os.environ, cwd=None):
if is_verbose_mode(): if is_verbose_mode():
print ' '.join(argv) print ' '.join(argv)
try: try:
subprocess.check_call(argv, env=env) subprocess.check_call(argv, env=env, cwd=cwd)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print e.output print e.output
raise e raise e

20
script/sysroots.json
View file

@ -1,31 +1,31 @@
{ {
"jessie_amd64": { "jessie_amd64": {
"Revision": "d18016aaa5283f85bd8c722c42e55d2f5f13384e", "Revision": "b6dd965b53da1e379e784d8450811c583547e271",
"Sha1Sum": "82c0c27b1cbb7a7c2e496aeb6d9f6e28373126db", "Sha1Sum": "2b0063007eb89ba915dac19223d772e306406a8d",
"SysrootDir": "debian_jessie_amd64-sysroot", "SysrootDir": "debian_jessie_amd64-sysroot",
"Tarball": "debian_jessie_amd64_sysroot.tgz" "Tarball": "debian_jessie_amd64_sysroot.tgz"
}, },
"jessie_arm": { "jessie_arm": {
"Revision": "d18016aaa5283f85bd8c722c42e55d2f5f13384e", "Revision": "b6dd965b53da1e379e784d8450811c583547e271",
"Sha1Sum": "c41fd22e33afe9a6037ecac8880e40f99a6a2522", "Sha1Sum": "3c3d7830fe1cf97497a8cb66dfa416e5d5e6b4cd",
"SysrootDir": "debian_jessie_arm-sysroot", "SysrootDir": "debian_jessie_arm-sysroot",
"Tarball": "debian_jessie_arm_sysroot.tgz" "Tarball": "debian_jessie_arm_sysroot.tgz"
}, },
"jessie_arm64": { "jessie_arm64": {
"Revision": "d18016aaa5283f85bd8c722c42e55d2f5f13384e", "Revision": "b6dd965b53da1e379e784d8450811c583547e271",
"Sha1Sum": "a8579b53d7e6c14cd6f15bf9f25d3a938755d834", "Sha1Sum": "cc1fb0f0598d8b9bc56459ec980599cafbf2867c",
"SysrootDir": "debian_jessie_arm64-sysroot", "SysrootDir": "debian_jessie_arm64-sysroot",
"Tarball": "debian_jessie_arm64_sysroot.tgz" "Tarball": "debian_jessie_arm64_sysroot.tgz"
}, },
"jessie_i386": { "jessie_i386": {
"Revision": "d18016aaa5283f85bd8c722c42e55d2f5f13384e", "Revision": "b6dd965b53da1e379e784d8450811c583547e271",
"Sha1Sum": "85c86f16036e952e33a70ae74e37775f26c54d48", "Sha1Sum": "74d967eda22f754334afdd132dc3f157d905134e",
"SysrootDir": "debian_jessie_i386-sysroot", "SysrootDir": "debian_jessie_i386-sysroot",
"Tarball": "debian_jessie_i386_sysroot.tgz" "Tarball": "debian_jessie_i386_sysroot.tgz"
}, },
"jessie_mips": { "jessie_mips": {
"Revision": "d18016aaa5283f85bd8c722c42e55d2f5f13384e", "Revision": "b6dd965b53da1e379e784d8450811c583547e271",
"Sha1Sum": "b6d4cdb21fb61c5669eea5135f7c87a19fc16876", "Sha1Sum": "2ab2669d422f5cdfcc0bef51ede260db7f197164",
"SysrootDir": "debian_jessie_mips-sysroot", "SysrootDir": "debian_jessie_mips-sysroot",
"Tarball": "debian_jessie_mips_sysroot.tgz" "Tarball": "debian_jessie_mips_sysroot.tgz"
} }

9
toolchain.gypi
View file

@ -50,13 +50,16 @@
['target_arch=="arm"', { ['target_arch=="arm"', {
# sysroot needs to be an absolute path otherwise it generates # sysroot needs to be an absolute path otherwise it generates
# incorrect results when passed to pkg-config # incorrect results when passed to pkg-config
'sysroot%': '<(source_root)/vendor/debian_wheezy_arm-sysroot', 'sysroot%': '<(source_root)/vendor/debian_jessie_arm-sysroot',
}],
['target_arch=="arm64"', {
'sysroot%': '<(source_root)/vendor/debian_jessie_arm64-sysroot',
}], }],
['target_arch=="ia32"', { ['target_arch=="ia32"', {
'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot', 'sysroot%': '<(source_root)/vendor/debian_jessie_i386-sysroot',
}], }],
['target_arch=="x64"', { ['target_arch=="x64"', {
'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot', 'sysroot%': '<(source_root)/vendor/debian_jessie_amd64-sysroot',
}], }],
], ],
}, },