[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11418 - in gnuradio/trunk: . config debian gnuradio-c
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r11418 - in gnuradio/trunk: . config debian gnuradio-core gnuradio-core/src/lib gnuradio-core/src/lib/general gnuradio-core/src/python/gnuradio/gr gr-audio-alsa gr-audio-jack gr-audio-oss gr-audio-portaudio gr-wxgui grc |
|
Date: |
Fri, 10 Jul 2009 20:34:32 -0600 (MDT) |
Author: jcorgan
Date: 2009-07-10 20:34:31 -0600 (Fri, 10 Jul 2009)
New Revision: 11418
Added:
gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.cc.in
gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.h
gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.i
gnuradio/trunk/gnuradio-core/src/lib/gnuradio.cc
Removed:
gnuradio/trunk/gnuradio-core/src/lib/general/gr_prefix.cc.in
gnuradio/trunk/gnuradio-core/src/lib/general/gr_prefix.h
gnuradio/trunk/gnuradio-core/src/lib/general/gr_prefix.i
Modified:
gnuradio/trunk/Makefile.common
gnuradio/trunk/config/grc_gnuradio_core.m4
gnuradio/trunk/configure.ac
gnuradio/trunk/debian/
gnuradio/trunk/gnuradio-core/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/
gnuradio/trunk/gnuradio-core/src/lib/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/general/
gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/general/general.i
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/prefs.py
gnuradio/trunk/gr-audio-alsa/Makefile.am
gnuradio/trunk/gr-audio-jack/Makefile.am
gnuradio/trunk/gr-audio-oss/Makefile.am
gnuradio/trunk/gr-audio-portaudio/Makefile.am
gnuradio/trunk/gr-wxgui/Makefile.am
gnuradio/trunk/grc/Makefile.am
Log:
Implements ticket:401 and ticket:402.
Adds several API functions to determine build constants at runtime, and
a convenience command line program to display them:
>From C++:
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();
>From Python:
gr.prefix()
gr.sysconfdir()
gr.prefsdir()
gr.build_date()
gr.svn_date()
gr.svn_version()
gr.version()
The new binary is 'gnuradio' and installed on the path:
$ gnuradio
Program options: gnuradio [options]:
-h [ --help ] 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)
-v [ --version ] print gnuradio version
--svnversion print SVN repository version (SVN format)
--svndate print SVN repository date
$
Modified: gnuradio/trunk/Makefile.common
===================================================================
--- gnuradio/trunk/Makefile.common 2009-07-10 21:59:02 UTC (rev 11417)
+++ gnuradio/trunk/Makefile.common 2009-07-11 02:34:31 UTC (rev 11418)
@@ -115,7 +115,7 @@
gr_docdir = $(docdir)-$(VERSION)
# System configuration files
-gr_sysconfdir = $(sysconfdir)/$(PACKAGE)/conf.d
+gr_prefsdir = $(GR_PREFSDIR)
# Other common defines; use "+=" to add to these
STAMPS =
Modified: gnuradio/trunk/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/trunk/config/grc_gnuradio_core.m4 2009-07-10 21:59:02 UTC (rev
11417)
+++ gnuradio/trunk/config/grc_gnuradio_core.m4 2009-07-11 02:34:31 UTC (rev
11418)
@@ -86,7 +86,7 @@
gnuradio-core/src/lib/filter/Makefile \
gnuradio-core/src/lib/g72x/Makefile \
gnuradio-core/src/lib/general/Makefile \
- gnuradio-core/src/lib/general/gr_prefix.cc \
+ gnuradio-core/src/lib/general/gr_constants.cc \
gnuradio-core/src/lib/gengen/Makefile \
gnuradio-core/src/lib/io/Makefile \
gnuradio-core/src/lib/missing/Makefile \
Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2009-07-10 21:59:02 UTC (rev 11417)
+++ gnuradio/trunk/configure.ac 2009-07-11 02:34:31 UTC (rev 11418)
@@ -26,8 +26,11 @@
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gnuradio,3.3svn)
+VERSION=3.3svn
+AC_SUBST(VERSION)
+AM_INIT_AUTOMAKE(gnuradio,$VERSION)
+
DEFINES=""
AC_SUBST(DEFINES)
@@ -286,9 +289,25 @@
dnl If this is being done from a subversion tree, create variables
GR_SUBVERSION
-BUILD_DATE=`date -R`
+BUILD_DATE=`date -R -u`
AC_SUBST(BUILD_DATE)
+dnl SYSCONFDIR substitution
+if test "${sysconfdir}" == "\${prefix}/etc" ; then
+ if test "${prefix}" == "NONE" ; then
+ SYSCONFDIR=["$ac_default_prefix/etc"]
+ else
+ SYSCONFDIR=["${prefix}/etc"]
+ fi
+else
+ SYSCONFDIR=[${sysconfdir}]
+fi
+AC_SUBST(SYSCONFDIR)
+
+dnl System configuration files
+GR_PREFSDIR=[$SYSCONFDIR/${PACKAGE}/conf.d]
+AC_SUBST(GR_PREFSDIR)
+
dnl Component specific configuration
dnl The order of the GR_ macros determines the order of compilation
dnl For -any- checks on $enable_all_components
Property changes on: gnuradio/trunk/debian
___________________________________________________________________
Modified: svn:ignore
- *.log
+ changelog
*.log
Modified: gnuradio/trunk/gnuradio-core/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/Makefile.am 2009-07-10 21:59:02 UTC (rev
11417)
+++ gnuradio/trunk/gnuradio-core/Makefile.am 2009-07-11 02:34:31 UTC (rev
11418)
@@ -29,5 +29,5 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnuradio-core.pc
-etcdir = $(gr_sysconfdir)
+etcdir = $(gr_prefsdir)
dist_etc_DATA = gnuradio-core.conf
Property changes on: gnuradio/trunk/gnuradio-core/src/lib
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
+ Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
gnuradio
Modified: gnuradio/trunk/gnuradio-core/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/Makefile.am 2009-07-10 21:59:02 UTC
(rev 11417)
+++ gnuradio/trunk/gnuradio-core/src/lib/Makefile.am 2009-07-11 02:34:31 UTC
(rev 11418)
@@ -29,6 +29,8 @@
SUBDIRS += swig
endif
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
+
# generate libgnuradio-core.la from the convenience libraries in subdirs
lib_LTLIBRARIES = libgnuradio-core.la libgnuradio-core-qa.la
@@ -64,3 +66,7 @@
runtime/libruntime-qa.la \
libgnuradio-core.la \
$(CPPUNIT_LIBS)
+
+bin_PROGRAMS = gnuradio
+gnuradio_SOURCES = gnuradio.cc
+gnuradio_LDADD = libgnuradio-core.la $(BOOST_PROGRAM_OPTIONS_LIB)
Property changes on: gnuradio/trunk/gnuradio-core/src/lib/general
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
generate-stamp
GrFIRfilterCCC.cc
GrFIRfilterCCC.h
GrFIRfilterCCF.cc
GrFIRfilterCCF.h
GrFIRfilterFCC.cc
GrFIRfilterFCC.h
GrFIRfilterFFF.cc
GrFIRfilterFFF.h
GrFIRfilterFSF.cc
GrFIRfilterFSF.h
GrFIRfilterSCC.cc
GrFIRfilterSCC.h
GrFIRfilterSIS.cc
GrFIRfilterSIS.h
GrFreqXlatingFIRfilterCCC.cc
GrFreqXlatingFIRfilterCCC.h
GrFreqXlatingFIRfilterCCF.cc
GrFreqXlatingFIRfilterCCF.h
GrFreqXlatingFIRfilterFCC.cc
GrFreqXlatingFIRfilterFCC.h
GrFreqXlatingFIRfilterFCF.cc
GrFreqXlatingFIRfilterFCF.h
GrFreqXlatingFIRfilterSCC.cc
GrFreqXlatingFIRfilterSCC.h
GrFreqXlatingFIRfilterSCF.cc
GrFreqXlatingFIRfilterSCF.h
gr_fir_CCC.cc
gr_fir_CCC.h
gr_fir_CCC_generic.cc
gr_fir_CCC_generic.h
gr_fir_CCF.cc
gr_fir_CCF.h
gr_fir_CCF_generic.cc
gr_fir_CCF_generic.h
gr_fir_FCC.cc
gr_fir_FCC.h
gr_fir_FCC_generic.cc
gr_fir_FCC_generic.h
gr_fir_FFF.cc
gr_fir_FFF.h
gr_fir_FFF_generic.cc
gr_fir_FFF_generic.h
gr_fir_FSF.cc
gr_fir_FSF.h
gr_fir_FSF_generic.cc
gr_fir_FSF_generic.h
gr_fir_SCC.cc
gr_fir_SCC.h
gr_fir_SCC_generic.cc
gr_fir_SCC_generic.h
gr_fir_SIS.cc
gr_fir_SIS.h
gr_fir_SIS_generic.cc
gr_fir_SIS_generic.h
gr_fir_sysconfig.cc
gr_fir_sysconfig.h
gr_fir_sysconfig_generic.cc
gr_fir_sysconfig_generic.h
gr_fir_util.cc
gr_fir_util.h
GrFIRfilterCCC.i
GrFIRfilterCCF.i
GrFIRfilterFCC.i
GrFIRfilterFFF.i
GrFIRfilterFSF.i
GrFIRfilterSCC.i
GrFIRfilterSIS.i
GrFreqXlatingFIRfilterCCC.i
GrFreqXlatingFIRfilterCCF.i
GrFreqXlatingFIRfilterFCC.i
GrFreqXlatingFIRfilterFCF.i
GrFreqXlatingFIRfilterSCC.i
GrFreqXlatingFIRfilterSCF.i
# --- generated files ---
gr_add_cc.cc
gr_add_cc.h
gr_add_cc.i
gr_add_const_c.cc
gr_add_const_c.h
gr_add_const_c.i
gr_add_const_cc.cc
gr_add_const_cc.h
gr_add_const_cc.i
gr_add_const_f.cc
gr_add_const_f.h
gr_add_const_f.i
gr_add_const_ff.cc
gr_add_const_ff.h
gr_add_const_ff.i
gr_add_const_i.cc
gr_add_const_i.h
gr_add_const_i.i
gr_add_const_ii.cc
gr_add_const_ii.h
gr_add_const_ii.i
gr_add_const_s.cc
gr_add_const_s.h
gr_add_const_s.i
gr_add_const_sf.cc
gr_add_const_sf.h
gr_add_const_sf.i
gr_add_const_ss.cc
gr_add_const_ss.h
gr_add_const_ss.i
gr_add_const_vcc.cc
gr_add_const_vcc.h
gr_add_const_vcc.i
gr_add_const_vff.cc
gr_add_const_vff.h
gr_add_const_vff.i
gr_add_const_vii.cc
gr_add_const_vii.h
gr_add_const_vii.i
gr_add_const_vss.cc
gr_add_const_vss.h
gr_add_const_vss.i
gr_add_ff.cc
gr_add_ff.h
gr_add_ff.i
gr_add_ii.cc
gr_add_ii.h
gr_add_ii.i
gr_add_ss.cc
gr_add_ss.h
gr_add_ss.i
gr_add_vcc.cc
gr_add_vcc.h
gr_add_vcc.i
gr_add_vff.cc
gr_add_vff.h
gr_add_vff.i
gr_add_vii.cc
gr_add_vii.h
gr_add_vii.i
gr_add_vss.cc
gr_add_vss.h
gr_add_vss.i
gr_divide_cc.cc
gr_divide_cc.h
gr_divide_cc.i
gr_divide_ff.cc
gr_divide_ff.h
gr_divide_ff.i
gr_divide_ii.cc
gr_divide_ii.h
gr_divide_ii.i
gr_divide_ss.cc
gr_divide_ss.h
gr_divide_ss.i
gr_multiply_cc.cc
gr_multiply_cc.h
gr_multiply_cc.i
gr_multiply_const_cc.cc
gr_multiply_const_cc.h
gr_multiply_const_cc.i
gr_multiply_const_ff.cc
gr_multiply_const_ff.h
gr_multiply_const_ff.i
gr_multiply_const_ii.cc
gr_multiply_const_ii.h
gr_multiply_const_ii.i
gr_multiply_const_ss.cc
gr_multiply_const_ss.h
gr_multiply_const_ss.i
gr_multiply_ff.cc
gr_multiply_ff.h
gr_multiply_ff.i
gr_multiply_ii.cc
gr_multiply_ii.h
gr_multiply_ii.i
gr_multiply_ss.cc
gr_multiply_ss.h
gr_multiply_ss.i
gr_multiply_vcc.cc
gr_multiply_vcc.h
gr_multiply_vcc.i
gr_multiply_vff.cc
gr_multiply_vff.h
gr_multiply_vff.i
gr_multiply_vii.cc
gr_multiply_vii.h
gr_multiply_vii.i
gr_multiply_vss.cc
gr_multiply_vss.h
gr_multiply_vss.i
gr_multiply_const_vcc.cc
gr_multiply_const_vcc.h
gr_multiply_const_vcc.i
gr_multiply_const_vff.cc
gr_multiply_const_vff.h
gr_multiply_const_vff.i
gr_multiply_const_vii.cc
gr_multiply_const_vii.h
gr_multiply_const_vii.i
gr_multiply_const_vss.cc
gr_multiply_const_vss.h
gr_multiply_const_vss.i
gr_noise_source_c.cc
gr_noise_source_c.h
gr_noise_source_c.i
gr_noise_source_f.cc
gr_noise_source_f.h
gr_noise_source_f.i
gr_noise_source_i.cc
gr_noise_source_i.h
gr_noise_source_i.i
gr_noise_source_s.cc
gr_noise_source_s.h
gr_noise_source_s.i
gr_sig_source_c.cc
gr_sig_source_c.h
gr_sig_source_c.i
gr_sig_source_f.cc
gr_sig_source_f.h
gr_sig_source_f.i
gr_sig_source_i.cc
gr_sig_source_i.h
gr_sig_source_i.i
gr_sig_source_s.cc
gr_sig_source_s.h
gr_sig_source_s.i
gr_sub_cc.cc
gr_sub_cc.h
gr_sub_cc.i
gr_sub_ff.cc
gr_sub_ff.h
gr_sub_ff.i
gr_sub_ii.cc
gr_sub_ii.h
gr_sub_ii.i
gr_sub_ss.cc
gr_sub_ss.h
gr_sub_ss.i
gr_vector_sink_b.cc
gr_vector_sink_b.h
gr_vector_sink_b.i
gr_vector_sink_c.cc
gr_vector_sink_c.h
gr_vector_sink_c.i
gr_vector_sink_f.cc
gr_vector_sink_f.h
gr_vector_sink_f.i
gr_vector_sink_i.cc
gr_vector_sink_i.h
gr_vector_sink_i.i
gr_vector_sink_s.cc
gr_vector_sink_s.h
gr_vector_sink_s.i
gr_vector_source_b.cc
gr_vector_source_b.h
gr_vector_source_b.i
gr_vector_source_c.cc
gr_vector_source_c.h
gr_vector_source_c.i
gr_vector_source_f.cc
gr_vector_source_f.h
gr_vector_source_f.i
gr_vector_source_i.cc
gr_vector_source_i.h
gr_vector_source_i.i
gr_vector_source_s.cc
gr_vector_source_s.h
gr_vector_source_s.i
gr_mute_cc.cc
gr_mute_cc.h
gr_mute_cc.i
gr_mute_ff.cc
gr_mute_ff.h
gr_mute_ff.i
gr_mute_ii.cc
gr_mute_ii.h
gr_mute_ii.i
gr_mute_ss.cc
gr_mute_ss.h
gr_mute_ss.i
gr_prefix.cc
gr_chunks_to_symbols_bc.cc
gr_chunks_to_symbols_bc.h
gr_chunks_to_symbols_bc.i
gr_chunks_to_symbols_bf.cc
gr_chunks_to_symbols_bf.h
gr_chunks_to_symbols_bf.i
gr_chunks_to_symbols_ic.cc
gr_chunks_to_symbols_ic.h
gr_chunks_to_symbols_ic.i
gr_chunks_to_symbols_if.cc
gr_chunks_to_symbols_if.h
gr_chunks_to_symbols_if.i
gr_chunks_to_symbols_sc.cc
gr_chunks_to_symbols_sc.h
gr_chunks_to_symbols_sc.i
gr_chunks_to_symbols_sf.cc
gr_chunks_to_symbols_sf.h
gr_chunks_to_symbols_sf.i
gr_packed_to_unpacked_bb.cc
gr_packed_to_unpacked_bb.h
gr_packed_to_unpacked_bb.i
gr_packed_to_unpacked_ii.cc
gr_packed_to_unpacked_ii.h
gr_packed_to_unpacked_ii.i
gr_packed_to_unpacked_ss.cc
gr_packed_to_unpacked_ss.h
gr_packed_to_unpacked_ss.i
gr_unpacked_to_packed_bb.cc
gr_unpacked_to_packed_bb.h
gr_unpacked_to_packed_bb.i
gr_unpacked_to_packed_ii.cc
gr_unpacked_to_packed_ii.h
gr_unpacked_to_packed_ii.i
gr_unpacked_to_packed_ss.cc
gr_unpacked_to_packed_ss.h
gr_unpacked_to_packed_ss.i
# --- end generated files ---
+ Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
generate-stamp
gr_constants.cc
GrFIRfilterCCC.cc
GrFIRfilterCCC.h
GrFIRfilterCCF.cc
GrFIRfilterCCF.h
GrFIRfilterFCC.cc
GrFIRfilterFCC.h
GrFIRfilterFFF.cc
GrFIRfilterFFF.h
GrFIRfilterFSF.cc
GrFIRfilterFSF.h
GrFIRfilterSCC.cc
GrFIRfilterSCC.h
GrFIRfilterSIS.cc
GrFIRfilterSIS.h
GrFreqXlatingFIRfilterCCC.cc
GrFreqXlatingFIRfilterCCC.h
GrFreqXlatingFIRfilterCCF.cc
GrFreqXlatingFIRfilterCCF.h
GrFreqXlatingFIRfilterFCC.cc
GrFreqXlatingFIRfilterFCC.h
GrFreqXlatingFIRfilterFCF.cc
GrFreqXlatingFIRfilterFCF.h
GrFreqXlatingFIRfilterSCC.cc
GrFreqXlatingFIRfilterSCC.h
GrFreqXlatingFIRfilterSCF.cc
GrFreqXlatingFIRfilterSCF.h
gr_fir_CCC.cc
gr_fir_CCC.h
gr_fir_CCC_generic.cc
gr_fir_CCC_generic.h
gr_fir_CCF.cc
gr_fir_CCF.h
gr_fir_CCF_generic.cc
gr_fir_CCF_generic.h
gr_fir_FCC.cc
gr_fir_FCC.h
gr_fir_FCC_generic.cc
gr_fir_FCC_generic.h
gr_fir_FFF.cc
gr_fir_FFF.h
gr_fir_FFF_generic.cc
gr_fir_FFF_generic.h
gr_fir_FSF.cc
gr_fir_FSF.h
gr_fir_FSF_generic.cc
gr_fir_FSF_generic.h
gr_fir_SCC.cc
gr_fir_SCC.h
gr_fir_SCC_generic.cc
gr_fir_SCC_generic.h
gr_fir_SIS.cc
gr_fir_SIS.h
gr_fir_SIS_generic.cc
gr_fir_SIS_generic.h
gr_fir_sysconfig.cc
gr_fir_sysconfig.h
gr_fir_sysconfig_generic.cc
gr_fir_sysconfig_generic.h
gr_fir_util.cc
gr_fir_util.h
GrFIRfilterCCC.i
GrFIRfilterCCF.i
GrFIRfilterFCC.i
GrFIRfilterFFF.i
GrFIRfilterFSF.i
GrFIRfilterSCC.i
GrFIRfilterSIS.i
GrFreqXlatingFIRfilterCCC.i
GrFreqXlatingFIRfilterCCF.i
GrFreqXlatingFIRfilterFCC.i
GrFreqXlatingFIRfilterFCF.i
GrFreqXlatingFIRfilterSCC.i
GrFreqXlatingFIRfilterSCF.i
# --- generated files ---
gr_add_cc.cc
gr_add_cc.h
gr_add_cc.i
gr_add_const_c.cc
gr_add_const_c.h
gr_add_const_c.i
gr_add_const_cc.cc
gr_add_const_cc.h
gr_add_const_cc.i
gr_add_const_f.cc
gr_add_const_f.h
gr_add_const_f.i
gr_add_const_ff.cc
gr_add_const_ff.h
gr_add_const_ff.i
gr_add_const_i.cc
gr_add_const_i.h
gr_add_const_i.i
gr_add_const_ii.cc
gr_add_const_ii.h
gr_add_const_ii.i
gr_add_const_s.cc
gr_add_const_s.h
gr_add_const_s.i
gr_add_const_sf.cc
gr_add_const_sf.h
gr_add_const_sf.i
gr_add_const_ss.cc
gr_add_const_ss.h
gr_add_const_ss.i
gr_add_const_vcc.cc
gr_add_const_vcc.h
gr_add_const_vcc.i
gr_add_const_vff.cc
gr_add_const_vff.h
gr_add_const_vff.i
gr_add_const_vii.cc
gr_add_const_vii.h
gr_add_const_vii.i
gr_add_const_vss.cc
gr_add_const_vss.h
gr_add_const_vss.i
gr_add_ff.cc
gr_add_ff.h
gr_add_ff.i
gr_add_ii.cc
gr_add_ii.h
gr_add_ii.i
gr_add_ss.cc
gr_add_ss.h
gr_add_ss.i
gr_add_vcc.cc
gr_add_vcc.h
gr_add_vcc.i
gr_add_vff.cc
gr_add_vff.h
gr_add_vff.i
gr_add_vii.cc
gr_add_vii.h
gr_add_vii.i
gr_add_vss.cc
gr_add_vss.h
gr_add_vss.i
gr_divide_cc.cc
gr_divide_cc.h
gr_divide_cc.i
gr_divide_ff.cc
gr_divide_ff.h
gr_divide_ff.i
gr_divide_ii.cc
gr_divide_ii.h
gr_divide_ii.i
gr_divide_ss.cc
gr_divide_ss.h
gr_divide_ss.i
gr_multiply_cc.cc
gr_multiply_cc.h
gr_multiply_cc.i
gr_multiply_const_cc.cc
gr_multiply_const_cc.h
gr_multiply_const_cc.i
gr_multiply_const_ff.cc
gr_multiply_const_ff.h
gr_multiply_const_ff.i
gr_multiply_const_ii.cc
gr_multiply_const_ii.h
gr_multiply_const_ii.i
gr_multiply_const_ss.cc
gr_multiply_const_ss.h
gr_multiply_const_ss.i
gr_multiply_ff.cc
gr_multiply_ff.h
gr_multiply_ff.i
gr_multiply_ii.cc
gr_multiply_ii.h
gr_multiply_ii.i
gr_multiply_ss.cc
gr_multiply_ss.h
gr_multiply_ss.i
gr_multiply_vcc.cc
gr_multiply_vcc.h
gr_multiply_vcc.i
gr_multiply_vff.cc
gr_multiply_vff.h
gr_multiply_vff.i
gr_multiply_vii.cc
gr_multiply_vii.h
gr_multiply_vii.i
gr_multiply_vss.cc
gr_multiply_vss.h
gr_multiply_vss.i
gr_multiply_const_vcc.cc
gr_multiply_const_vcc.h
gr_multiply_const_vcc.i
gr_multiply_const_vff.cc
gr_multiply_const_vff.h
gr_multiply_const_vff.i
gr_multiply_const_vii.cc
gr_multiply_const_vii.h
gr_multiply_const_vii.i
gr_multiply_const_vss.cc
gr_multiply_const_vss.h
gr_multiply_const_vss.i
gr_noise_source_c.cc
gr_noise_source_c.h
gr_noise_source_c.i
gr_noise_source_f.cc
gr_noise_source_f.h
gr_noise_source_f.i
gr_noise_source_i.cc
gr_noise_source_i.h
gr_noise_source_i.i
gr_noise_source_s.cc
gr_noise_source_s.h
gr_noise_source_s.i
gr_sig_source_c.cc
gr_sig_source_c.h
gr_sig_source_c.i
gr_sig_source_f.cc
gr_sig_source_f.h
gr_sig_source_f.i
gr_sig_source_i.cc
gr_sig_source_i.h
gr_sig_source_i.i
gr_sig_source_s.cc
gr_sig_source_s.h
gr_sig_source_s.i
gr_sub_cc.cc
gr_sub_cc.h
gr_sub_cc.i
gr_sub_ff.cc
gr_sub_ff.h
gr_sub_ff.i
gr_sub_ii.cc
gr_sub_ii.h
gr_sub_ii.i
gr_sub_ss.cc
gr_sub_ss.h
gr_sub_ss.i
gr_vector_sink_b.cc
gr_vector_sink_b.h
gr_vector_sink_b.i
gr_vector_sink_c.cc
gr_vector_sink_c.h
gr_vector_sink_c.i
gr_vector_sink_f.cc
gr_vector_sink_f.h
gr_vector_sink_f.i
gr_vector_sink_i.cc
gr_vector_sink_i.h
gr_vector_sink_i.i
gr_vector_sink_s.cc
gr_vector_sink_s.h
gr_vector_sink_s.i
gr_vector_source_b.cc
gr_vector_source_b.h
gr_vector_source_b.i
gr_vector_source_c.cc
gr_vector_source_c.h
gr_vector_source_c.i
gr_vector_source_f.cc
gr_vector_source_f.h
gr_vector_source_f.i
gr_vector_source_i.cc
gr_vector_source_i.h
gr_vector_source_i.i
gr_vector_source_s.cc
gr_vector_source_s.h
gr_vector_source_s.i
gr_mute_cc.cc
gr_mute_cc.h
gr_mute_cc.i
gr_mute_ff.cc
gr_mute_ff.h
gr_mute_ff.i
gr_mute_ii.cc
gr_mute_ii.h
gr_mute_ii.i
gr_mute_ss.cc
gr_mute_ss.h
gr_mute_ss.i
gr_chunks_to_symbols_bc.cc
gr_chunks_to_symbols_bc.h
gr_chunks_to_symbols_bc.i
gr_chunks_to_symbols_bf.cc
gr_chunks_to_symbols_bf.h
gr_chunks_to_symbols_bf.i
gr_chunks_to_symbols_ic.cc
gr_chunks_to_symbols_ic.h
gr_chunks_to_symbols_ic.i
gr_chunks_to_symbols_if.cc
gr_chunks_to_symbols_if.h
gr_chunks_to_symbols_if.i
gr_chunks_to_symbols_sc.cc
gr_chunks_to_symbols_sc.h
gr_chunks_to_symbols_sc.i
gr_chunks_to_symbols_sf.cc
gr_chunks_to_symbols_sf.h
gr_chunks_to_symbols_sf.i
gr_packed_to_unpacked_bb.cc
gr_packed_to_unpacked_bb.h
gr_packed_to_unpacked_bb.i
gr_packed_to_unpacked_ii.cc
gr_packed_to_unpacked_ii.h
gr_packed_to_unpacked_ii.i
gr_packed_to_unpacked_ss.cc
gr_packed_to_unpacked_ss.h
gr_packed_to_unpacked_ss.i
gr_unpacked_to_packed_bb.cc
gr_unpacked_to_packed_bb.h
gr_unpacked_to_packed_bb.i
gr_unpacked_to_packed_ii.cc
gr_unpacked_to_packed_ii.h
gr_unpacked_to_packed_ii.i
gr_unpacked_to_packed_ss.cc
gr_unpacked_to_packed_ss.h
gr_unpacked_to_packed_ss.i
# --- end generated files ---
Modified: gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am 2009-07-10
21:59:02 UTC (rev 11417)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.am 2009-07-11
02:34:31 UTC (rev 11418)
@@ -31,7 +31,7 @@
EXTRA_DIST = \
gen_sine_table.py \
- gr_prefix.cc.in
+ gr_constants.cc.in
libgeneral_la_SOURCES = \
gr_agc_cc.cc \
@@ -117,7 +117,7 @@
gr_pll_freqdet_cf.cc \
gr_pll_refout_cc.cc \
gr_pn_correlator_cc.cc \
- gr_prefix.cc \
+ gr_constants.cc \
gr_prefs.cc \
gr_probe_avg_mag_sqrd_c.cc \
gr_probe_avg_mag_sqrd_cf.cc \
@@ -273,7 +273,7 @@
gr_pll_freqdet_cf.h \
gr_pll_refout_cc.h \
gr_pn_correlator_cc.h \
- gr_prefix.h \
+ gr_constants.h \
gr_prefs.h \
gr_probe_avg_mag_sqrd_c.h \
gr_probe_avg_mag_sqrd_cf.h \
@@ -432,7 +432,7 @@
gr_pll_freqdet_cf.i \
gr_pll_refout_cc.i \
gr_pn_correlator_cc.i \
- gr_prefix.i \
+ gr_constants.i \
gr_prefs.i \
gr_probe_avg_mag_sqrd_c.i \
gr_probe_avg_mag_sqrd_cf.i \
Modified: gnuradio/trunk/gnuradio-core/src/lib/general/general.i
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/general.i 2009-07-10
21:59:02 UTC (rev 11417)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/general.i 2009-07-11
02:34:31 UTC (rev 11418)
@@ -105,7 +105,7 @@
#include <gr_pa_2x2_phase_combiner.h>
#include <gr_kludge_copy.h>
#include <gr_prefs.h>
-#include <gr_prefix.h>
+#include <gr_constants.h>
#include <gr_test_types.h>
#include <gr_test.h>
#include <gr_unpack_k_bits_bb.h>
@@ -225,7 +225,7 @@
%include "gr_pa_2x2_phase_combiner.i"
%include "gr_kludge_copy.i"
%include "gr_prefs.i"
-%include "gr_prefix.i"
+%include "gr_constants.i"
%include "gr_test_types.h"
%include "gr_test.i"
%include "gr_unpack_k_bits_bb.i"
Copied: gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.cc.in (from
rev 11409, gnuradio/trunk/gnuradio-core/src/lib/general/gr_prefix.cc.in)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.cc.in
(rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.cc.in
2009-07-11 02:34:31 UTC (rev 11418)
@@ -0,0 +1,69 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,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>
+
+const std::string
+gr_prefix()
+{
+ return "@prefix@";
+}
+
+const std::string
+gr_sysconfdir()
+{
+ return "@SYSCONFDIR@";
+}
+
+const std::string
+gr_prefsdir()
+{
+ return "@GR_PREFSDIR@";
+}
+
+const std::string
+gr_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()
+{
+ return "@VERSION@";
+}
Property changes on:
gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.cc.in
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:mergeinfo
+
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/lib/general/gr_prefix.cc.in:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/lib/general/gr_prefix.cc.in:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/lib/general/gr_prefix.cc.in:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/lib/general/gr_prefix.cc.in:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/lib/general/gr_prefix.cc.in:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/lib/general/gr_prefix.cc.in:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-core/src/lib/general/gr_prefix.cc.in:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/lib/general/gr_prefix.cc.in:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-core/src/lib/general/gr_prefix.cc.in:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/lib/general/gr_prefix.cc.in:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/lib/general/gr_prefix.cc.in:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-core/src/lib/general/gr_prefix.cc.in:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/lib/general/gr_prefix.cc.in:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/lib/general/gr_prefix.cc.in:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/general/gr_prefix.cc.in:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/lib/general/gr_prefix.cc.in:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-core/src/lib/general/gr_prefix.cc.in:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-core/src/lib/general/gr_prefix.cc.in:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-core/src/lib/general/gr_prefix.cc.in:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-core/src/lib/general/gr_prefix.cc.in:11235-11360
Added: svn:eol-style
+ native
Copied: gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.h (from rev
11409, gnuradio/trunk/gnuradio-core/src/lib/general/gr_prefix.h)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.h
(rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.h 2009-07-11
02:34:31 UTC (rev 11418)
@@ -0,0 +1,62 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006,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.
+ */
+#ifndef INCLUDED_GR_CONSTANTS_H
+#define INCLUDED_GR_CONSTANTS_H
+
+#include <string>
+
+/*!
+ * \brief return ./configure --prefix argument. Typically /usr/local
+ */
+const std::string gr_prefix();
+
+/*!
+ * \brief return ./configure --sysconfdir argument. Typically $prefix/etc or
/etc
+ */
+const std::string gr_sysconfdir();
+
+/*!
+ * \brief return preferences file directory. Typically $sysconfdir/etc/conf.d
+ */
+const std::string gr_prefsdir();
+
+/*!
+ * \brief return date/time of build, as set when 'bootstrap' is run
+ */
+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
+ */
+const std::string gr_version();
+
+#endif /* INCLUDED_GR_CONSTANTS_H */
Property changes on: gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:mergeinfo
+
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/lib/general/gr_prefix.h:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/lib/general/gr_prefix.h:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/lib/general/gr_prefix.h:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/lib/general/gr_prefix.h:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/lib/general/gr_prefix.h:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/lib/general/gr_prefix.h:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-core/src/lib/general/gr_prefix.h:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/lib/general/gr_prefix.h:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-core/src/lib/general/gr_prefix.h:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/lib/general/gr_prefix.h:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/lib/general/gr_prefix.h:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-core/src/lib/general/gr_prefix.h:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/lib/general/gr_prefix.h:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/lib/general/gr_prefix.h:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/general/gr_prefix.h:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/lib/general/gr_prefix.h:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-core/src/lib/general/gr_prefix.h:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-core/src/lib/general/gr_prefix.h:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-core/src/lib/general/gr_prefix.h:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-core/src/lib/general/gr_prefix.h:11235-11360
Added: svn:eol-style
+ native
Copied: gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.i (from rev
11409, gnuradio/trunk/gnuradio-core/src/lib/general/gr_prefix.i)
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.i
(rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.i 2009-07-11
02:34:31 UTC (rev 11418)
@@ -0,0 +1,17 @@
+/* -*- c++ -*- */
+
+%rename(prefix) gr_prefix;
+%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();
+const std::string gr_svn_date();
+const std::string gr_svn_version();
+const std::string gr_version();
Property changes on: gnuradio/trunk/gnuradio-core/src/lib/general/gr_constants.i
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:mergeinfo
+
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/lib/general/gr_prefix.i:10638-10648
/gnuradio/branches/developers/eb/t364/gnuradio-core/src/lib/general/gr_prefix.i:11016-11017
/gnuradio/branches/developers/eb/t367/gnuradio-core/src/lib/general/gr_prefix.i:11021-11025
/gnuradio/branches/developers/eb/t371/gnuradio-core/src/lib/general/gr_prefix.i:10958-10971
/gnuradio/branches/developers/eb/t378/gnuradio-core/src/lib/general/gr_prefix.i:10683-10688
/gnuradio/branches/developers/jblum/grc/gnuradio-core/src/lib/general/gr_prefix.i:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/gnuradio-core/src/lib/general/gr_prefix.i:10464-10658
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/lib/general/gr_prefix.i:10667-10677
/gnuradio/branches/developers/jblum/wxgui/gnuradio-core/src/lib/general/gr_prefix.i:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/gnuradio-core/src/lib/general/gr_prefix.i:10818-10858
/gnuradio/branches/developers/jcorgan/deb/gnuradio-core/src/lib/general/gr_prefix.i:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/gnuradio-core/src/lib/general/gr_prefix.i:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/gnuradio-core/src/lib/general/gr_prefix.i:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/gnuradio-core/src/lib/general/gr_prefix.i:10771-10887
/gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/general/gr_prefix.i:11124-11148
/gnuradio/branches/developers/jcorgan/t161/gnuradio-core/src/lib/general/gr_prefix.i:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/gnuradio-core/src/lib/general/gr_prefix.i:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/gnuradio-core/src/lib/general/gr_prefix.i:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/gnuradio-core/src/lib/general/gr_prefix.i:10540-10546
/gnuradio/branches/developers/trondeau/qt/gnuradio-core/src/lib/general/gr_prefix.i:11235-11360
Added: svn:eol-style
+ native
Added: gnuradio/trunk/gnuradio-core/src/lib/gnuradio.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gnuradio.cc
(rev 0)
+++ gnuradio/trunk/gnuradio-core/src/lib/gnuradio.cc 2009-07-11 02:34:31 UTC
(rev 11418)
@@ -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;
+}
Modified: gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/prefs.py
===================================================================
--- gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/prefs.py
2009-07-10 21:59:02 UTC (rev 11417)
+++ gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/prefs.py
2009-07-11 02:34:31 UTC (rev 11418)
@@ -33,7 +33,7 @@
return os.path.expanduser('~/.gnuradio/config.conf')
def _sys_prefs_dirname():
- return os.path.join(gsp.prefix(), 'etc/gnuradio/conf.d')
+ return gsp.prefsdir()
def _bool(x):
"""
Modified: gnuradio/trunk/gr-audio-alsa/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-alsa/Makefile.am 2009-07-10 21:59:02 UTC (rev
11417)
+++ gnuradio/trunk/gr-audio-alsa/Makefile.am 2009-07-11 02:34:31 UTC (rev
11418)
@@ -26,5 +26,5 @@
pkgconfigdir = $(libdir)/pkgconfig
dist_pkgconfig_DATA = gnuradio-audio-alsa.pc
-etcdir = $(gr_sysconfdir)
+etcdir = $(gr_prefsdir)
dist_etc_DATA = gr-audio-alsa.conf
Modified: gnuradio/trunk/gr-audio-jack/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-jack/Makefile.am 2009-07-10 21:59:02 UTC (rev
11417)
+++ gnuradio/trunk/gr-audio-jack/Makefile.am 2009-07-11 02:34:31 UTC (rev
11418)
@@ -26,5 +26,5 @@
pkgconfigdir = $(libdir)/pkgconfig
dist_pkgconfig_DATA = gnuradio-audio-jack.pc
-etcdir = $(gr_sysconfdir)
+etcdir = $(gr_prefsdir)
dist_etc_DATA = gr-audio-jack.conf
Modified: gnuradio/trunk/gr-audio-oss/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-oss/Makefile.am 2009-07-10 21:59:02 UTC (rev
11417)
+++ gnuradio/trunk/gr-audio-oss/Makefile.am 2009-07-11 02:34:31 UTC (rev
11418)
@@ -26,5 +26,5 @@
pkgconfigdir = $(libdir)/pkgconfig
dist_pkgconfig_DATA = gnuradio-audio-oss.pc
-etcdir = $(gr_sysconfdir)
+etcdir = $(gr_prefsdir)
dist_etc_DATA = gr-audio-oss.conf
Modified: gnuradio/trunk/gr-audio-portaudio/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/Makefile.am 2009-07-10 21:59:02 UTC
(rev 11417)
+++ gnuradio/trunk/gr-audio-portaudio/Makefile.am 2009-07-11 02:34:31 UTC
(rev 11418)
@@ -26,5 +26,5 @@
pkgconfigdir = $(libdir)/pkgconfig
dist_pkgconfig_DATA = gnuradio-audio-portaudio.pc
-etcdir = $(gr_sysconfdir)
+etcdir = $(gr_prefsdir)
dist_etc_DATA = gr-audio-portaudio.conf
Modified: gnuradio/trunk/gr-wxgui/Makefile.am
===================================================================
--- gnuradio/trunk/gr-wxgui/Makefile.am 2009-07-10 21:59:02 UTC (rev 11417)
+++ gnuradio/trunk/gr-wxgui/Makefile.am 2009-07-11 02:34:31 UTC (rev 11418)
@@ -29,7 +29,7 @@
if PYTHON
SUBDIRS = src
-etcdir = $(gr_sysconfdir)
+etcdir = $(gr_prefsdir)
dist_etc_DATA = gr-wxgui.conf
pkgconfigdir = $(libdir)/pkgconfig
Modified: gnuradio/trunk/grc/Makefile.am
===================================================================
--- gnuradio/trunk/grc/Makefile.am 2009-07-10 21:59:02 UTC (rev 11417)
+++ gnuradio/trunk/grc/Makefile.am 2009-07-11 02:34:31 UTC (rev 11418)
@@ -39,7 +39,7 @@
ourpythondir = $(grc_src_prefix)
ourpython_PYTHON = __init__.py
-etcdir = $(gr_sysconfdir)
+etcdir = $(gr_prefsdir)
dist_etc_DATA = grc.conf
EXTRA_DIST = \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11418 - in gnuradio/trunk: . config debian gnuradio-core gnuradio-core/src/lib gnuradio-core/src/lib/general gnuradio-core/src/python/gnuradio/gr gr-audio-alsa gr-audio-jack gr-audio-oss gr-audio-portaudio gr-wxgui grc,
jcorgan <=