1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
|
Description: use Debian/unstable version of libmozjs and libminizip
Upstream downloads libmozjs v4 from a private URL at build time.
.
We adapt the source to the packaged libmozjs185-dev.
This part of the work has been forwarded upstream
but changes have been necessary since.
.
JSOPTION_ANONFUNFIX has been removed in mozjs, see
https://bugzilla.mozilla.org/show_bug.cgi?id=665835
.
The main API difference is that older JSScript memory allocation
is hidden inside the associated JSObject.
.
The libmozjs-dev package, from mozilla sources, does not offer an alternative
as it drops C/ObjectiveC support in favor of pure C++ constructs.
.
Anyway, pkg-config simplifies a bit the dependencies.
.
The minizip part has not been forwarded.
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: Michael Werle <micha@michaelwerle.com>
--- a/src/Core/Scripting/OOJSScript.m
+++ b/src/Core/Scripting/OOJSScript.m
@@ -62,11 +62,11 @@
static void AddStackToArrayReversed(NSMutableArray *array, RunningStack *stack);
-static JSScript *LoadScriptWithName(JSContext *context, NSString *path, JSObject *object, JSObject **outScriptObject, NSString **outErrorMessage);
+static JSObject *LoadScriptWithName(JSContext *context, NSString *path, JSObject *object, NSString **outErrorMessage);
#if OO_CACHE_JS_SCRIPTS
-static NSData *CompiledScriptData(JSContext *context, JSScript *script);
-static JSScript *ScriptWithCompiledData(JSContext *context, NSData *data);
+static NSData *CompiledScriptData(JSContext *context, JSObject *script);
+static JSObject *ScriptWithCompiledData(JSContext *context, NSData *data);
#endif
static NSString *StrippedName(NSString *string);
@@ -119,8 +119,7 @@
{
JSContext *context = NULL;
NSString *problem = nil; // Acts as error flag.
- JSScript *script = NULL;
- JSObject *scriptObject = NULL;
+ JSObject *script = NULL;
jsval returnValue = JSVAL_VOID;
NSEnumerator *keyEnum = nil;
NSString *key = nil;
@@ -150,7 +149,7 @@
problem = @"could not add JavaScript root object";
}
- if (!problem && !OOJSAddGCObjectRoot(context, &scriptObject, "Script GC holder"))
+ if (!problem && !OOJSAddGCObjectRoot(context, &script, "Script GC holder"))
{
problem = @"could not add JavaScript root object";
}
@@ -176,7 +175,7 @@
if (!problem)
{
OOLog(@"script.javaScript.willLoad", @"About to load JavaScript %@", path);
- script = LoadScriptWithName(context, path, _jsSelf, &scriptObject, &problem);
+ script = LoadScriptWithName(context, path, _jsSelf, &problem);
}
OOLogIndentIf(@"script.javaScript.willLoad");
@@ -233,10 +232,9 @@
OOJSStopTimeLimiter();
// We don't need the script any more - the event handlers hang around as long as the JS object exists.
- JS_DestroyScript(context, script);
}
- JS_RemoveObjectRoot(context, &scriptObject);
+ JS_RemoveObjectRoot(context, &script);
sRunningStack = stackElement.back;
@@ -695,16 +693,16 @@
}
-static JSScript *LoadScriptWithName(JSContext *context, NSString *path, JSObject *object, JSObject **outScriptObject, NSString **outErrorMessage)
+static JSObject *LoadScriptWithName(JSContext *context, NSString *path, JSObject *object, NSString **outErrorMessage)
{
#if OO_CACHE_JS_SCRIPTS
OOCacheManager *cache = nil;
#endif
NSString *fileContents = nil;
NSData *data = nil;
- JSScript *script = NULL;
+ JSObject *script = NULL;
- NSCParameterAssert(outScriptObject != NULL && outErrorMessage != NULL);
+ NSCParameterAssert(outErrorMessage != NULL);
*outErrorMessage = nil;
#if OO_CACHE_JS_SCRIPTS
@@ -745,8 +743,7 @@
else
{
script = JS_CompileUCScript(context, object, [data bytes], [data length] / sizeof(unichar), [path UTF8String], 1);
- if (script != NULL) *outScriptObject = JS_NewScriptObject(context, script);
- else *outErrorMessage = @"compilation failed";
+ if (script == NULL) *outErrorMessage = @"compilation failed";
}
#if OO_CACHE_JS_SCRIPTS
@@ -764,7 +761,7 @@
#if OO_CACHE_JS_SCRIPTS
-static NSData *CompiledScriptData(JSContext *context, JSScript *script)
+static NSData *CompiledScriptData(JSContext *context, JSObject *script)
{
JSXDRState *xdr = NULL;
NSData *result = nil;
@@ -774,7 +771,7 @@
xdr = JS_XDRNewMem(context, JSXDR_ENCODE);
if (xdr != NULL)
{
- if (JS_XDRScript(xdr, &script))
+ if (JS_XDRScriptObject(xdr, &script))
{
bytes = JS_XDRMemGetData(xdr, &length);
if (bytes != NULL)
@@ -789,10 +786,10 @@
}
-static JSScript *ScriptWithCompiledData(JSContext *context, NSData *data)
+static JSObject *ScriptWithCompiledData(JSContext *context, NSData *data)
{
JSXDRState *xdr = NULL;
- JSScript *result = NULL;
+ JSObject *result = NULL;
if (data == nil) return NULL;
@@ -803,7 +800,7 @@
if (EXPECT_NOT(length > UINT32_MAX)) return NULL;
JS_XDRMemSetData(xdr, (void *)[data bytes], (uint32_t)length);
- if (!JS_XDRScript(xdr, &result)) result = NULL;
+ if (!JS_XDRScriptObject(xdr, &result)) result = NULL;
JS_XDRMemSetData(xdr, NULL, 0); // Don't let it be freed by XDRDestroy
JS_XDRDestroy(xdr);
--- a/src/Core/Scripting/OOJavaScriptEngine.m
+++ b/src/Core/Scripting/OOJavaScriptEngine.m
@@ -84,7 +84,7 @@
#else
#define JIT_OPTIONS JSOPTION_JIT | JSOPTION_METHODJIT | JSOPTION_PROFILING
#endif
-#define OOJSENGINE_CONTEXT_OPTIONS JSOPTION_VAROBJFIX | JSOPTION_RELIMIT | JSOPTION_ANONFUNFIX | JIT_OPTIONS
+#define OOJSENGINE_CONTEXT_OPTIONS JSOPTION_VAROBJFIX | JSOPTION_RELIMIT | JIT_OPTIONS
#define OOJS_STACK_SIZE 8192
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -2,8 +2,8 @@
include config.make
vpath %.m src/SDL:src/Core:src/Core/Entities:src/Core/Materials:src/Core/Scripting:src/Core/OXPVerifier:src/Core/Debug
-vpath %.h src/SDL:src/Core:src/Core/Entities:src/Core/Materials:src/Core/Scripting:src/Core/OXPVerifier:src/Core/Debug:src/Core/MiniZip
-vpath %.c src/SDL:src/Core:src/BSDCompat:src/Core/Debug:src/Core/MiniZip
+vpath %.h src/SDL:src/Core:src/Core/Entities:src/Core/Materials:src/Core/Scripting:src/Core/OXPVerifier:src/Core/Debug
+vpath %.c src/SDL:src/Core:src/BSDCompat:src/Core/Debug
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_USER_ROOT)
ifeq ($(GNUSTEP_HOST_OS),mingw32)
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).win
@@ -23,7 +23,7 @@
else
JS_IMPORT_LIBRARY = js32ECMAv5
endif
- ADDITIONAL_INCLUDE_DIRS = -I$(WIN_DEPS_DIR)/include -I$(JS_INC_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables -Isrc/Core/MiniZip
+ ADDITIONAL_INCLUDE_DIRS = -I$(WIN_DEPS_DIR)/include -I$(JS_INC_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables
ADDITIONAL_OBJC_LIBS = -lglu32 -lopengl32 -lopenal32.dll -lpng14.dll -lmingw32 -lSDLmain -lSDL -lvorbisfile.dll -lvorbis.dll -lz -lgnustep-base -l$(JS_IMPORT_LIBRARY) -lwinmm -mwindows
ADDITIONAL_CFLAGS = -DWIN32 -DNEED_STRLCPY `sdl-config --cflags` -mtune=generic
# note the vpath stuff above isn't working for me, so adding src/SDL and src/Core explicitly
@@ -40,27 +40,18 @@
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME).spk
endif
else
- ifeq ($(debug),yes)
- LIBJS_ROOT = deps/mozilla/js/src/build-debug
- else
- LIBJS_ROOT = deps/mozilla/js/src/build-release
- endif
- LIBJS_INC_DIR = $(LIBJS_ROOT)/dist/include
- LIBJS_LIB_DIR = $(LIBJS_ROOT)/dist/lib
- LIBJS = js_static
-
- ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_INC_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables -Isrc/Core/MiniZip
- ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lX11 -lSDL -lgnustep-base -l$(LIBJS) `nspr-config --libs` -lstdc++ -lopenal -lz -lvorbisfile
- ADDITIONAL_CFLAGS = -Wall -DLINUX -DNEED_STRLCPY `sdl-config --cflags` `nspr-config --cflags`
- ADDITIONAL_OBJCFLAGS = -Wall -std=gnu99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import `sdl-config --cflags` `nspr-config --cflags`
- oolite_LIB_DIRS += -L$(LIBJS_LIB_DIR) -L/usr/X11R6/lib/
+ ADDITIONAL_INCLUDE_DIRS = -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug -Isrc/Core/Tables
+ ADDITIONAL_OBJC_LIBS = -lgnustep-base -lstdc++
+ ADDITIONAL_CFLAGS = -Wall -DLINUX -DNEED_STRLCPY
+ ADDITIONAL_OBJCFLAGS = -Wall -std=gnu99 -DLOADSAVEGUI -DLINUX -DXP_UNIX -Wno-import
+ oolite_LIB_DIRS += -L/usr/X11R6/lib/
ifeq ($(use_deps),yes)
oolite_LIB_DIRS += -Ldeps/Linux-deps/$(HOST_ARCH)/lib_linker
ADDITIONAL_OBJC_LIBS += -lpng14
ADDITIONAL_INCLUDE_DIRS += -Ideps/Linux-deps/include
else
- ADDITIONAL_OBJC_LIBS += -lpng
+ PKG_CONFIG_LIBRARIES += libpng
endif
ifeq ($(ESPEAK),yes)
ADDITIONAL_OBJC_LIBS += -lespeak
@@ -70,6 +61,12 @@
ifeq ($(OO_JAVASCRIPT_TRACE),yes)
ADDITIONAL_OBJCFLAGS += -DMOZ_TRACE_JSCALLS=1
endif
+ PKG_CONFIG_LIBRARIES += glu gl x11 sdl mozjs185 nspr openal vorbisfile minizip
+ PKG_CONFIG_CFLAGS := `pkg-config --cflags $(PKG_CONFIG_LIBRARIES)`
+ PKG_CONFIG_LDLIBS := `pkg-config --libs $(PKG_CONFIG_LIBRARIES)`
+ ADDITIONAL_OBJC_LIBS += $(PKG_CONFIG_LDLIBS)
+ ADDITIONAL_CFLAGS += $(PKG_CONFIG_CFLAGS)
+ ADDITIONAL_OBJCFLAGS += $(PKG_CONFIG_CFLAGS)
endif
ifeq ($(profile),yes)
@@ -153,10 +150,7 @@
legacy_random.c \
strlcpy.c \
OOTCPStreamDecoder.c \
- OOPlanetData.c \
- ioapi.c \
- unzip.c
-
+ OOPlanetData.c
OOLITE_DEBUG_FILES = \
OODebugMonitor.m \
|
