-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Include retrospective compiler versions from new Inform distribution
This uses the "retrospective" directory from the Inform source, where versions 6L02, 6L38, and 6M62 are kept. The names of the versions and the blurbs that are shown below the setting in the UI are controlled by a file named retrospective.txt that we include in our GResource bundle.
- Loading branch information
Showing
15 changed files
with
480 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| /_build | ||
| /_install | ||
| /intools | ||
| /retrospective | ||
| /subprojects/chimara | ||
| /subprojects/ratify |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,224 @@ | ||
| /* | ||
| * SPDX-License-Identifier: GPL-3.0-or-later | ||
| * SPDX-FileCopyrightText: 2022 Philip Chimento <philip.chimento@gmail.com> | ||
| */ | ||
|
|
||
| #include "config.h" | ||
|
|
||
| #include <ctype.h> | ||
| #include <stdbool.h> | ||
|
|
||
| #include <gio/gio.h> | ||
|
|
||
| #include "app.h" | ||
| #include "app-retrospective.h" | ||
| #include "story.h" | ||
|
|
||
| typedef enum { | ||
| INFORM_10_1, | ||
| INFORM_9_2, | ||
| INFORM_9_1 | ||
| } ArgsStyle; | ||
|
|
||
| static ArgsStyle | ||
| get_args_style(const char *version_id) | ||
| { | ||
| if (g_str_equal(version_id, "6L02")) | ||
| return INFORM_9_1; | ||
| if (g_str_equal(version_id, "6L38") || g_str_equal(version_id, "6M62")) | ||
| return INFORM_9_2; | ||
| return INFORM_10_1; | ||
| } | ||
|
|
||
| static void | ||
| retrospective_free(RetrospectiveData *self) | ||
| { | ||
| g_free(self->display_name); | ||
| g_free(self->description); | ||
| g_free(self); | ||
| } | ||
|
|
||
| /* Helper functions for asserting the retrospective.txt file has the correct | ||
| * format */ | ||
|
|
||
| static bool | ||
| is_empty(const char *str) | ||
| { | ||
| return str && *str == '\0'; | ||
| } | ||
|
|
||
| static bool | ||
| is_comma(const char *str) | ||
| { | ||
| if (!str) | ||
| return FALSE; | ||
| if (*str++ != ',') | ||
| return FALSE; | ||
| while(isspace(*str)) | ||
| str++; | ||
| return *str == '\0'; | ||
| } | ||
|
|
||
| static char * | ||
| is_present(const char *str) | ||
| { | ||
| g_assert(str); | ||
| return g_strdup(str); | ||
| } | ||
|
|
||
| /* Parse the retrospective.txt file and store the relevant data in a hash table | ||
| * (key: string, value: RetrospectiveData) */ | ||
| void | ||
| parse_retrospective_txt(GHashTable **entries_out, char ***ids_out) | ||
| { | ||
| g_assert(entries_out); | ||
| g_assert(ids_out); | ||
|
|
||
| g_autoptr(GError) error = NULL; | ||
| g_autoptr(GBytes) resource = g_resources_lookup_data("/com/inform7/IDE/retrospective.txt", | ||
| G_RESOURCE_LOOKUP_FLAGS_NONE, &error); | ||
| if (!resource) { | ||
| g_error("failed to look up retrospective data: %s", error->message); | ||
| } | ||
|
|
||
| GHashTable *entries = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, | ||
| (GDestroyNotify)retrospective_free); | ||
| /* COMPAT: Use GStrvBuilder in GLib >= 2.68 */ | ||
| g_autoptr(GPtrArray) ids = g_ptr_array_new_with_free_func(g_free); | ||
|
|
||
| size_t len; | ||
| const char *retrospective_content = g_bytes_get_data(resource, &len); | ||
| g_auto(GStrv) lines = g_strsplit_set(retrospective_content, "\r\n", -1); | ||
| for (char **line = lines; *line != NULL; line++) { | ||
| if (**line == '\0') | ||
| continue; /* Skip blank lines */ | ||
|
|
||
| g_auto(GStrv) parts = g_strsplit(g_strchomp(*line), "'", -1); | ||
|
|
||
| RetrospectiveData *record = g_new0(RetrospectiveData, 1); | ||
|
|
||
| /* Since the retrospective.txt file is built into Inform, we are | ||
| * draconian about any irregularities in the file format. */ | ||
| g_assert(is_empty(parts[0])); | ||
| char *build_num = is_present(parts[1]); | ||
| g_assert(is_comma(parts[2])); | ||
| record->display_name = is_present(parts[3]); | ||
| g_assert(is_comma(parts[4])); | ||
| record->description = is_present(parts[5]); | ||
| g_assert(is_empty(parts[6])); | ||
|
|
||
| g_ptr_array_add(ids, g_strdup(build_num)); | ||
| bool was_new = g_hash_table_insert(entries, build_num, record); | ||
| g_assert(was_new); | ||
| } | ||
|
|
||
| g_ptr_array_add(ids, NULL); | ||
| *ids_out = (char **)g_ptr_array_steal(ids, NULL); | ||
| *entries_out = entries; | ||
| } | ||
|
|
||
| const char * | ||
| i7_app_get_retrospective_display_name(I7App *self, const char *id) | ||
| { | ||
| const RetrospectiveData *record = get_retrospective_data(self, id); | ||
| return record->display_name; | ||
| } | ||
|
|
||
| const char * | ||
| i7_app_get_retrospective_description(I7App *self, const char *id) | ||
| { | ||
| const RetrospectiveData *record = get_retrospective_data(self, id); | ||
| return record->description; | ||
| } | ||
|
|
||
| static const char * | ||
| get_inform_format_arg(ArgsStyle style, I7StoryFormat format) | ||
| { | ||
| switch(format) { | ||
| case I7_STORY_FORMAT_Z8: | ||
| if (style == INFORM_9_1) | ||
| return "-extension=z8"; | ||
| return "-format=z8"; | ||
| case I7_STORY_FORMAT_GLULX: | ||
| if (style == INFORM_9_1) | ||
| return "-extension=ulx"; | ||
| return "-format=ulx"; | ||
| default: | ||
| ; | ||
| } | ||
| g_assert_not_reached(); | ||
| return "error"; | ||
| } | ||
|
|
||
| char ** | ||
| i7_app_get_inform_command_line(I7App *self, const char *version_id, int format, bool debug, bool reproducible, GFile *project_file) | ||
| { | ||
| g_autoptr(GPtrArray) builder = g_ptr_array_new_with_free_func(g_free); | ||
|
|
||
| ArgsStyle style = get_args_style(version_id); | ||
|
|
||
| g_autoptr(GFile) inform_compiler = NULL; | ||
| if (style == INFORM_10_1) | ||
| inform_compiler = i7_app_get_binary_file(self, "ni"); | ||
| else | ||
| inform_compiler = i7_app_get_retrospective_binary_file(self, version_id, "ni"); | ||
| char *inform_path = g_file_get_path(inform_compiler); | ||
| g_ptr_array_add(builder, inform_path); | ||
|
|
||
| g_autoptr(GFile) internal_dir = NULL; | ||
| if (style == INFORM_10_1) | ||
| internal_dir = i7_app_get_internal_dir(self); | ||
| else | ||
| internal_dir = i7_app_get_retrospective_internal_dir(self, version_id); | ||
| char *internal_path = g_file_get_path(internal_dir); | ||
| if (style == INFORM_9_1) | ||
| g_ptr_array_add(builder, g_strdup("-rules")); | ||
| else | ||
| g_ptr_array_add(builder, g_strdup("-internal")); | ||
| g_ptr_array_add(builder, internal_path); | ||
|
|
||
| g_ptr_array_add(builder, g_strdup(get_inform_format_arg(style, (I7StoryFormat)format))); | ||
|
|
||
| char *project_path = g_file_get_path(project_file); | ||
| if (style == INFORM_9_1) | ||
| g_ptr_array_add(builder, g_strdup("-package")); | ||
| else | ||
| g_ptr_array_add(builder, g_strdup("-project")); | ||
| g_ptr_array_add(builder, project_path); | ||
|
|
||
| if (!debug) | ||
| g_ptr_array_add(builder, g_strdup("-release")); /* Omit "not for relase" material */ | ||
|
|
||
| if(reproducible) | ||
| g_ptr_array_add(builder, g_strdup("-rng")); | ||
|
|
||
| g_ptr_array_add(builder, NULL); | ||
| return (char **)g_ptr_array_steal(builder, NULL); | ||
| } | ||
|
|
||
| char ** | ||
| i7_app_get_inblorb_command_line(I7App *self, const char *version_id, GFile *blorb_file) | ||
| { | ||
| g_autoptr(GPtrArray) builder = g_ptr_array_new_with_free_func(g_free); | ||
|
|
||
| ArgsStyle style = get_args_style(version_id); | ||
|
|
||
| g_autoptr(GFile) inblorb = NULL; | ||
| if (style == INFORM_10_1) | ||
| inblorb = i7_app_get_binary_file(self, "cBlorb"); | ||
| else | ||
| inblorb = i7_app_get_retrospective_binary_file(self, version_id, "cBlorb"); | ||
| char *inblorb_path = g_file_get_path(inblorb); | ||
| g_ptr_array_add(builder, inblorb_path); | ||
|
|
||
| if (style != INFORM_10_1) | ||
| g_ptr_array_add(builder, g_strdup("-unix")); | ||
|
|
||
| g_ptr_array_add(builder, g_strdup("Release.blurb")); | ||
|
|
||
| char *blorb_path = g_file_get_path(blorb_file); | ||
| g_ptr_array_add(builder, blorb_path); | ||
|
|
||
| g_ptr_array_add(builder, NULL); | ||
| return (char **)g_ptr_array_steal(builder, NULL); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| /* | ||
| * SPDX-License-Identifier: GPL-3.0-or-later | ||
| * SPDX-FileCopyrightText: 2022 Philip Chimento <philip.chimento@gmail.com> | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <glib.h> | ||
|
|
||
| #include "app.h" | ||
|
|
||
| /* Record parsed out of retrospective.txt */ | ||
| typedef struct { | ||
| char *display_name; | ||
| char *description; | ||
| } RetrospectiveData; | ||
|
|
||
| void parse_retrospective_txt(GHashTable **entries_out, char ***ids_out); | ||
| const RetrospectiveData *get_retrospective_data(I7App *app, const char *id); |
Oops, something went wrong.