Ticket #4893: mozjs52.patch

build/premake/extern_libs4.lua

@@ -591 +591 @@
     },
     spidermonkey = {
         compile_settings = function()
-            if _OPTIONS["with-system-mozjs38"] then
+            if _OPTIONS["with-system-mozjs52"] then
                 if not _OPTIONS["android"] then
-                    pkgconfig_cflags("mozjs-38")
+                    pkgconfig_cflags("mozjs-52")
                 end
             else
                 if os.is("windows") then
@@ -611 +611 @@
             end
         end,
         link_settings = function()
-            if _OPTIONS["with-system-mozjs38"] then
+            if _OPTIONS["with-system-mozjs52"] then
                 if _OPTIONS["android"] then
-                    links { "mozjs-38" }
+                    links { "mozjs-52" }
                 else
                     pkgconfig_libs("nspr")
-                    pkgconfig_libs("mozjs-38")
+                    pkgconfig_libs("mozjs-52")
                 end
             else
                 if os.is("macosx") then
@@ -624 +624 @@
                     links { "nspr4", "plc4", "plds4" }
                 end
                 configuration "Debug"
-                    links { "mozjs38-ps-debug" }
+                    links { "mozjs52-ps-debug" }
                 configuration "Release"
-                    links { "mozjs38-ps-release" }
+                    links { "mozjs52-ps-release" }
                 configuration { }
                 add_source_lib_paths("spidermonkey")
             end

build/workspaces/update-workspaces.sh

@@ -35 +35 @@
 
 without_nvtt=false
 with_system_nvtt=false
-with_system_mozjs38=false
+with_system_mozjs52=false
 enable_atlas=true
 
 for i in "$@"
@@ -43 +43 @@
   case $i in
     --without-nvtt ) without_nvtt=true; premake_args="${premake_args} --without-nvtt" ;;
     --with-system-nvtt ) with_system_nvtt=true; premake_args="${premake_args} --with-system-nvtt" ;;
-    --with-system-mozjs38 ) with_system_mozjs38=true; premake_args="${premake_args} --with-system-mozjs38" ;;
+    --with-system-mozjs52 ) with_system_mozjs52=true; premake_args="${premake_args} --with-system-mozjs52" ;;
     --enable-atlas ) enable_atlas=true ;;
     --disable-atlas ) enable_atlas=false ;;
     -j* ) JOBS=$i ;;
@@ -78 +78 @@
   # Build/update bundled external libraries
   (cd ../../libraries/source/fcollada/src && ${MAKE} ${JOBS}) || die "FCollada build failed"
   echo
-  if [ "$with_system_mozjs38" = "false" ]; then
+  if [ "$with_system_mozjs52" = "false" ]; then
     (cd ../../libraries/source/spidermonkey && MAKE=${MAKE} JOBS=${JOBS} ./build.sh) || die "SpiderMonkey build failed"
   fi
   echo

build/premake/premake4.lua

@@ -7 +7 @@
 newoption { trigger = "jenkins-tests", description = "Configure CxxTest to use the XmlPrinter runner which produces Jenkins-compatible output" }
 newoption { trigger = "minimal-flags", description = "Only set compiler/linker flags that are really needed. Has no effect on Windows builds" }
 newoption { trigger = "outpath", description = "Location for generated project files" }
-newoption { trigger = "with-system-mozjs38", description = "Search standard paths for libmozjs38, instead of using bundled copy" }
+newoption { trigger = "with-system-mozjs52", description = "Search standard paths for libmozjs52, instead of using bundled copy" }
 newoption { trigger = "with-system-nvtt", description = "Search standard paths for nvidia-texture-tools library, instead of using bundled copy" }
 newoption { trigger = "without-audio", description = "Disable use of OpenAL/Ogg/Vorbis APIs" }
 newoption { trigger = "without-lobby", description = "Disable the use of gloox and the multiplayer lobby" }

source/scriptinterface/ScriptTypes.h

@@ -71 +71 @@
 # pragma GCC diagnostic pop
 #endif
 
-#if MOZJS_MAJOR_VERSION != 38
+#if MOZJS_MAJOR_VERSION != 52
 #error Your compiler is trying to use an incorrect major version of the \
 SpiderMonkey library. The only version that works is the one in the \
 libraries/spidermonkey/ directory, and it will not work with a typical \