Merge more work by Jim Blandy on bug 97954.

2024-09-13 09:24:08 -07:00 · 2008-09-05 15:05:26 -05:00 · 2008-09-05 15:05:26 -05:00 · edf679ff71
commit edf679ff71
parent 004fdca443 90d588b595
38 changed files with 57 additions and 54 deletions
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@ -69,11 +69,7 @@ LIBXUL_SDK      = @LIBXUL_SDK@

 L10NBASEDIR     = @L10NBASEDIR@

-ifdef LIBXUL_SDK
-LIBXUL_DIST = $(LIBXUL_SDK)
-else
-LIBXUL_DIST = $(DIST)
-endif
+LIBXUL_DIST	= @LIBXUL_DIST@

 XULRUNNER_STUB_NAME = @XULRUNNER_STUB_NAME@

--- a/configure.in
+++ b/configure.in
@ -4031,6 +4031,13 @@ elif test -n "$LIBXUL_SDK_DIR" -a "$LIBXUL_SDK_DIR" != "no"; then
 fi
 AC_SUBST(LIBXUL_SDK)

+if test -n "$LIBXUL_SDK"; then
+    LIBXUL_DIST="$LIBXUL_SDK"
+else
+    LIBXUL_DIST="$MOZ_BUILD_ROOT/dist"
+fi
+AC_SUBST(LIBXUL_DIST)
+
 dnl ========================================================
 dnl = If NSPR was not detected in the system, 
 dnl = use the one in the source tree (mozilla/nsprpub)
@ -4054,22 +4061,22 @@ if test -n "$MOZ_NATIVE_NSPR"; then
                AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT]))
    CFLAGS=$_SAVE_CFLAGS
 else
-    NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --includedir=$(LIBXUL_DIST)/include/nspr --cflags`'
+    NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`'
    # explicitly set libs for Visual Age C++ for OS/2
    if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then
-        NSPR_LIBS='$(LIBXUL_DIST)/lib/nspr'$NSPR_VERSION'.lib $(LIBXUL_DIST)/lib/plc'$NSPR_VERSION'.lib $(LIBXUL_DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS''
+        NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib ${_PTHREAD_LDFLAGS}"
    elif test "$OS_ARCH" = "WINCE"; then
-        NSPR_CFLAGS='-I$(LIBXUL_DIST)/include/nspr'
-        NSPR_LIBS='$(LIBXUL_DIST)/lib/nspr'$NSPR_VERSION'.lib $(LIBXUL_DIST)/lib/plc'$NSPR_VERSION'.lib $(LIBXUL_DIST)/lib/plds'$NSPR_VERSION'.lib '
+        NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr"
+        NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib "
    elif test "$OS_ARCH" = "WINNT"; then
-        NSPR_CFLAGS='-I$(LIBXUL_DIST)/include/nspr'
+        NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr"
        if test -n "$GNU_CC"; then
-            NSPR_LIBS="-L\$(LIBXUL_DIST)/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION"
+            NSPR_LIBS="-L${LIBXUL_DIST}/lib -lnspr${NSPR_VERSION} -lplc${NSPR_VERSION} -lplds${NSPR_VERSION}"
        else
-            NSPR_LIBS='$(LIBXUL_DIST)/lib/nspr'$NSPR_VERSION'.lib $(LIBXUL_DIST)/lib/plc'$NSPR_VERSION'.lib $(LIBXUL_DIST)/lib/plds'$NSPR_VERSION'.lib '
+            NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib "
        fi
    else
-        NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(LIBXUL_DIST) --libdir=$(LIBXUL_DIST)/lib --libs`'
+        NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
    fi
 fi

@ -8356,12 +8363,12 @@ if test -z "$MOZ_NATIVE_NSPR"; then
    # Hack to deal with the fact that we use NSPR_CFLAGS everywhere
    AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
    if test ! "$VACPP" && test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE"; then
-       _libs=`./nsprpub/config/nspr-config --prefix=$\(LIBXUL_DIST\) --exec-prefix=$\(DIST\) --libdir=$\(LIBXUL_DIST\)/lib --libs`
-       $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $_libs'" config/autoconf.mk
+       NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
+       $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk
    fi
    if test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE" ; then
-       _cflags=`./nsprpub/config/nspr-config --prefix=$\(LIBXUL_DIST\) --exec-prefix=$\(DIST\) --includedir=$\(LIBXUL_DIST\)/include/nspr --cflags`
-       $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $_cflags'" config/autoconf.mk
+       NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags`
+       $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $NSPR_CFLAGS'" config/autoconf.mk
    fi
    rm -f config/autoconf.mk.bak
 fi
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@ -162,7 +162,6 @@ EXPORTS		= \
 		jsclist.h \
 		jscntxt.h \
 		jscompat.h \
-		jsconfig.h \
 		jsdate.h \
 		jsdbgapi.h \
 		jsdhash.h \
@ -195,6 +194,7 @@ EXPORTS		= \
 		jstracer.h \
 		jstypes.h \
 		jsutil.h \
+		jsversion.h \
 		jsxdrapi.h \
 		jsxml.h \
 		$(NULL)
@ -518,7 +518,7 @@ endif
 endif

 # Extra dependancies and rules for auto-generated headers
-host_jskwgen.$(OBJ_SUFFIX): jsconfig.h jskeyword.tbl
+host_jskwgen.$(OBJ_SUFFIX): jsversion.h jskeyword.tbl

 jsautokw.h: host_jskwgen$(HOST_BIN_SUFFIX)
 	./host_jskwgen$(HOST_BIN_SUFFIX) $@
--- a/js/src/Makefile.ref
+++ b/js/src/Makefile.ref
@ -175,7 +175,6 @@ JS_HFILES =		\
 	jsarray.h	\
 	jsatom.h	\
 	jsbool.h	\
-	jsconfig.h	\
 	jscntxt.h	\
 	jsdate.h	\
 	jsemit.h	\
@ -205,6 +204,7 @@ JS_HFILES =		\
 	jsscope.h	\
 	jsscript.h	\
 	jsstr.h		\
+	jsversion.h	\
 	jsxdrapi.h	\
 	jsxml.h		\
 	$(NULL)
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@ -57,7 +57,7 @@
 #include "jsatom.h"
 #include "jsbool.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdate.h"
 #include "jsdtoa.h"
 #include "jsemit.h"
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@ -86,7 +86,7 @@
 #include "jsbit.h"
 #include "jsbool.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdbgapi.h" /* for js_TraceWatchPoints */
 #include "jsdtoa.h"
 #include "jsfun.h"
--- a/js/src/jsatom.cpp
+++ b/js/src/jsatom.cpp
@ -50,7 +50,7 @@
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsgc.h"
 #include "jslock.h"
 #include "jsnum.h"
--- a/js/src/jsatom.h
+++ b/js/src/jsatom.h
@ -43,7 +43,7 @@
 * JS atom table.
 */
 #include <stddef.h>
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jstypes.h"
 #include "jshash.h" /* Added by JSIFY */
 #include "jsdhash.h"
--- a/js/src/jsbool.cpp
+++ b/js/src/jsbool.cpp
@ -47,7 +47,7 @@
 #include "jsatom.h"
 #include "jsbool.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsinterp.h"
 #include "jslock.h"
 #include "jsnum.h"
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@ -52,7 +52,7 @@
 #include "jsprf.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdbgapi.h"
 #include "jsexn.h"
 #include "jsfun.h"
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@ -47,7 +47,7 @@
 #include "jsclist.h"
 #include "jslong.h"
 #include "jsatom.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdhash.h"
 #include "jsgc.h"
 #include "jsinterp.h"
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@ -62,7 +62,7 @@
 #include "prmjtime.h"
 #include "jsutil.h" /* Added by JSIFY */
 #include "jsapi.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jscntxt.h"
 #include "jsdate.h"
 #include "jsinterp.h"
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@ -48,7 +48,7 @@
 #include "jsclist.h"
 #include "jsapi.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdbgapi.h"
 #include "jsemit.h"
 #include "jsfun.h"
--- a/js/src/jsdbgapi.h
+++ b/js/src/jsdbgapi.h
@ -102,7 +102,7 @@ JS_ClearAllWatchPoints(JSContext *cx);
 #ifdef JS_HAS_OBJ_WATCHPOINT
 /*
 * Hide these non-API function prototypes by testing whether the internal
- * header file "jsconfig.h" has been included.
+ * header file "jsversion.h" has been included.
 */
 extern void
 js_TraceWatchPoints(JSTracer *trc, JSObject *obj);
--- a/js/src/jsemit.cpp
+++ b/js/src/jsemit.cpp
@ -55,7 +55,7 @@
 #include "jsatom.h"
 #include "jsbool.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsemit.h"
 #include "jsfun.h"
 #include "jsnum.h"
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@ -51,7 +51,7 @@
 #include "jsprf.h"
 #include "jsapi.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdbgapi.h"
 #include "jsexn.h"
 #include "jsfun.h"
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@ -50,7 +50,7 @@
 #include "jsarray.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdbgapi.h"
 #include "jsfun.h"
 #include "jsgc.h"
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@ -61,7 +61,7 @@
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdbgapi.h"
 #include "jsexn.h"
 #include "jsfun.h"
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@ -54,7 +54,7 @@
 #include "jsatom.h"
 #include "jsbool.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdbgapi.h"
 #include "jsfun.h"
 #include "jsgc.h"
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@ -51,7 +51,7 @@
 #include "jsatom.h"
 #include "jsbool.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsexn.h"
 #include "jsfun.h"
 #include "jsgc.h"
--- a/js/src/jskwgen.cpp
+++ b/js/src/jskwgen.cpp
@ -46,7 +46,7 @@
 #include <stdarg.h>
 #include <ctype.h>

-#include "jsconfig.h"
+#include "jsversion.h"

 const char * const keyword_list[] = {
 #define JS_KEYWORD(keyword, type, op, version) #keyword,
--- a/js/src/jslibmath.h
+++ b/js/src/jslibmath.h
@ -42,7 +42,7 @@
 #define _LIBMATH_H

 #include <math.h>
-#include "jsconfig.h"
+#include "jsversion.h"

 /*
 * Use system provided math routines.
--- a/js/src/jsmath.cpp
+++ b/js/src/jsmath.cpp
@ -49,7 +49,7 @@
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jslock.h"
 #include "jsmath.h"
 #include "jsnum.h"
--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@ -55,7 +55,7 @@
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdtoa.h"
 #include "jsgc.h"
 #include "jsinterp.h"
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@ -56,7 +56,7 @@
 #include "jsatom.h"
 #include "jsbool.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsemit.h"
 #include "jsfun.h"
 #include "jsgc.h"
@ -775,7 +775,7 @@ obj_toSource(JSContext *cx, uintN argc, jsval *vp)

        /*
         * We simplify the source code at the price of minor dead code bloat in
-         * the ECMA version (for testing only, see jsconfig.h).  The null
+         * the ECMA version (for testing only, see jsversion.h).  The null
         * default values in gsop[j] suffice to disable non-ECMA getter and
         * setter code.
         */
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@ -58,7 +58,7 @@
 #include "jsarray.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdbgapi.h"
 #include "jsemit.h"
 #include "jsfun.h"
--- a/js/src/jsparse.cpp
+++ b/js/src/jsparse.cpp
@ -62,7 +62,7 @@
 #include "jsarray.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsemit.h"
 #include "jsfun.h"
 #include "jsinterp.h"
--- a/js/src/jsparse.h
+++ b/js/src/jsparse.h
@ -43,7 +43,7 @@
 /*
 * JS parser definitions.
 */
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsprvtd.h"
 #include "jspubtd.h"
 #include "jsscan.h"
--- a/js/src/jsproto.tbl
+++ b/js/src/jsproto.tbl
@ -36,7 +36,7 @@
 *
 * ***** END LICENSE BLOCK ***** */

-#include "jsconfig.h"
+#include "jsversion.h"

 #if JS_HAS_SCRIPT_OBJECT
 # define SCRIPT_INIT                    js_InitScriptClass
--- a/js/src/jspubtd.h
+++ b/js/src/jspubtd.h
@ -57,7 +57,7 @@ typedef jsword    jsid;
 typedef int32     jsrefcount;   /* PRInt32 if JS_THREADSAFE, see jslock.h */

 /*
- * Run-time version enumeration.  See jsconfig.h for compile-time counterparts
+ * Run-time version enumeration.  See jsversion.h for compile-time counterparts
 * to these values that may be selected by the JS_VERSION macro, and tested by
 * #if expressions.
 */
--- a/js/src/jsregexp.cpp
+++ b/js/src/jsregexp.cpp
@ -52,7 +52,7 @@
 #include "jsarray.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsfun.h"
 #include "jsgc.h"
 #include "jsinterp.h"
--- a/js/src/jsscan.cpp
+++ b/js/src/jsscan.cpp
@ -60,7 +60,7 @@
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsemit.h"
 #include "jsexn.h"
 #include "jsnum.h"
--- a/js/src/jsscan.h
+++ b/js/src/jsscan.h
@ -44,7 +44,7 @@
 */
 #include <stddef.h>
 #include <stdio.h>
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsopcode.h"
 #include "jsprvtd.h"
 #include "jspubtd.h"
--- a/js/src/jsscript.cpp
+++ b/js/src/jsscript.cpp
@ -49,7 +49,7 @@
 #include "jsapi.h"
 #include "jsatom.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsdbgapi.h"
 #include "jsemit.h"
 #include "jsfun.h"
--- a/js/src/jsstr.cpp
+++ b/js/src/jsstr.cpp
@ -60,7 +60,7 @@
 #include "jsatom.h"
 #include "jsbool.h"
 #include "jscntxt.h"
-#include "jsconfig.h"
+#include "jsversion.h"
 #include "jsgc.h"
 #include "jsinterp.h"
 #include "jslock.h"
--- a/js/src/jsversion.h
+++ b/js/src/jsversion.h
--- a/js/src/jsxdrapi.cpp
+++ b/js/src/jsxdrapi.cpp
@ -37,7 +37,7 @@
 *
 * ***** END LICENSE BLOCK ***** */
 #include "jsstddef.h"
-#include "jsconfig.h"
+#include "jsversion.h"

 #if JS_HAS_XDR

--- a/js/src/jsxml.cpp
+++ b/js/src/jsxml.cpp
@ -38,7 +38,7 @@
 * ***** END LICENSE BLOCK ***** */

 #include "jsstddef.h"
-#include "jsconfig.h"
+#include "jsversion.h"

 #if JS_HAS_XML_SUPPORT