Skip to content

Switch from SpiderMonkey 1.7 to Duktape #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Switch from SpiderMonkey 1.7 to Duktape #208

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb77680
Switch from SpiderMonkey 1.7 to Duktape
NattyNarwhal Oct 31, 2024
16933ad
Fix typo in Makefile target duktape.o
manugarg Mar 12, 2025
90885ba
Fix duktape.o rule for Windows Makefile
manugarg Mar 12, 2025
0f36247
Update Makefile.win32 - fix pymod rules
manugarg Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 11 additions & 19 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ LIB_VER = 1
SO_SUFFIX = so
LIBRARY = $(LIBRARY_NAME).$(SO_SUFFIX).$(LIB_VER)
MKSHLIB = $(CC) -shared
LIB_OPTS = -Wl,-soname=$(LIBRARY) -Wl,-exclude-libs=libjs.a
LIB_OPTS = -Wl,-soname=$(LIBRARY) -Wl,-exclude-libs=duktape.o
SHFLAGS = -fPIC
SMCFLAGS = -DHAVE_VA_COPY -DVA_COPY=va_copy

Expand Down Expand Up @@ -78,9 +78,6 @@ ifndef PYTHON
PYTHON = python
endif

# Spidermonkey library.
MAINT_CFLAGS += -Ispidermonkey/js/src

LIBRARY_LINK = $(LIBRARY_NAME).$(SO_SUFFIX)
PREFIX := $(DESTDIR)$(PREFIX)
LIB_PREFIX = $(PREFIX)/lib
Expand All @@ -92,23 +89,19 @@ MAN_PREFIX = $(PREFIX)/share/man
.PHONY: clean pymod install-pymod
all: testpactester

jsapi_buildstamp: spidermonkey/js/src
cd spidermonkey && SMCFLAGS="$(SHFLAGS) $(SMCFLAGS)" $(MAKE) jsapi
touch jsapi_buildstamp

spidermonkey/libjs.a: spidermonkey/js/src
cd spidermonkey && SMCFLAGS="$(SHFLAGS) $(SMCFLAGS)" $(MAKE) jslib
duktape.o: duktape.c duktape.h duk_config.h
$(CC) $(MAINT_CFLAGS) $(CFLAGS) $(SHFLAGS) -c duktape.c -o dutape.o
touch pymod/duktape_o_buildstamp

pacparser.o: pacparser.c pac_utils.h pacparser.h jsapi_buildstamp
pacparser.o: pacparser.c pac_utils.h pacparser.h
$(CC) $(MAINT_CFLAGS) $(CFLAGS) $(SHFLAGS) -c pacparser.c -o pacparser.o
touch pymod/pacparser_o_buildstamp

$(LIBRARY): pacparser.o spidermonkey/libjs.a
$(MKSHLIB) $(MAINT_CFLAGS) $(CFLAGS) $(LDFLAGS) $(LIB_OPTS) -o $(LIBRARY) pacparser.o spidermonkey/libjs.a -lm
$(LIBRARY): pacparser.o duktape.o
$(MKSHLIB) $(MAINT_CFLAGS) $(CFLAGS) $(LDFLAGS) $(LIB_OPTS) -o $(LIBRARY) pacparser.o duktape.o -lm

libpacparser.a: pacparser.o spidermonkey/libjs.a
cp spidermonkey/libjs.a libpacparser.a
ar rcs libpacparser.a pacparser.o
libpacparser.a: pacparser.o duktape.o
ar rcs libpacparser.a pacparser.o duktape.o

$(LIBRARY_LINK): $(LIBRARY)
ln -sf $(LIBRARY) $(LIBRARY_LINK)
Expand Down Expand Up @@ -149,11 +142,11 @@ dist: all
zip -r $${bindir}.zip $${bindir}/.

# Targets to build python module
pymod: pacparser.o pacparser.h spidermonkey/libjs.a
pymod: pacparser.o pacparser.h duktape.o
cd pymod && ARCHFLAGS="" $(PYTHON) setup.py build
$(PYTHON) ../tests/runtests.py

pymod-dist: pacparser.o pacparser.h spidermonkey/libjs.a
pymod-dist: pacparser.o pacparser.h duktape.o
cd pymod && ARCHFLAGS="" $(PYTHON) setup.py build
cd pymod && ARCHFLAGS="" $(PYTHON) setup.py dist
$(PYTHON) ../tests/runtests.py
Expand All @@ -165,4 +158,3 @@ clean:
rm -f $(LIBRARY_LINK) $(LIBRARY) pacparser.o pactester pymod/pacparser_o_buildstamp jsapi_buildstamp
rm -rf dist
cd pymod && $(PYTHON) setup.py clean --all
cd spidermonkey && $(MAKE) clean
17 changes: 8 additions & 9 deletions src/Makefile.win32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,32 +39,32 @@ endif
VERSION ?= $(shell git describe --always --tags --candidate=100)

LIB_VER=1
CFLAGS=-g -DXP_WIN -DWINVER=0x0501 -DVERSION=$(VERSION) -Ispidermonkey/js/src -Wall
CFLAGS=-g -DXP_WIN -DWINVER=0x0501 -DVERSION=$(VERSION) -Wall
CC=gcc
PYTHON ?= python

.PHONY: clean pymod install-pymod

all: pacparser.dll pactester

pacparser.o: pacparser.c pac_utils.h js.lib
pacparser.o: pacparser.c pac_utils.h
$(CC) $(CFLAGS) -c pacparser.c -o pacparser.o

js.lib:
$(MAKE) -C spidermonkey -f Makefile.win32
duktape.o: duktape.c duk_config.h duktape.h
$(CC) $(CFLAGS) -c pacparser.c -o pacparser.o

pacparser.dll: pacparser.o spidermonkey/js.lib
pacparser.dll: pacparser.o duktape.o
$(CC) -shared -o pacparser.dll \
-Wl,--output-def,pacparser.def \
-Wl,--out-implib,libpacparser.a \
-Wl,--export-all-symbols \
pacparser.o -ljs -Lspidermonkey -lws2_32
pacparser.o duktape.o -lws2_32

pacparser.lib: pacparser.dll pacparser.def
lib /machine:i386 /def:pacparser.def

pactester: pactester.c pacparser.h pacparser.o
$(CC) pactester.c pacparser.o -o pactester -ljs -Lspidermonkey -lws2_32
$(CC) pactester.c pacparser.o duktape.o -o pactester -lws2_32

dist: pacparser.dll pactester pacparser.def
if exist dist rmdir /s /q dist
Expand Down Expand Up @@ -98,7 +98,6 @@ pymod-dist-%:
cd pymod && py -$* setup.py dist

clean:
$(RM) pacparser.dll *.lib pacparser.def pacparser.exp pacparser.o pactester.exe libpacparser.a
$(MAKE) -C spidermonkey -f Makefile.win32 clean
$(RM) pacparser.dll *.lib pacparser.def pacparser.exp pacparser.o duktape.o pactester.exe libpacparser.a
cd pymod && $(PYTHON) setup.py clean --all
$(RM) dist
Loading
Loading