From eb7a85b8f992d0e2783c40c4809d81b17e80436c Mon Sep 17 00:00:00 2001 From: Julien de Kozak Date: Sun, 17 Mar 2013 14:53:30 +0100 Subject: Set the revision mechanism independent from the VCS name --- libs/ardour/ardour/revision.h | 27 +++++++++++++++++++++++++++ libs/ardour/ardour/svn_revision.h | 27 --------------------------- libs/ardour/broadcast_info.cc | 4 ++-- libs/ardour/wscript | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 libs/ardour/ardour/revision.h delete mode 100644 libs/ardour/ardour/svn_revision.h (limited to 'libs/ardour') diff --git a/libs/ardour/ardour/revision.h b/libs/ardour/ardour/revision.h new file mode 100644 index 0000000000..9eeb1e2a9a --- /dev/null +++ b/libs/ardour/ardour/revision.h @@ -0,0 +1,27 @@ +/* + Copyright (C) 2012 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef __ardour_revision_h__ +#define __ardour_revision_h__ + +namespace ARDOUR { + extern const char* revision; +} + +#endif diff --git a/libs/ardour/ardour/svn_revision.h b/libs/ardour/ardour/svn_revision.h deleted file mode 100644 index 2cde280a57..0000000000 --- a/libs/ardour/ardour/svn_revision.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - Copyright (C) 2012 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#ifndef __ardour_svn_revision_h__ -#define __ardour_svn_revision_h__ - -namespace ARDOUR { - extern const char* svn_revision; -} - -#endif diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc index 436c30c797..a7fa41aaf9 100644 --- a/libs/ardour/broadcast_info.cc +++ b/libs/ardour/broadcast_info.cc @@ -25,7 +25,7 @@ #include -#include "ardour/svn_revision.h" +#include "ardour/revision.h" #include "ardour/session.h" #include "ardour/session_metadata.h" @@ -89,7 +89,7 @@ BroadcastInfo::set_originator_ref_from_session (Session const & /*session*/) /* Serial number is 12 chars */ std::ostringstream serial_number; - serial_number << "ARDOUR" << "r" << std::setfill('0') << std::right << std::setw(5) << svn_revision; + serial_number << "ARDOUR" << "r" << std::setfill('0') << std::right << std::setw(5) << revision; snprintf_bounded_null_filled (info->originator_reference, sizeof (info->originator_reference), "%2s%3s%12s%02d%02d%02d%9d", SessionMetadata::Metadata()->country().c_str(), diff --git a/libs/ardour/wscript b/libs/ardour/wscript index b4a50a888b..d36b3a04aa 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -204,7 +204,7 @@ libardour_sources = [ 'source_factory.cc', 'speakers.cc', 'strip_silence.cc', - 'svn_revision.cc', + 'revision.cc', 'tape_file_matcher.cc', 'template_utils.cc', 'tempo.cc', -- cgit v1.2.3