[Commit-gnuradio] r11475 - gnuradio/trunk/gnuradio-core/src/lib

[jcorgan]

Author: jcorgan
Date: 2009-07-25 08:55:06 -0600 (Sat, 25 Jul 2009)
New Revision: 11475

Added:
   gnuradio/trunk/gnuradio-core/src/lib/gnuradio-config-info.cc
Removed:
   gnuradio/trunk/gnuradio-core/src/lib/gnuradio.cc
Modified:
   gnuradio/trunk/gnuradio-core/src/lib/
   gnuradio/trunk/gnuradio-core/src/lib/Makefile.am
Log:
Rename binary to be more descriptive.

gnuradio --> gnuradio-config-info




Property changes on: gnuradio/trunk/gnuradio-core/src/lib
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
gnuradio

   + Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
gnuradio-config-info



Modified: gnuradio/trunk/gnuradio-core/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/Makefile.am    2009-07-25 13:11:00 UTC 
(rev 11474)
+++ gnuradio/trunk/gnuradio-core/src/lib/Makefile.am    2009-07-25 14:55:06 UTC 
(rev 11475)
@@ -67,6 +67,6 @@
        libgnuradio-core.la             \
        $(CPPUNIT_LIBS)                 
 
-bin_PROGRAMS = gnuradio
-gnuradio_SOURCES = gnuradio.cc
-gnuradio_LDADD = libgnuradio-core.la $(BOOST_PROGRAM_OPTIONS_LIB)
+bin_PROGRAMS = gnuradio-config-info
+gnuradio_config_info_SOURCES = gnuradio-config-info.cc
+gnuradio_config_info_LDADD = libgnuradio-core.la $(BOOST_PROGRAM_OPTIONS_LIB)
\ No newline at end of file

Copied: gnuradio/trunk/gnuradio-core/src/lib/gnuradio-config-info.cc (from rev 
11465, gnuradio/trunk/gnuradio-core/src/lib/gnuradio.cc)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gnuradio-config-info.cc                
                (rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/gnuradio-config-info.cc        
2009-07-25 14:55:06 UTC (rev 11475)
@@ -0,0 +1,80 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009 Free Software Foundation, Inc.
+ * 
+ * This file is part of GNU Radio
+ * 
+ * GNU Radio 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 3, or (at your option)
+ * any later version.
+ * 
+ * GNU Radio 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 GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gr_constants.h>
+#include <boost/program_options.hpp>
+#include <iostream>
+
+namespace po = boost::program_options;
+
+int
+main(int argc, char **argv)
+{
+  po::options_description desc("Program options: gnuradio [options]");
+  po::variables_map vm;
+
+  desc.add_options()
+    ("help,h", "print help message")
+    ("prefix", "print gnuradio installation prefix")
+    ("sysconfdir", "print gnuradio system configuration directory")
+    ("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::notify(vm);
+
+  if (vm.size() == 0 || vm.count("help")) {
+    std::cout << desc << std::endl;
+    return 1;
+  }
+      
+  if (vm.count("prefix"))
+    std::cout << gr_prefix() << std::endl;
+
+  if (vm.count("sysconfdir"))
+    std::cout << gr_sysconfdir() << std::endl;
+
+  if (vm.count("prefsdir"))
+    std::cout << gr_prefsdir() << std::endl;
+
+  if (vm.count("builddate"))
+    std::cout << gr_build_date() << 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;
+}


Property changes on: 
gnuradio/trunk/gnuradio-core/src/lib/gnuradio-config-info.cc
___________________________________________________________________
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/balister/arm-configure/gnuradio-core/src/lib/gnuradio.cc:11398-11413
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/lib/gnuradio.cc:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/lib/gnuradio.cc:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/lib/gnuradio.cc:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/lib/gnuradio.cc:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/lib/gnuradio.cc:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/lib/gnuradio.cc:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-core/src/lib/gnuradio.cc:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/lib/gnuradio.cc:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-core/src/lib/gnuradio.cc:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/lib/gnuradio.cc:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/lib/gnuradio.cc:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-core/src/lib/gnuradio.cc:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/lib/gnuradio.cc:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/lib/gnuradio.cc:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/gnuradio.cc:11124-11148
/gnuradio/branches/developers/jcorgan/pmt-gruel/gnuradio-core/src/lib/gnuradio.cc:11453-11459
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/lib/gnuradio.cc:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-core/src/lib/gnuradio.cc:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-core/src/lib/gnuradio.cc:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-core/src/lib/gnuradio.cc:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-core/src/lib/gnuradio.cc:11235-11360