debian/midori
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Allow building without JSCore and do so for mingw

Browse source
This commit is contained in:
Christian Dywan 2009-06-06 18:51:57 +02:00
parent 39434709b7
commit 0f5e13e706
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/main.c
View file

@ -1307,6 +1307,7 @@ midori_load_session (gpointer data)
return FALSE; return FALSE;
} }
#if HAVE_JSCORE
static gint static gint
midori_run_script (const gchar* filename) midori_run_script (const gchar* filename)
{ {
@ -1344,6 +1345,7 @@ midori_run_script (const gchar* filename)
g_print ("%s - Exception: %s\n", filename, exception); g_print ("%s - Exception: %s\n", filename, exception);
return 1; return 1;
} }
#endif
#if WEBKIT_CHECK_VERSION (1, 1, 6) #if WEBKIT_CHECK_VERSION (1, 1, 6)
static void static void
@ -1391,8 +1393,10 @@ main (int argc,
N_("Run ADDRESS as a web application"), N_("ADDRESS") }, N_("Run ADDRESS as a web application"), N_("ADDRESS") },
{ "config", 'c', 0, G_OPTION_ARG_FILENAME, &config, { "config", 'c', 0, G_OPTION_ARG_FILENAME, &config,
N_("Use FOLDER as configuration folder"), N_("FOLDER") }, N_("Use FOLDER as configuration folder"), N_("FOLDER") },
#if HAVE_JSCORE
{ "run", 'r', 0, G_OPTION_ARG_NONE, &run, { "run", 'r', 0, G_OPTION_ARG_NONE, &run,
N_("Run the specified filename as javascript"), NULL }, N_("Run the specified filename as javascript"), NULL },
#endif
#if WEBKIT_CHECK_VERSION (1, 1, 6) #if WEBKIT_CHECK_VERSION (1, 1, 6)
{ "snapshot", 's', 0, G_OPTION_ARG_STRING, &snapshot, { "snapshot", 's', 0, G_OPTION_ARG_STRING, &snapshot,
N_("Take a snapshot of the specified URI"), NULL }, N_("Take a snapshot of the specified URI"), NULL },
@ -1529,9 +1533,11 @@ main (int argc,
return 0; return 0;
} }
#if HAVE_JSCORE
/* Standalone javascript support */ /* Standalone javascript support */
if (run) if (run)
return midori_run_script (uris ? *uris : NULL); return midori_run_script (uris ? *uris : NULL);
#endif
#if HAVE_HILDON #if HAVE_HILDON
osso_context = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL); osso_context = osso_initialize (PACKAGE_NAME, PACKAGE_VERSION, FALSE, NULL);

8
midori/sokoke.c
View file

@ -36,6 +36,7 @@
#include <idna.h> #include <idna.h>
#endif #endif
#if HAVE_JSCORE
static gchar* static gchar*
sokoke_js_string_utf8 (JSStringRef js_string) sokoke_js_string_utf8 (JSStringRef js_string)
{ {
@ -49,18 +50,22 @@ sokoke_js_string_utf8 (JSStringRef js_string)
JSStringGetUTF8CString (js_string, string_utf8, size_utf8); JSStringGetUTF8CString (js_string, string_utf8, size_utf8);
return string_utf8; return string_utf8;
} }
#endif
gchar* gchar*
sokoke_js_script_eval (JSContextRef js_context, sokoke_js_script_eval (JSContextRef js_context,
const gchar* script, const gchar* script,
gchar** exception) gchar** exception)
{ {
#if HAVE_JSCORE
gchar* value; gchar* value;
JSStringRef js_value_string; JSStringRef js_value_string;
#endif
g_return_val_if_fail (js_context, FALSE); g_return_val_if_fail (js_context, FALSE);
g_return_val_if_fail (script, FALSE); g_return_val_if_fail (script, FALSE);
#if HAVE_JSCORE
JSStringRef js_script = JSStringCreateWithUTF8CString (script); JSStringRef js_script = JSStringCreateWithUTF8CString (script);
JSValueRef js_exception = NULL; JSValueRef js_exception = NULL;
JSValueRef js_value = JSEvaluateScript (js_context, js_script, JSValueRef js_value = JSEvaluateScript (js_context, js_script,
@ -79,6 +84,9 @@ sokoke_js_script_eval (JSContextRef js_context,
value = sokoke_js_string_utf8 (js_value_string); value = sokoke_js_string_utf8 (js_value_string);
JSStringRelease (js_value_string); JSStringRelease (js_value_string);
return value; return value;
#else
return g_strdup ("");
#endif
} }
static void static void

1
wscript
View file

@ -177,6 +177,7 @@ def configure (conf):
args = '--define-variable=target=win32' args = '--define-variable=target=win32'
check_pkg ('gtk+-2.0', '2.10.0', var='GTK', args=args) check_pkg ('gtk+-2.0', '2.10.0', var='GTK', args=args)
check_pkg ('webkit-1.0', '1.1.1', args=args) check_pkg ('webkit-1.0', '1.1.1', args=args)
conf.define ('HAVE_JSCORE', not is_mingw (conf.env))
check_pkg ('libsoup-2.4', '2.25.2') check_pkg ('libsoup-2.4', '2.25.2')
conf.define ('HAVE_LIBSOUP_2_25_2', 1) conf.define ('HAVE_LIBSOUP_2_25_2', 1)
check_pkg ('libxml-2.0', '2.6') check_pkg ('libxml-2.0', '2.6')