Add buildbot_assets_url

This commit is contained in:
twinaphex 2015-02-01 17:13:15 +01:00
parent e3066d43c9
commit 50a9b8478d
5 changed files with 23 additions and 2 deletions

View file

@ -661,6 +661,8 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/win-x8
static char buildbot_server_url[] = "";
#endif
static char buildbot_assets_server_url[] = "http://buildbot.libretro.com/assets/";
#ifndef IS_SALAMANDER
#include "intl/intl.h"

View file

@ -323,6 +323,7 @@ struct settings
struct
{
char buildbot_url[PATH_MAX_LENGTH];
char buildbot_assets_url[PATH_MAX_LENGTH];
bool buildbot_auto_extract_archive;
} network;

View file

@ -634,9 +634,12 @@
#### Core Updater
# URL to core management upgrade buildbot.
# URL to core update directory on buildbot.
# core_updater_buildbot_url = "http://buildbot.libretro.com"
# URL to assets update directory on buildbot.
# core_updater_buildbot_assets_url = "http://buildbot.libretro.com/assets/"
# Automatically extract archives that the cores are contained in to the libretro cores directory.
# core_updater_auto_extract_archive = true

View file

@ -541,6 +541,8 @@ static void config_set_defaults(void)
strlcpy(g_settings.network.buildbot_url, buildbot_server_url,
sizeof(g_settings.network.buildbot_url));
strlcpy(g_settings.network.buildbot_assets_url, buildbot_assets_server_url,
sizeof(g_settings.network.buildbot_assets_url));
g_settings.network.buildbot_auto_extract_archive = true;
g_settings.input.overlay_enable = true;
@ -1220,6 +1222,7 @@ static bool config_load_file(const char *path, bool set_defaults)
"autoconfig_descriptor_label_show");
CONFIG_GET_PATH(network.buildbot_url, "core_updater_buildbot_url");
CONFIG_GET_PATH(network.buildbot_assets_url, "core_updater_buildbot_assets_url");
CONFIG_GET_BOOL(network.buildbot_auto_extract_archive,
"core_updater_auto_extract_archive");
@ -1895,6 +1898,7 @@ bool config_save_file(const char *path)
config_set_string(conf, "video_filter", g_settings.video.softfilter_plugin);
config_set_string(conf, "audio_dsp_plugin", g_settings.audio.dsp_plugin);
config_set_string(conf, "core_updater_buildbot_url", g_settings.network.buildbot_url);
config_set_string(conf, "core_updater_buildbot_assets_url", g_settings.network.buildbot_assets_url);
config_set_bool(conf, "core_updater_auto_extract_archive", g_settings.network.buildbot_auto_extract_archive);
config_set_string(conf, "camera_device", g_settings.camera.device);
config_set_bool(conf, "camera_allow", g_settings.camera.allow);

View file

@ -5359,7 +5359,7 @@ static bool setting_data_append_list_core_updater_options(
CONFIG_STRING(
g_settings.network.buildbot_url,
"core_updater_buildbot_url",
"Buildbot URL",
"Buildbot Core URL",
buildbot_server_url,
group_info.name,
subgroup_info.name,
@ -5367,6 +5367,17 @@ static bool setting_data_append_list_core_updater_options(
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT);
CONFIG_STRING(
g_settings.network.buildbot_assets_url,
"core_updater_buildbot_assets_url",
"Buildbot Assets URL",
buildbot_assets_server_url,
group_info.name,
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT);
CONFIG_BOOL(
g_settings.network.buildbot_auto_extract_archive,
"core_updater_auto_extract_archive",