Removed subversion related configuration info.

* Don't call GR_SUBVERSION in configure.ac
* Remove --svn* options from gnuradio-config-info

diff --git a/configure.ac b/configure.ac
index 1764b46abe2abad7cb054ca2a6abae3d1771a465..2bb37935e9a4cb1ef10b664c6a1463f13368a064 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -286,9 +286,6 @@ dnl AX_BOOST_TEST_EXEC_MONITOR
 dnl AX_BOOST_UNIT_TEST_FRAMEWORK
 dnl AX_BOOST_WSERIALIZATION
 
 dnl AX_BOOST_UNIT_TEST_FRAMEWORK
 dnl AX_BOOST_WSERIALIZATION
 

-
-dnl If this is being done from a subversion tree, create variables
-GR_SUBVERSION

 BUILD_DATE=`date -R -u`
 AC_SUBST(BUILD_DATE)
 
 BUILD_DATE=`date -R -u`
 AC_SUBST(BUILD_DATE)
 

diff --git a/gnuradio-core/src/lib/general/gr_constants.cc.in b/gnuradio-core/src/lib/general/gr_constants.cc.in
index efb0f1c776695e7ef259ec2b8c7e0322fdbedba8..71a47eb5102450aeb6bb79dd9f49ecc00cbebe49 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_constants.cc.in
+++ b/gnuradio-core/src/lib/general/gr_constants.cc.in
@@ -50,18 +50,6 @@ gr_build_date()
   return "@BUILD_DATE@";
 }
 
   return "@BUILD_DATE@";
 }
 

-const std::string
-gr_svn_date()
-{
-  return "@SVNDATE@";
-}
-
-const std::string
-gr_svn_version()
-{
-  return "@SVNVERSION@";
-}
-

 const std::string
 gr_version()
 {
 const std::string
 gr_version()
 {

diff --git a/gnuradio-core/src/lib/general/gr_constants.h b/gnuradio-core/src/lib/general/gr_constants.h
index e44890be0176061810972004b2a7a7d26e1c264c..449d41c174c1461414f4444908d006c8cb5d921c 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_constants.h
+++ b/gnuradio-core/src/lib/general/gr_constants.h
@@ -44,16 +44,6 @@ const std::string gr_prefsdir();
  */
 const std::string gr_build_date();
 
  */
 const std::string gr_build_date();
 

-/*!
- * \brief return repository date as set when 'bootstrap' is run
- */
-const std::string gr_svn_date();
-
-/*!
- * \brief return repository version as set when 'bootstrap' is run
- */
-const std::string gr_svn_version();
-

 /*!
  * \brief return version string defined in configure.ac
  */
 /*!
  * \brief return version string defined in configure.ac
  */

diff --git a/gnuradio-core/src/lib/general/gr_constants.i b/gnuradio-core/src/lib/general/gr_constants.i
index 156af4a3655fbae0a15382d349d434e2b3fcf50e..a5aef14925da5e1103c2296c23eb2ef4f6732e58 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_constants.i
+++ b/gnuradio-core/src/lib/general/gr_constants.i
@@ -4,14 +4,10 @@
 %rename(sysconfdir) gr_sysconfdir;
 %rename(prefsdir) gr_prefsdir;
 %rename(build_date) gr_build_date;
 %rename(sysconfdir) gr_sysconfdir;
 %rename(prefsdir) gr_prefsdir;
 %rename(build_date) gr_build_date;

-%rename(svn_date) gr_svn_date;
-%rename(svn_version) gr_svn_version;

 %rename(version) gr_version;
 
 const std::string gr_prefix();
 const std::string gr_sysconfdir();
 const std::string gr_prefsdir();
 const std::string gr_build_date();
 %rename(version) gr_version;
 
 const std::string gr_prefix();
 const std::string gr_sysconfdir();
 const std::string gr_prefsdir();
 const std::string gr_build_date();

-const std::string gr_svn_date();
-const std::string gr_svn_version();

 const std::string gr_version();
 const std::string gr_version();

diff --git a/gnuradio-core/src/lib/gnuradio-config-info.cc b/gnuradio-core/src/lib/gnuradio-config-info.cc
index df78ea2ddf9bea047de6d65e86520d92fd31a242..6fa53b87762954b8bfe8aa55d0366c92a7ffb57f 100644 (file)
--- a/gnuradio-core/src/lib/gnuradio-config-info.cc
+++ b/gnuradio-core/src/lib/gnuradio-config-info.cc
@@ -43,8 +43,6 @@ main(int argc, char **argv)
     ("prefsdir", "print gnuradio preferences directory")
     ("builddate", "print gnuradio build date (RFC2822 format)")
     ("version,v", "print gnuradio version")
     ("prefsdir", "print gnuradio preferences directory")
     ("builddate", "print gnuradio build date (RFC2822 format)")
     ("version,v", "print gnuradio version")

-    ("svnversion", "print SVN repository version (SVN format)")
-    ("svndate", "print SVN repository date")

     ;
 
   po::store(po::parse_command_line(argc, argv, desc), vm);
     ;
 
   po::store(po::parse_command_line(argc, argv, desc), vm);


@@ -70,11 +68,5 @@ main(int argc, char **argv)
   if (vm.count("version"))
     std::cout << gr_version() << std::endl;
 
   if (vm.count("version"))
     std::cout << gr_version() << std::endl;
 

-  if (vm.count("svnversion"))
-    std::cout << gr_svn_version() << std::endl;
-
-  if (vm.count("svndate"))
-    std::cout << gr_svn_date() << std::endl;
-

   return 0;
 }
   return 0;
 }