diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2019-09-20 00:56:12 +0000 |
|---|---|---|
| committer | Philip Chimento <philip.chimento@gmail.com> | 2019-09-20 00:56:12 +0000 |
| commit | be50074e4d07e118636c1187e8654e08dff52ab4 (patch) | |
| tree | 220f08a6f81466b38f0d96d5c8e95667b12b9542 /test/extra/do_mozilla.sh | |
| parent | cb5139185724e947a5afda9f185a5fc33699d333 (diff) | |
| parent | bfb7de0d381fa774d158e05960e3d57cb72b87f3 (diff) | |
| download | gjs-be50074e4d07e118636c1187e8654e08dff52ab4.tar.gz | |
Merge branch 'smaller-ci-phase1' into 'master'
Smaller CI, phase 1
See merge request GNOME/gjs!339
Diffstat (limited to 'test/extra/do_mozilla.sh')
| -rwxr-xr-x | test/extra/do_mozilla.sh | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/test/extra/do_mozilla.sh b/test/extra/do_mozilla.sh index ef7342f0..f3b768d4 100755 --- a/test/extra/do_mozilla.sh +++ b/test/extra/do_mozilla.sh @@ -1,46 +1,11 @@ #!/bin/bash -e -function do_Configure_MozBuild(){ - echo - echo '-- Set JHBuild Configuration --' - - mkdir -p ~/.config - autogenargs="" - - if [[ -n "${BUILD_OPTS}" ]]; then - autogenargs="$autogenargs $BUILD_OPTS" - fi - - cat <<EOFILE >> ~/.config/jhbuildrc -module_autogenargs['mozjs60'] = "$autogenargs" -module_makeargs['mozjs60'] = '-s' -EOFILE - - echo '-- Done --' -} - -function do_Build_Mozilla_jhbuild(){ - echo - echo '-- Building Mozilla SpiderMonkey --' - - # Configure the Mozilla build - do_Configure_MozBuild - - # Build Mozilla Stuff - jhbuild build mozjs60 -} - function do_Build_Mozilla(){ echo echo '-- Building Mozilla SpiderMonkey --' - if [[ $STATIC == "moz52" ]]; then - git clone --depth 1 https://github.com/ptomato/mozjs.git -b mozjs52 /on-host/spider - cd /on-host/spider - else - git clone --depth 1 https://github.com/ptomato/mozjs.git -b mozjs60 /on-host/spider - cd /on-host/spider - fi + git clone --depth 1 https://github.com/ptomato/mozjs.git -b "${MOZJS_BRANCH:-mozjs60}" /on-host/spider + cd /on-host/spider mkdir -p _build cd _build |