Attachment 496913 Details for Bug 618381

[patch] updated patch

jsapi.patch (text/plain), 3.75 KB, created by Colin Walters

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Size: 3.75 KB

patch

obsolete

># HG changeset patch
># User Colin Walters <walters@verbum.org>
># Date 1292017781 18000
># Node ID 7aa3144a5c570536b9117a705e1035cb696d2b43
># Parent  4e065aaef09e4de524743a8304dddc2a730713ac
>Improvements to standalone SpiderMonkey builds
>
>* Define a PACKAGE_VERSION number decoupled from Firefox
>* Move mozilla-js.pc into js/src where it belongs.
>* Fix the .pc file to use the new version number
>
>diff -r 4e065aaef09e -r 7aa3144a5c57 configure.in
>--- a/configure.in	Fri Dec 10 13:52:26 2010 -0500
>+++ b/configure.in	Fri Dec 10 16:49:41 2010 -0500
>@@ -8188,12 +8188,6 @@
>   ENABLE_SHARED_JS=1
> fi
> 
>-MOZ_ARG_ENABLE_BOOL(shared-js,
>-[  --enable-shared-js
>-                          Create a shared JavaScript library.],
>-    ENABLE_SHARED_JS=1,
>-    ENABLE_SHARED_JS=)
>-
> if test -z "$MOZ_ENABLE_LIBXUL"; then
>   dnl --disable-libxul implies shared js
>   ENABLE_SHARED_JS=1
>diff -r 4e065aaef09e -r 7aa3144a5c57 js/src/Makefile.in
>--- a/js/src/Makefile.in	Fri Dec 10 13:52:26 2010 -0500
>+++ b/js/src/Makefile.in	Fri Dec 10 16:49:41 2010 -0500
>@@ -834,6 +834,22 @@
> 	$(SYSINSTALL) $(IMPORT_LIBRARY) $(DESTDIR)$(libdir)
> endif
> 
>+ifdef JS_SHARED_LIBRARY
>+%.pc: $(srcdir)/%.pc.in
>+	cat $< | sed \
>+	-e "s|%prefix%|$(prefix)|" \
>+	-e "s|%libdir%|$(libdir)|" \
>+	-e "s|%includedir%|$(includedir)|" \
>+	-e "s|%PACKAGE_VERSION%|@PACKAGE_VERSION@|" \
>+	-e "s|%JSAPI_VERSION_SERIAL%|@JSAPI_VERSION_SERIAL@|" \
>+	> $@
>+	chmod 644 $@
>+
>+install:: mozilla-js.pc
>+	@echo pkg_config_file: mozilla-js.pc
>+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig
>+endif
>+
> # Extra dependancies and rules for auto-generated headers
> host_jskwgen.$(OBJ_SUFFIX): jsversion.h jskeyword.tbl
> 
>diff -r 4e065aaef09e -r 7aa3144a5c57 js/src/configure.in
>--- a/js/src/configure.in	Fri Dec 10 13:52:26 2010 -0500
>+++ b/js/src/configure.in	Fri Dec 10 16:49:41 2010 -0500
>@@ -64,6 +64,11 @@
> 
> AC_PREREQ(2.13)
> AC_INIT(jsapi.h)
>+dnl Arbitrarily decided version number; we wanted it to be bigger
>+dnl than a historical 1.8.0 release, and not obviously similar
>+dnl to Firefox/xulrunner
>+PACKAGE_VERSION=7.0.0
>+AC_SUBST(PACKAGE_VERSION)
> AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
> AC_CONFIG_HEADER(js-config.h)
> AC_CANONICAL_SYSTEM
>@@ -162,6 +167,23 @@
> fi
> MOZ_BUILD_ROOT=`pwd`
> 
>+dnl Determine the API version.
>+dnl ==============================================================
>+if ! test -f "${_topsrcdir}/jsapi.h"; then
>+  echo "error: Couldn't find ${_topsrcdir}/jsapi.h"
>+  exit 1
>+fi
>+JSAPI_VERSION_SERIAL=`grep 'define.*JSAPI_VERSION_SERIAL' ${_topsrcdir}/jsapi.h`
>+if test -z "${JSAPI_VERSION_SERIAL}"; then
>+  echo "error: Couldn't extract JSAPI_VERSION_SERIAL from jsapi.h"
>+  exit 1
>+fi
>+changequote(,)
>+JSAPI_VERSION_SERIAL=`echo "${JSAPI_VERSION_SERIAL}" | sed -e 's|^[^0-9]*||'`
>+changequote([,])
>+echo "Using JSAPI_VERSION_SERIAL ${JSAPI_VERSION_SERIAL}"
>+AC_SUBST(JSAPI_VERSION_SERIAL)
>+
> dnl Choose where to put the 'dist' directory.
> dnl ==============================================================
> 
>diff -r 4e065aaef09e -r 7aa3144a5c57 js/src/jsapi.h
>--- a/js/src/jsapi.h	Fri Dec 10 13:52:26 2010 -0500
>+++ b/js/src/jsapi.h	Fri Dec 10 16:49:41 2010 -0500
>@@ -54,7 +54,7 @@
> /**
>  * This define will be increased each time the JSAPI changes incompatibly.
>  */
>-#define JS_VERSION_SERIAL 0
>+#define JSAPI_VERSION_SERIAL 0
> 
> /*
>  * In release builds, jsval and jsid are defined to be integral types. This
>diff -r 4e065aaef09e -r 7aa3144a5c57 js/src/mozilla-js.pc.in
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/js/src/mozilla-js.pc.in	Fri Dec 10 16:49:41 2010 -0500
>@@ -0,0 +1,10 @@
>+prefix=%prefix%
>+libdir=%libdir%
>+includedir=%includedir%
>+
>+Name: SpiderMonkey
>+Description: The Mozilla JavaScript Library
>+Version: %PACKAGE_VERSION%
>+Requires: nspr >= 4.8.6
>+Libs: -L${libdir} -lmozjs
>+Cflags: -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE

Actions: View | Diff | Review

Attachments on bug 618381: 496864 | 496913 | 496974 | 496995