wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset af011e92ad0b. (Dave Herman – bug 583281, r=jimb: njs should get symlinked into objdir). This doesn't build on windows.

Browse Source
This commit is contained in:
Robert Sayre 2010-07-31 11:16:38 -07:00
parent 1cd082cba6
commit 90cb325bbf
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/shell/njs → js/src/njs
View File

@ -1,22 +1,19 @@
#!/usr/bin/python
#
# Narcissus 'shell' for use with jstests.py
# Expects to be in the same directory as ./js
# Expects the Narcissus src files to be in ./narcissus/*
# This must be run from the js/tests directory
import os, re, sys
from subprocess import *
from optparse import OptionParser
THIS_DIR = os.path.dirname(__file__)
NARC_JS_DIR = os.path.abspath(os.path.join(THIS_DIR, 'narcissus'))
js_cmd="../js"
NARC_JS_DIR = "../../narcissus/"
narc_jsdefs = NARC_JS_DIR + "jsdefs.js"
narc_jslex = NARC_JS_DIR + "jslex.js"
narc_jsparse = NARC_JS_DIR + "jsparse.js"
narc_jsexec = NARC_JS_DIR + "jsexec.js"
js_cmd = os.path.abspath(os.path.join(THIS_DIR, "js"))
narc_jsdefs = os.path.join(NARC_JS_DIR, "jsdefs.js")
narc_jslex = os.path.join(NARC_JS_DIR, "jslex.js")
narc_jsparse = os.path.join(NARC_JS_DIR, "jsparse.js")
narc_jsexec = os.path.join(NARC_JS_DIR, "jsexec.js")
if __name__ == '__main__':

6
js/src/shell/Makefile.in
View File

@ -41,7 +41,6 @@ DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
narcissusdir = $(topsrcdir)/../narcissus
include $(DEPTH)/config/autoconf.mk
@ -50,7 +49,6 @@ CPPSRCS = \
js.cpp \
jsworkers.cpp \
$(NULL)
NJS = njs
DEFINES += -DEXPORT_JS_API
@ -79,9 +77,5 @@ LDFLAGS += -F/System/Library/PrivateFrameworks -framework CHUD
endif
# People expect the js shell to wind up in the top-level JS dir.
# The njs script expects to be in the same directory as the js shell as well as
# narcissus/js*.js.
libs::
$(INSTALL) $(IFLAGS2) $(PROGRAM) $(DEPTH)
$(INSTALL) $(IFLAGS2) $(narcissusdir) $(DEPTH)
$(INSTALL) $(IFLAGS2) $(srcdir)/$(NJS) $(DEPTH)

8
js/src/tests/narcissus.README
View File

@ -1,12 +1,12 @@
To run narcissus with jstests.py, change to the js/src/tests/ directory and run
the following command:
To run narcissus with jstests.py, make sure that js/src/njs is executable.
Then change to the js/src/tests/ directory and run the following command:
python jstests.py -d -j 4 $OBJDIR/njs -m narcissus.list
python jstests.py -d -j 4 ../njs -m narcissus.list
The js/src/tests/narcissus directory can be used for any tweaks that might be needed
to make Narcissus work properly. Currently, Narcissus is failing a number of
tests. narcissus-failures.txt can be used to ignore those tests.
python jstests.py -d -j 4 $OBJDIR/njs -m narcissus.list -x narcissus-failures.txt
python jstests.py -d -j 4 ../njs -m narcissus.list -x narcissus-failures.txt