From 0367aa5825657042b6a354d9fe2329698504f32c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 8 Jan 2015 20:31:23 +0100 Subject: [PATCH] remove cruft (old unused pre-git version files) --- .gitignore | 18 ------------------ gtk2_ardour/about.cc | 3 --- gtk2_ardour/main.cc | 2 -- gtk2_ardour/wscript | 7 ------- libs/ardour/wscript | 6 ------ libs/canvas/wscript | 3 --- libs/gtkmm2ext/wscript | 3 --- libs/midi++2/wscript | 3 --- libs/pbd/wscript | 3 --- 9 files changed, 48 deletions(-) diff --git a/.gitignore b/.gitignore index 0c389a61d6..f82b60961e 100644 --- a/.gitignore +++ b/.gitignore @@ -60,33 +60,15 @@ tags /gtk2_ardour/ardev_common.sh /gtk2_ardour/*.bindings /gtk2_ardour/*.rc -/gtk2_ardour/version.cc -/gtk2_ardour/version.h # /libs/ardour/ -/libs/ardour/version.cc -/libs/ardour/ardour/version.h /libs/ardour/revision.cc /libs/ardour/config_text.cc -# /libs/canvas -/libs/canvas/version.cc -/libs/canvas/canvas/version.h - # /libs/gtkmm2ext/ /libs/gtkmm2ext/*.pot /libs/gtkmm2ext/*.mo /libs/gtkmm2ext/*.po -/libs/gtkmm2ext/version.cc -/libs/gtkmm2ext/gtkmm2ext/version.h - -# /libs/midi++2/ -/libs/midi++2/version.cc -/libs/midi++2/midi++/version.h - -# /libs/pbd/ -/libs/pbd/version.cc -/libs/pbd/pbd/version.h /libs/taglib/taglib/flacproperties.h /libs/taglib/taglib/apefooter.h diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index 3bf9a31422..d1001c7c69 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -27,11 +27,8 @@ #include "pbd/file_utils.h" #include "ardour/revision.h" -#include "ardour/version.h" #include "ardour/filesystem_paths.h" -#include "version.h" - #include "about.h" #include "configinfo.h" #include "rgb_macros.h" diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 26331027d6..ec63f21017 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -37,7 +37,6 @@ #endif #include "ardour/revision.h" -#include "ardour/version.h" #include "ardour/ardour.h" #include "ardour/audioengine.h" #include "ardour/session_utils.h" @@ -48,7 +47,6 @@ #include #include -#include "version.h" #include "ardour_ui.h" #include "opts.h" #include "enums.h" diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index c9504d96d5..421b1be6a6 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -239,7 +239,6 @@ gtk2_ardour_sources = [ 'ui_config.cc', 'utils.cc', 'verbose_cursor.cc', - 'version.cc', 'visibility_group.cc', 'volume_controller.cc', 'window_manager.cc', @@ -264,12 +263,6 @@ def options(opt): def configure(conf): conf.load('misc') conf.load('compiler_cxx') - # we don't use hard-coded micro versions with ardour, so hard code it to zero - autowaf.build_version_files( - path_prefix + 'version.h', - path_prefix + 'version.cc', - 'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0, - '', '') autowaf.configure(conf) # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 567439cf40..dadea20645 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -215,7 +215,6 @@ libardour_sources = [ 'unknown_processor.cc', 'user_bundle.cc', 'utils.cc', - 'version.cc', 'vumeterdsp.cc', 'worker.cc' ] @@ -241,11 +240,6 @@ def configure(conf): conf.load('compiler_cxx') conf.load('gas') # we don't use hard-coded micro versions with ardour, so hard code it to zero - autowaf.build_version_files( - path_prefix + 'ardour/version.h', - path_prefix + 'version.cc', - 'libardour' + str(conf.env['MAJOR']), conf.env['MAJOR'], conf.env['MINOR'], 0, - 'LIBARDOUR_API', 'ardour/libardour_visibility.h') autowaf.configure(conf) autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO', atleast_version='0.3.2') diff --git a/libs/canvas/wscript b/libs/canvas/wscript index 468c5ea28e..2c4cca850e 100644 --- a/libs/canvas/wscript +++ b/libs/canvas/wscript @@ -69,9 +69,6 @@ def options(opt): def configure(conf): conf.load ('compiler_cxx') autowaf.configure(conf) - autowaf.build_version_files(path_prefix+'canvas/version.h', path_prefix+'version.cc', - 'libcanvas', conf.env['MAJOR'], conf.env['MINOR'], 0, - 'LIBCANVAS_API', 'canvas/visibility.h') autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4') def build(bld): diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript index 0c06c5f68f..d9af1f8062 100644 --- a/libs/gtkmm2ext/wscript +++ b/libs/gtkmm2ext/wscript @@ -63,7 +63,6 @@ gtkmm2ext_sources = [ 'textviewer.cc', 'treeutils.cc', 'utils.cc', - 'version.cc', 'visibility_tracker.cc', 'window_title.cc' ] @@ -79,8 +78,6 @@ def options(opt): def configure(conf): conf.load('compiler_cxx') - autowaf.build_version_files(path_prefix+'gtkmm2ext/version.h', path_prefix+'version.cc', - 'libgtkmm2ext', MAJOR, MINOR, MICRO, 'LIBGTKMM2EXT_API', 'gtkmm2ext/visibility.h') autowaf.configure(conf) autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8') autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1') diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript index e8bfdab217..9592e31a9a 100644 --- a/libs/midi++2/wscript +++ b/libs/midi++2/wscript @@ -36,7 +36,6 @@ libmidi_sources = [ 'midnam_patch.cc', 'mmc.cc', 'mtc.cc', - 'version.cc', ] def options(opt): @@ -46,8 +45,6 @@ def options(opt): def configure(conf): conf.load('compiler_cxx') - autowaf.build_version_files(path_prefix+'midi++/version.h', path_prefix+'version.cc', - 'midipp', MAJOR, MINOR, MICRO, 'LIBMIDIPP_API', 'midi++/libmidi_visibility.h') autowaf.configure(conf) autowaf.check_pkg(conf, 'cppunit', uselib_store='CPPUNIT', atleast_version='1.12.0', mandatory=False) autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') diff --git a/libs/pbd/wscript b/libs/pbd/wscript index cb55437ae4..8f947fbb26 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -80,7 +80,6 @@ libpbd_sources = [ 'transmitter.cc', 'undo.cc', 'uuid.cc', - 'version.cc', 'whitespace.cc', 'xml++.cc', ] @@ -90,8 +89,6 @@ def options(opt): def configure(conf): conf.load('compiler_cxx') - autowaf.build_version_files(path_prefix+'pbd/version.h', path_prefix+'version.cc', - 'libpbd', MAJOR, MINOR, MICRO, 'LIBPBD_API', 'pbd/libpbd_visibility.h') autowaf.configure(conf) autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') -- 2.30.2