Convert many native modules to JS modules

Less C code and more JS + introspection means more maintenability
and fewer bugs.

https://bugzilla.gnome.org/show_bug.cgi?id=692025

Author: gcampax

Makefile-modules.am

@@ -11,12 +11,13 @@ dist_gjsoverride_DATA = 		\
 dist_gjsjs_DATA +=		\
 	modules/gettext.js	\
 	modules/lang.js		\
+	modules/mainloop.js	\
 	modules/jsUnit.js	\
 	modules/signals.js	\
 	modules/promise.js	\
 	modules/format.js
 
-gjsnative_LTLIBRARIES += console.la debugger.la langNative.la mainloop.la gettextNative.la system.la formatNative.la
+gjsnative_LTLIBRARIES += console.la langNative.la system.la
 
 if ENABLE_CAIRO
 dist_gjsjs_DATA +=		\
@@ -48,30 +49,6 @@ langNative_la_SOURCES =				\
 	modules/lang.h				\
 	modules/lang.c
 
-mainloop_la_CFLAGS = 				\
-	$(JS_NATIVE_MODULE_CFLAGS)
-mainloop_la_LIBADD = \
-	libgjs.la				\
-	$(JS_NATIVE_MODULE_LIBADD)
-mainloop_la_LDFLAGS = 				\
-	$(JS_NATIVE_MODULE_LDFLAGS)
-
-mainloop_la_SOURCES =		\
-	modules/mainloop.h	\
-	modules/mainloop.c
-
-gettextNative_la_CFLAGS = 				\
-	$(JS_NATIVE_MODULE_CFLAGS)
-gettextNative_la_LIBADD = \
-	libgjs.la				\
-	$(JS_NATIVE_MODULE_LIBADD)
-gettextNative_la_LDFLAGS = 				\
-	$(JS_NATIVE_MODULE_LDFLAGS)
-
-gettextNative_la_SOURCES =		\
-	modules/gettext-native.h	\
-	modules/gettext-native.c
-
 cairoNative_la_CFLAGS =                         \
         $(JS_NATIVE_MODULE_CFLAGS)              \
         $(GJS_CAIRO_CFLAGS)                     \
@@ -123,27 +100,3 @@ console_la_LDFLAGS = 				\
 console_la_SOURCES =		\
 	modules/console.h	\
 	modules/console.c
-
-debugger_la_CFLAGS = 				\
-	$(JS_NATIVE_MODULE_CFLAGS)
-debugger_la_LIBADD = \
-	libgjs.la				\
-	$(JS_NATIVE_MODULE_LIBADD)
-debugger_la_LDFLAGS = 				\
-	$(JS_NATIVE_MODULE_LDFLAGS)
-
-debugger_la_SOURCES =		\
-	modules/debugger.h	\
-	modules/debugger.c
-
-formatNative_la_CFLAGS = \
-	$(JS_NATIVE_MODULE_CFLAGS)
-formatNative_la_LIBADD = \
-	libgjs.la \
-	$(JS_NATIVE_MODULE_LIBADD)
-formatNative_la_LDFLAGS = \
-	$(JS_NATIVE_MODULE_LDFLAGS)
-
-formatNative_la_SOURCES = \
-	modules/format.h \
-	modules/format.c

Makefile.am

@@ -149,7 +149,9 @@ libgjs_la_SOURCES += \
 # Also, these files used to be a separate library
 libgjs_private_source_files = \
 	libgjs-private/gjs-gdbus-wrapper.c	\
-	libgjs-private/gjs-gdbus-wrapper.h
+	libgjs-private/gjs-gdbus-wrapper.h	\
+	libgjs-private/gjs-util.c		\
+	libgjs-private/gjs-util.h
 libgjs_la_SOURCES += $(libgjs_private_source_files)
 
 GjsPrivate-1.0.gir: libgjs.la

modules/debugger.h renamed to libgjs-private/gjs-util.c

@@ -1,6 +1,5 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
-/*
- * Copyright (c) 2008  litl, LLC
+/* Copyright 2012 Giovanni Campagna <[email protected]>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -21,18 +20,31 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef __GJS_DEBUGGER_H__
-#define __GJS_DEBUGGER_H__
-
 #include <config.h>
+#include <string.h>
+
 #include <glib.h>
-#include "gjs/jsapi-util.h"
+#include <glib/gi18n.h>
 
-G_BEGIN_DECLS
+#include "gjs-util.h"
 
-JSBool        gjs_define_debugger_stuff    (JSContext      *context,
-                                            JSObject       *in_object);
+char *
+gjs_format_int_alternative_output(int n)
+{
+    return g_strdup_printf("%Id", n);
+}
 
-G_END_DECLS
+void
+gjs_textdomain(const char *domain)
+{
+    textdomain(domain);
+}
 
-#endif  /* __GJS_DEBUGGER_H__ */
+void
+gjs_bindtextdomain(const char *domain,
+                   const char *location)
+{
+    bindtextdomain(domain, location);
+    /* Always use UTF-8; we assume it internally here */
+    bind_textdomain_codeset(domain, "UTF-8");
+}

modules/mainloop.h renamed to libgjs-private/gjs-util.h

@@ -1,6 +1,5 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
-/*
- * Copyright (c) 2008  litl, LLC
+/* Copyright 2012 Giovanni Campagna <[email protected]>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -21,18 +20,21 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef __GJS_MAINLOOP_H__
-#define __GJS_MAINLOOP_H__
+#ifndef __GJS_PRIVATE_UTIL_H__
+#define __GJS_PRIVATE_UTIL_H__
 
-#include <config.h>
 #include <glib.h>
-#include "gjs/jsapi-util.h"
 
 G_BEGIN_DECLS
 
-JSBool        gjs_define_mainloop_stuff     (JSContext      *context,
-                                             JSObject       *in_object);
+/* For imports.format */
+char * gjs_format_int_alternative_output (int n);
+
+/* For imports.gettext */
+void gjs_textdomain     (const char *domain);
+void gjs_bindtextdomain (const char *domain,
+                         const char *location);
 
 G_END_DECLS
 
-#endif  /* __GJS_MAINLOOP_H__ */
+#endif

modules/debugger.c

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const FormatNative = imports.formatNative;
+const GjsPrivate = imports.gi.GjsPrivate;
 
 function vprintf(str, args) {
     let i = 0;
@@ -33,7 +33,7 @@ function vprintf(str, args) {
         case 'd':
             let intV = parseInt(args[i++]);
             if (hasAlternativeIntFlag)
-                s = FormatNative.format_int_alternative_output(intV);
+                s = GjsPrivate.format_int_alternative_output(intV);
             else
                 s = intV.toString();
             break;