GNOME.org
 

[gjs: 1/14] build: Build with mozjs60

commit 1e1ef59377765b21cb2f413529a21bbf449a8728
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Jun 18 16:43:22 2018 -0700

    build: Build with mozjs60
    
    This brings in a new requirement of C++14.
    
    See: #161

 .gitlab-ci.yml        | 64 +++++++++++++++++++++++++--------------------------
 NEWS                  |  5 ++++
 configure.ac          |  4 ++--
 doc/Hacking.md        |  6 ++---
 win32/README.txt      |  2 +-
 win32/config-msvc.mak |  2 +-
 6 files changed, 44 insertions(+), 39 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f04b99a..bc23be7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,7 +129,7 @@ stages:
 fedora:
   <<: *build
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:job-68368_SM52-debug-gcc.fedora-dev  # pinned on purpose
+  image: registry.gitlab.gnome.org/gnome/gjs:job-70238_SM60-debug-gcc.fedora-dev  # pinned on purpose
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check"
     TEST: "check"
@@ -140,7 +140,7 @@ fedora:
 sanitizer_gcc:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-ubsan_asan-check"
     BUILD_OPTS: "--enable-asan --enable-ubsan"
@@ -154,7 +154,7 @@ sanitizer_gcc:
 with_logging:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
   variables:
     TASK_ID: "ubuntu-x86_64-clang-default-logging-check"
     CC: clang
@@ -168,7 +168,7 @@ with_logging:
 no_graphics:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-without_gtk-check"
     TEST: "check"
@@ -180,7 +180,7 @@ no_graphics:
 no_profiler:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-disable_profiler-check"
     TEST: "check"
@@ -191,7 +191,7 @@ no_profiler:
 no_readline:
   <<: *build
   stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-disable_readline-check"
     TEST: "check"
@@ -205,7 +205,7 @@ coverage-automatic:
   <<: *build
   <<: *coverage
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
   variables:
     TASK_ID: "coverage"
     BUILD_OPTS: "--enable-code-coverage"
@@ -308,7 +308,7 @@ code_statistics:
 sanitizer_clang:
   <<: *build
   stage: thorough_tests
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
   variables:
     TASK_ID: "ubuntu-x86_64-clang_ubsan_asan-default-default-check"
     CC: clang
@@ -321,7 +321,7 @@ sanitizer_clang:
 fedora_gcc:
   <<: *build
   stage: thorough_tests
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-distcheck"
     TEST: "distcheck"
@@ -332,7 +332,7 @@ fedora_gcc:
 installed_tests:
   <<: *build
   stage: thorough_tests
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-installed_tests"
     BUILD_OPTS: "--enable-installed-tests --prefix=/usr"
@@ -346,7 +346,7 @@ installed_tests:
 ubuntu_gcc:
   <<: *build
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
   variables:
     TASK_ID: "ubuntu-x86_64-gcc-default-default-distcheck"
     TEST: "distcheck"
@@ -357,7 +357,7 @@ ubuntu_gcc:
 ubuntu_clang:
   <<: *build
   stage: source_check
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
   variables:
     TASK_ID: "ubuntu-x86_64-clang-default-default-distcheck"
     CC: clang
@@ -370,7 +370,7 @@ lts:
   <<: *build
   <<: *jhbuild
   stage: thorough_tests
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.ubuntu-lts
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-lts
   variables:
     TASK_ID: "ubuntu_lts-x86_64-gcc-default-default-check"
     DEV: jhbuild
@@ -382,7 +382,7 @@ lts:
 valgrind:
   <<: *build
   stage: thorough_tests
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-valgrind_check"
     BUILD_OPTS: "--enable-valgrind --disable-valgrind-helgrind --prefix=/usr"
@@ -421,7 +421,7 @@ flatpak:
 zeal_2:
   <<: *build
   stage: thorough_tests
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-debug-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-debug-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal2"
     TEST: "check"
@@ -433,7 +433,7 @@ zeal_2:
 zeal_4:
   <<: *build
   stage: thorough_tests
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-debug-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-debug-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal4"
     TEST: "check"
@@ -445,7 +445,7 @@ zeal_4:
 zeal_11:
   <<: *build
   stage: thorough_tests
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-debug-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-debug-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal11"
     TEST: "check"
@@ -463,7 +463,7 @@ armv8:
   variables:
     TASK_ID: "fedora-armv8-gcc-default-default-check"
     DOCKER_DRIVER: overlay
-    IMAGE: "registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev.aarch64"
+    IMAGE: "registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev.aarch64"
   only:
     variables:
       - $CRON_FREQUENCY == "Weekly"
@@ -474,7 +474,7 @@ ppc64le:
   variables:
     TASK_ID: "fedora-ppc64le-gcc-default-default-check"
     DOCKER_DRIVER: overlay
-    IMAGE: "registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev.ppc64le"
+    IMAGE: "registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev.ppc64le"
   only:
     variables:
       - $CRON_FREQUENCY == "Weekly"
@@ -515,7 +515,7 @@ coverage:
   <<: *build
   <<: *coverage
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
   variables:
     TASK_ID: "coverage"
     BUILD_OPTS: "--enable-code-coverage"
@@ -527,7 +527,7 @@ coverage:
 sanitizer_clang:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
   variables:
     TASK_ID: "ubuntu-x86_64-clang_ubsan_asan-default-default-check"
     CC: clang
@@ -540,7 +540,7 @@ sanitizer_clang:
 fedora_gcc:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-distcheck"
     TEST: "distcheck"
@@ -551,7 +551,7 @@ fedora_gcc:
 installed_tests:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-installed_tests"
     BUILD_OPTS: "--enable-installed-tests --prefix=/usr"
@@ -563,7 +563,7 @@ installed_tests:
 ubuntu_gcc:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
   variables:
     TASK_ID: "ubuntu-x86_64-gcc-default-default-distcheck"
     TEST: "distcheck"
@@ -574,7 +574,7 @@ ubuntu_gcc:
 ubuntu_clang:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.ubuntu-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-dev
   variables:
     TASK_ID: "ubuntu-x86_64-clang-default-default-distcheck"
     CC: clang
@@ -587,7 +587,7 @@ lts:
   <<: *build
   <<: *jhbuild
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.ubuntu-lts
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.ubuntu-lts
   variables:
     TASK_ID: "ubuntu_lts-x86_64-gcc-default-default-check"
     DEV: jhbuild
@@ -599,7 +599,7 @@ lts:
 valgrind:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-default-default-valgrind_check"
     BUILD_OPTS: "--enable-valgrind --disable-valgrind-helgrind --prefix=/usr"
@@ -634,7 +634,7 @@ flatpak:
 zeal_2:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-debug-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-debug-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal2"
     TEST: "check"
@@ -646,7 +646,7 @@ zeal_2:
 zeal_4:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-debug-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-debug-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal4"
     TEST: "check"
@@ -658,7 +658,7 @@ zeal_4:
 zeal_11:
   <<: *build
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:SM52-debug-gcc.fedora-dev
+  image: registry.gitlab.gnome.org/gnome/gjs:SM60-debug-gcc.fedora-dev
   variables:
     TASK_ID: "fedora-x86_64-gcc-debug-default-check_zeal11"
     TEST: "check"
@@ -674,7 +674,7 @@ armv8:
   variables:
     TASK_ID: "fedora-armv8-gcc-default-default-check"
     DOCKER_DRIVER: overlay
-    IMAGE: "registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev.aarch64"
+    IMAGE: "registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev.aarch64"
   when: manual
   except:
     - schedules
@@ -685,7 +685,7 @@ ppc64le:
   variables:
     TASK_ID: "fedora-ppc64le-gcc-default-default-check"
     DOCKER_DRIVER: overlay
-    IMAGE: "registry.gitlab.gnome.org/gnome/gjs:SM52-gcc.fedora-dev.ppc64le"
+    IMAGE: "registry.gitlab.gnome.org/gnome/gjs:SM60-gcc.fedora-dev.ppc64le"
   when: manual
   except:
     - schedules
diff --git a/NEWS b/NEWS
index ff138be2..e05751a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+NEXT
+----
+
+- GJS now depends on SpiderMonkey 60 and requires a compiler capable of C++14.
+
 Version 1.53.4
 --------------
 
diff --git a/configure.ac b/configure.ac
index 94528bcb..33a07bc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ PKG_INSTALLDIR
 AC_LANG([C++])
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX_11
+AX_CXX_COMPILE_STDCXX_14
 
 LT_PREREQ([2.2.0])
 # no stupid static libraries
@@ -65,7 +65,7 @@ GOBJECT_INTROSPECTION_REQUIRE([1.41.4])
 
 GOBJECT_REQUIREMENT="gobject-2.0 >= glib_required_version"
 gjs_base_packages="$GOBJECT_REQUIREMENT gio-2.0"
-common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-52"
+common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-60"
 gjs_packages="gobject-introspection-1.0 libffi $common_packages"
 gjs_cairo_packages="cairo cairo-gobject $common_packages"
 gjs_gtk_packages="gtk+-3.0 >= 3.20"
diff --git a/doc/Hacking.md b/doc/Hacking.md
index 29a5b7ab..3bea6f6c 100644
--- a/doc/Hacking.md
+++ b/doc/Hacking.md
@@ -19,10 +19,10 @@ Even if your system includes a development package for mozjs, we
 recommend building it on JHBuild so that you can enable the debugging
 features. Add this to your JHBuild configuration file:
 ```python
-module_autogenargs['mozjs52'] = '--enable-debug'
+module_autogenargs['mozjs60'] = '--enable-debug'
 ```
 
-Make sure it is built first with `jhbuild build mozjs52`, otherwise
+Make sure it is built first with `jhbuild build mozjs60`, otherwise
 `jhbuild build gjs` will skip it if you have the system package
 installed.
 
@@ -46,7 +46,7 @@ mozjs, but you can grab them from your JHBuild copy of mozjs.
 After reaching a breakpoint in your program, type this to activate the
 pretty-printers:
 ```
-source ~/.cache/jhbuild/build/mozjs-52.Y.Z/js/src/shell/js-gdb.py
+source ~/.cache/jhbuild/build/mozjs-60.Y.Z/js/src/shell/js-gdb.py
 ```
 
 (replace `Y.Z` with mozjs's minor and micro version numbers)
diff --git a/win32/README.txt b/win32/README.txt
index 759a1e18..021aaa1a 100644
--- a/win32/README.txt
+++ b/win32/README.txt
@@ -6,7 +6,7 @@ via NMake Makefiles.  Due to C++-11 usage, Visual Studio 2012 or
 earlier is not supported.
 
 You will need the following items to build GJS using Visual Studio:
--SpiderMonkey 52 (mozjs-52)
+-SpiderMonkey 60 (mozjs-60)
 -GObject-Introspection (G-I) 1.41.4 or later
 -GLib 2.50.x or later, (which includes GIO, GObject, and the associated tools)
 -Cairo including Cairo-GObject support, unless NO_CAIRO=1 is specified.
diff --git a/win32/config-msvc.mak b/win32/config-msvc.mak
index 04959430..95e9117b 100644
--- a/win32/config-msvc.mak
+++ b/win32/config-msvc.mak
@@ -1,7 +1,7 @@
 # NMake Makefile portion for enabling features for Windows builds
 
 # Spidermonkey release series (17, 24, 31, 38, 45 etc.)
-MOZJS_VERSION = 52
+MOZJS_VERSION = 60
 
 # Please see https://bugzilla.gnome.org/show_bug.cgi?id=775868,
 # comments 26, 27 and 28
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]