Changeset 9850 for ps

Timestamp:

07/17/11 00:31:10 (13 years ago)

Author:

philip

Message:

Import SpiderMonkey 1.8.5

Location:

ps/trunk/libraries/spidermonkey

Files:

• . (added)
• README.txt (copied) (copied from ps/trunk/libraries/spidermonkey-tip/README.txt ) (2 diffs)
• build.sh (copied) (copied from ps/trunk/libraries/spidermonkey-tip/build.sh ) (5 diffs)
• js185-1.0.0.tar.gz (added)

ps/trunk/libraries/spidermonkey/README.txt

@@ -5 +5 @@
 then run start-msvc8.bat and run ./build.sh here.
 
-This version of SpiderMonkey comes from http://hg.mozilla.org/tracemonkey/
-revision a4ed852d402a
-plus the patch https://bug610228.bugzilla.mozilla.org/attachment.cgi?id=489277
-plus the patch https://bug613089.bugzilla.mozilla.org/attachment.cgi?id=491381
-plus the patch https://bug617596.bugzilla.mozilla.org/attachment.cgi?id=496149
-plus the patch https://bug609024.bugzilla.mozilla.org/attachment.cgi?id=491526
-plus a trivial patch to build with python2.7
+This version of SpiderMonkey comes from
+http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
+(see also https://developer.mozilla.org/en/SpiderMonkey/1.8.5)
 
 The game must be compiled with precisely this version, and must not use a
@@ -17 +13 @@
 guarantee API stability and may have behavioural changes that cause subtle
 bugs or network out-of-sync errors.
-
-To save space, the src/ directory only contains files from Mozilla's js/src/
-plus the following subdirectories:
-    assembler
-    build
-    config
-    editline
-    jsapi-tests
-    lirasm
-    methodjit
-    nanojit
-    perf
-    ref-config
-    shell
-    tracejit
-    v8-dtoa
-    vprof
-    yarr
-
-Also, the output of autoconf-2.13 is included in src/

ps/trunk/libraries/spidermonkey/build.sh

@@ -33 +33 @@
 fi
 
+#CONF_OPTS="${CONF_OPTS} --enable-threadsafe --with-system-nspr"
+#CONF_OPTS="${CONF_OPTS} --enable-trace-jscalls"
+
 # We need to be able to override CHOST in case it is 32bit userland on 64bit kernel
 CONF_OPTS="${CONF_OPTS} \
@@ -41 +44 @@
 echo "SpiderMonkey build options: ${CONF_OPTS}"
 
-cd src
+# Extract the tarball
+tar xzf js185-1.0.0.tar.gz
 
-# autoconf-2.13   # this generates ./configure, which we've added to SVN instead
+cd js-1.8.5/js/src
 
 # We want separate debug/release versions of the library, so we have to change
@@ -49 +53 @@
 # (We use perl instead of sed so that it works with MozillaBuild on Windows,
 # which has an ancient sed.)
-perl -i.bak -pe 's/^(LIBRARY_NAME\s+= mozjs).*/$1-ps-debug/' Makefile.in
+perl -i.bak -pe 's/^(LIBRARY_NAME\s+= mozjs185)(-ps-debug|-ps-release)?/$1-ps-debug/' Makefile.in
 mkdir -p build-debug
 cd build-debug
@@ -56 +60 @@
 cd ..
 
-perl -i.bak -pe 's/^(LIBRARY_NAME\s+= mozjs).*/$1-ps-release/' Makefile.in
+perl -i.bak -pe 's/^(LIBRARY_NAME\s+= mozjs185)(-ps-debug|-ps-release)?/$1-ps-release/' Makefile.in
 mkdir -p build-release
 cd build-release
@@ -64 +68 @@
 
 # Remove the library suffixes to avoid spurious SVN diffs
-perl -i.bak -pe 's/^(LIBRARY_NAME\s+= mozjs).*/$1/' Makefile.in
+perl -i.bak -pe 's/^(LIBRARY_NAME\s+= mozjs185)(-ps-debug|-ps-release)?/$1/' Makefile.in
 
-cd ..
+cd ../../..
 
 if [ "${OS}" = "Windows_NT" ]
 then
   INCLUDE_DIR=include-win32
-  DLL_EXTN=dll
-  LIB_EXTN=lib
+  DLL_SRC_SUFFIX=-1.0.dll
+  DLL_DST_SUFFIX=-1.0.dll
   LIB_PREFIX=
+  LIB_SRC_SUFFIX=-1.0.lib
+  LIB_DST_SUFFIX=.lib
 elif [ "`uname -s`" = "Darwin" ]
 then
   INCLUDE_DIR=include-unix
-  DLL_EXTN=dylib
-  LIB_EXTN=dylib
+  DLL_SRC_SUFFIX=.dylib
+  DLL_DST_SUFFIX=.1.0.dylib
   LIB_PREFIX=lib
+  LIB_SRC_SUFFIX=.dylib
+  LIB_DST_SUFFIX=.dylib
 else
   INCLUDE_DIR=include-unix
-  DLL_EXTN=so
-  LIB_EXTN=so
+  DLL_SRC_SUFFIX=.so
+  DLL_DST_SUFFIX=.so.1.0
   LIB_PREFIX=lib
+  LIB_SRC_SUFFIX=.so
+  LIB_DST_SUFFIX=.so
 fi
 
 # Copy files into the necessary locations for building and running the game
-mkdir -p ${INCLUDE_DIR}/debug/js
-mkdir -p ${INCLUDE_DIR}/release/js
+
+# js-config.h is the same for both debug and release builds, so we only need to copy one
+mkdir -p ${INCLUDE_DIR}/js
+cp -L js-1.8.5/js/src/build-release/dist/include/* ${INCLUDE_DIR}/js/
+
 mkdir -p lib/
-cp -L src/build-debug/dist/include/* ${INCLUDE_DIR}/debug/js/
-cp -L src/build-release/dist/include/* ${INCLUDE_DIR}/release/js/
-cp -L src/build-debug/dist/lib/${LIB_PREFIX}mozjs-ps-debug.${LIB_EXTN} lib/
-cp -L src/build-release/dist/lib/${LIB_PREFIX}mozjs-ps-release.${LIB_EXTN} lib/
-cp -L src/build-debug/dist/bin/${LIB_PREFIX}mozjs-ps-debug.${DLL_EXTN} ../../binaries/system/
-cp -L src/build-release/dist/bin/${LIB_PREFIX}mozjs-ps-release.${DLL_EXTN} ../../binaries/system/
+cp -L js-1.8.5/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs185-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs185-ps-debug${LIB_DST_SUFFIX}
+cp -L js-1.8.5/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs185-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs185-ps-release${LIB_DST_SUFFIX}
+cp -L js-1.8.5/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs185-ps-debug${DLL_SRC_SUFFIX} ../../binaries/system/${LIB_PREFIX}mozjs185-ps-debug${DLL_DST_SUFFIX}
+cp -L js-1.8.5/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs185-ps-release${DLL_SRC_SUFFIX} ../../binaries/system/${LIB_PREFIX}mozjs185-ps-release${DLL_DST_SUFFIX}
 
 # Flag that it's already been built successfully so we can skip it next time