Use new command-line options for NI 6L38

- The "-log" option did nothing and has been removed
- "-extension" was replaced by "-format"
- "-package" was replaced by "-project"
- "-rules" was replaced by "-internal" and now refers to Inform's
  'internal' directory which is $pkgdatadir in our case
- "-extensions" is now "-external" but we don't use it, instead leaving
  it to its default value

Author: ptomato

src/app.c

@@ -1107,14 +1107,14 @@ void
 i7_app_run_census(I7App *app, gboolean wait)
 {
 	GFile *ni_binary = i7_app_get_binary_file(app, "ni");
-	GFile *builtin_extensions = get_builtin_extension_file(app, NULL, NULL);
+	GFile *builtin_extensions = i7_app_get_internal_dir(app);
 
 	/* Build the command line */
 	gchar **commandline = g_new(gchar *, 5);
 	commandline[0] = g_file_get_path(ni_binary);
-	commandline[1] = g_strdup("--rules");
+	commandline[1] = g_strdup("-internal");
 	commandline[2] = g_file_get_path(builtin_extensions);
-	commandline[3] = g_strdup("--census");
+	commandline[3] = g_strdup("-census");
 	commandline[4] = NULL;
 
 	g_object_unref(ni_binary);
@@ -1239,6 +1239,21 @@ i7_app_get_extension_index_page(I7App *app)
 	return retval;
 }
 
+/**
+ * i7_app_get_internal_dir:
+ * @app: the app
+ *
+ * Gets a reference to the application data directory, or in other words the
+ * directory which the NI compiler considers to be the "internal" directory.
+ *
+ * Returns: (transfer full): a new #GFile.
+ */
+GFile *
+i7_app_get_internal_dir(I7App *app)
+{
+	return g_object_ref(I7_APP_PRIVATE(app)->datadir);
+}
+
 /**
  * i7_app_get_data_file:
  * @app: the app

src/app.h

@@ -113,6 +113,7 @@ GFile *i7_app_get_extension_file(I7App *app, const gchar *author, const gchar *e
 GFile *i7_app_get_extension_docpage(I7App *app, const char *author, const char *extname);
 GFile *i7_app_get_extension_home_page(I7App *app);
 GFile *i7_app_get_extension_index_page(I7App *app);
+GFile *i7_app_get_internal_dir(I7App *app);
 GFile *i7_app_get_data_file(I7App *app, const gchar *filename);
 GFile *i7_app_get_data_file_va(I7App *app, const gchar *path1, ...) G_GNUC_NULL_TERMINATED;
 GFile *i7_app_check_data_file(I7App *app, const char *filename);

src/story-compile.c

@@ -199,25 +199,22 @@ start_ni_compiler(CompilerData *data)
 	/* Build the command line */
 	GPtrArray *args = g_ptr_array_new_full(7, g_free); /* usual number of args */
 	I7App *theapp = i7_app_get();
-	GSettings *prefs = i7_app_get_prefs(theapp);
 	GFile *ni_compiler = i7_app_get_binary_file(theapp, "ni");
-	GFile *extensions_dir = i7_app_get_data_file(theapp, "Extensions");
+	GFile *internal_dir = i7_app_get_internal_dir(theapp);
 	g_ptr_array_add(args, g_file_get_path(ni_compiler));
-	g_ptr_array_add(args, g_strdup("-rules"));
-	g_ptr_array_add(args, g_file_get_path(extensions_dir));
-	g_ptr_array_add(args, g_strconcat("-extension=", i7_story_get_extension(data->story), NULL));
-	g_ptr_array_add(args, g_strdup("-package"));
+	g_ptr_array_add(args, g_strdup("-internal"));
+	g_ptr_array_add(args, g_file_get_path(internal_dir));
+	g_ptr_array_add(args, g_strconcat("-format=", i7_story_get_extension(data->story), NULL));
+	g_ptr_array_add(args, g_strdup("-project"));
 	g_ptr_array_add(args, g_file_get_path(data->input_file));
 	if(!data->use_debug_flags)
 		g_ptr_array_add(args, g_strdup("-release")); /* Omit "not for relase" material */
-	if(g_settings_get_boolean(prefs, PREFS_SHOW_DEBUG_LOG))
-		g_ptr_array_add(args, g_strdup("-log"));
 	if(i7_story_get_nobble_rng(data->story))
 		g_ptr_array_add(args, g_strdup("-rng"));
 	g_ptr_array_add(args, NULL);
 
 	g_object_unref(ni_compiler);
-	g_object_unref(extensions_dir);
+	g_object_unref(internal_dir);
 
 	char **commandline = (char **)g_ptr_array_free(args, FALSE);