From 38285d0e543a9501d2b1bc8ec6539656740fc50e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 12 May 2017 16:34:49 +0200 Subject: [PATCH] Remove cfgtool, it's not useful anymore cfgtool was used to dump the current config defaults into ./system_config on the system it runs. It was manually invoked (usually on Linux) and hence produced incorrect settings for Windows and OSX variants. Since ea4bbcf5 Ardour binaries bundle a minimal empty system_config, and the built-in defaults are used (correct for every platform). --- cfgtool/cfgtool.cc | 70 ---------------------------------------------- cfgtool/wscript | 24 ---------------- gtk2_ardour/arcfg | 4 --- wscript | 1 - 4 files changed, 99 deletions(-) delete mode 100644 cfgtool/cfgtool.cc delete mode 100644 cfgtool/wscript delete mode 100755 gtk2_ardour/arcfg diff --git a/cfgtool/cfgtool.cc b/cfgtool/cfgtool.cc deleted file mode 100644 index 3492f8b035..0000000000 --- a/cfgtool/cfgtool.cc +++ /dev/null @@ -1,70 +0,0 @@ -#include -#include - -#include "pbd/xml++.h" -#include "ardour/rc_configuration.h" - -using namespace ARDOUR; -using namespace std; - -int main (int argc, char **argv) { - if (argc < 2) { - fprintf(stderr, "Usage: %s [-h] \n", argv[0]); - return -1; - } - - if (!strcmp (argv[1], "-h") || !strcmp (argv[1], "--help")) { - fprintf(stdout, "Usage: %s \n\n", argv[0]); - fprintf(stdout, "Writes the default Ardour config to the given file\n"); - return 0; - } - - g_setenv ("ARDOUR_DLL_PATH", "/xxx", 1); - g_setenv ("ARDOUR_CONFIG_PATH", "/xxx", 1); - - if (!ARDOUR::init (false, true, "/xxx")) { - fprintf(stderr, "Failed to initialize libardour\n"); - return -1; - } - - RCConfiguration * rc = new RCConfiguration; - XMLNode& state = rc->get_state(); - - XMLNode* cfg = state.child ("Config"); - cfg->remove_nodes_and_delete ("name", "donate-url"); - cfg->remove_nodes_and_delete ("name", "osx_pingback-url"); - cfg->remove_nodes_and_delete ("name", "linux-pingback-url"); - cfg->remove_nodes_and_delete ("name", "updates-url"); - cfg->remove_nodes_and_delete ("name", "freesound-download-dir"); // user specific - - XMLNode* meta = state.child ("Metadata"); - meta->remove_nodes ("user_name"); - - XMLTree tree; - tree.set_root (&state); - - if (!tree.write (argv[1])) { - fprintf(stderr, "Error saving config file '%s'\n", argv[1]); - return -1; - } - - return 0; -} - - -#include "ardour/vst_types.h" -int vstfx_init (void*) { return 0; } -void vstfx_exit () {} -void vstfx_destroy_editor (VSTState*) {} - -#ifdef WINDOWS_VST_SUPPORT -extern "C" { -int fst_init (void* possible_hmodule) { return -1;} -void fst_exit (void) {} -VSTHandle* fst_load (const char*) { return 0; } -int fst_unload (VSTHandle**) { return -1; } -VSTState * fst_instantiate (VSTHandle *, audioMasterCallback amc, void* userptr) { return 0; } -void fst_close (VSTState *) {} -void fst_audio_master_idle(void) {} -}; -#endif diff --git a/cfgtool/wscript b/cfgtool/wscript deleted file mode 100644 index 7fa076114a..0000000000 --- a/cfgtool/wscript +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -from waflib.extras import autowaf as autowaf - -top = '.' -out = 'build' - -def options(opt): - autowaf.set_options(opt) - -def configure(conf): - conf.load('misc') - conf.load('compiler_cxx') - autowaf.configure(conf) - -def build(bld): - if bld.env['build_target'] == 'mingw': - return; - - obj = bld (features = 'cxx c cxxprogram') - obj.source = 'cfgtool.cc' - obj.target = 'cfgtool' - obj.use = [ 'libpbd', 'libardour', 'libardour_cp' ] - obj.uselib = [ 'GLIBMM', 'XML' ] - obj.install_path = None diff --git a/gtk2_ardour/arcfg b/gtk2_ardour/arcfg deleted file mode 100755 index 7177b7d539..0000000000 --- a/gtk2_ardour/arcfg +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -TOP=`dirname "$0"`/.. -. $TOP/build/gtk2_ardour/ardev_common_waf.sh -exec $TOP/build/cfgtool/cfgtool "$@" diff --git a/wscript b/wscript index e961a5dcb6..86fcc53d5e 100644 --- a/wscript +++ b/wscript @@ -239,7 +239,6 @@ children = [ 'libs/fst', 'libs/vfork', 'libs/ardouralsautil', - 'cfgtool', 'tools/luadevel', ] -- 2.30.2