Bug 1655789 - Use build/moz.build for JS standalone builds r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D85178
This commit is contained in:
Steve Fink 2020-08-05 21:27:10 +00:00
Родитель 06d4ceb48a
Коммит 14202a2c79
3 изменённых файлов: 17 добавлений и 8 удалений

Просмотреть файл

@ -1,4 +1,4 @@
#!/usr/bin/env python3 -B
#!/usr/bin/env -S python3 -B
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
@ -91,9 +91,9 @@ version = '{}-{}.{}.{}'.format(mozjs_name,
minor_version,
patch_version or alpha or '0')
target_dir = staging_dir / version
package_name = '{}.tar.bz2'.format(version)
package_name = '{}.tar.xz'.format(version)
package_file = dist_dir / package_name
tar_opts = ['-jcf']
tar_opts = ['-Jcf']
# Given there might be some external program that reads the following output,
# use raw `print`, instead of logging.
@ -120,6 +120,16 @@ rsync_filter_list = """
+ /moz.build
+ /moz.configure
+ /test.mozbuild
+ /.babel-eslint.rc.js
+ .eslintignore
+ .eslintrc.js
+ .flake8
+ .gitignore
+ .hgignore
+ .lldbinit
+ .prettierignore
+ .prettierrc
+ .ycm_extra_conf.py
# Additional libraries (optionally) used by SpiderMonkey
@ -131,6 +141,7 @@ rsync_filter_list = """
- /intl/icu/source/tools
+ /intl/icu/**
+ /memory/replace/dmd/dmd.py
+ /memory/build/**
+ /memory/moz.build
+ /memory/mozalloc/**
@ -144,6 +155,7 @@ rsync_filter_list = """
+ /mozglue/moz.build
+ /mozglue/static/**
+ /tools/rb/fix_stacks.py
+ /tools/fuzzing/moz.build
+ /tools/fuzzing/interface/**
+ /tools/fuzzing/registry/**

Просмотреть файл

@ -149,6 +149,7 @@ if CONFIG['ENABLE_CLANG_PLUGIN']:
DIRS += ['build/clang-plugin']
DIRS += [
'build',
'config',
'python',
'testing/mozbase',
@ -176,10 +177,6 @@ if not CONFIG['JS_STANDALONE'] or not CONFIG['MOZ_BUILD_APP']:
GENERATED_FILES['buildid.h'].script = 'build/variables.py:buildid_header'
GENERATED_FILES['source-repo.h'].script = 'build/variables.py:source_repo_header'
DIRS += [
'build',
]
DIRS += [
'mfbt',
]

Просмотреть файл

@ -17,7 +17,7 @@ PACKAGE_DIR=$WORK/sm-package
mkdir $PACKAGE_DIR
pushd $PACKAGE_DIR
tar -xjvf $UPLOAD_DIR/mozjs-*.tar.bz2
tar -xvf $UPLOAD_DIR/mozjs-*.tar.*z*
: ${PYTHON3:=python3}