Merged eb/usrp-install r4723:4727 into trunk.

This moves usrp related .py files from the top-level of site-packages
into site-packages/usrpm.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4728 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/Makefile.common b/Makefile.common
index fe026b227b9e0831a5151b4de8516257bac71983..35ff203954eacf26c3dc4bda1feaa0ab1688cfeb 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -28,13 +28,21 @@ grincludedir   = $(includedir)/gnuradio
 # swig includes 
 swigincludedir = $(grincludedir)/swig
 
-# Install this stuff in the appropriate subdirectory
+# Install the gnuradio stuff in the appropriate subdirectory
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
 
 grpythondir = $(pythondir)/gnuradio
 grpyexecdir = $(pyexecdir)/gnuradio
 
+# Install the non-gnuradio usrp stuff in the appropriate subdirectory
+# This usually ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/usrpm
+
+usrppythondir = $(pythondir)/usrpm
+usrppyexecdir = $(pyexecdir)/usrpm
+
+
 # swig flags
 SWIGPYTHONFLAGS = -fvirtual -python -modern
 

diff --git a/gnuradio-examples/python/apps/hf_radio/input.py b/gnuradio-examples/python/apps/hf_radio/input.py
index 3a62a68cc79c6860cc728df06dc46cce5d2e0e10..a7c8712878515648f7df9eb0fb71ab49ae79779c 100644 (file)
--- a/gnuradio-examples/python/apps/hf_radio/input.py
+++ b/gnuradio-examples/python/apps/hf_radio/input.py
@@ -7,7 +7,7 @@
  
 from gnuradio import gr, gru, optfir
 from gnuradio import usrp
-import usrp_dbid
+from usrpm import usrp_dbid
 import math
 
 # Put special knowlege of usrp here.

diff --git a/gnuradio-examples/python/multi-antenna/multi_fft.py b/gnuradio-examples/python/multi-antenna/multi_fft.py
index ca9c614a88f19c590228b1882fead9d68b1f3327..3a8d48195628f95f0206570725f6fd2af25397c8 100755 (executable)
--- a/gnuradio-examples/python/multi-antenna/multi_fft.py
+++ b/gnuradio-examples/python/multi-antenna/multi_fft.py
@@ -8,7 +8,7 @@ from gnuradio import optfir
 from optparse import OptionParser
 from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider
 import wx
-import usrp_dbid
+from usrpm import usrp_dbid
 import time
 import os.path
 import sys

diff --git a/gnuradio-examples/python/multi-antenna/multi_file.py b/gnuradio-examples/python/multi-antenna/multi_file.py
index e2a6e04f6842cd032724614a0e1967838c88ac37..d5a5d8721ef9b9f68b470cfe7bb29cad7abd1b41 100755 (executable)
--- a/gnuradio-examples/python/multi-antenna/multi_file.py
+++ b/gnuradio-examples/python/multi-antenna/multi_file.py
@@ -8,7 +8,7 @@ from gnuradio import optfir
 from optparse import OptionParser
 from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider
 import wx
-import usrp_dbid
+from usrpm import usrp_dbid
 import time
 import os.path
 import sys

diff --git a/gnuradio-examples/python/multi-antenna/multi_scope.py b/gnuradio-examples/python/multi-antenna/multi_scope.py
index 43aa77b0d67cf848281ed8a3705678a3dbef401e..b35e9165198470b1c5c3f7c3a6939b7d882f87f6 100755 (executable)
--- a/gnuradio-examples/python/multi-antenna/multi_scope.py
+++ b/gnuradio-examples/python/multi-antenna/multi_scope.py
@@ -8,7 +8,7 @@ from gnuradio import optfir
 from optparse import OptionParser
 from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider
 import wx
-import usrp_dbid
+from usrpm import usrp_dbid
 import time
 import os.path
 import sys

diff --git a/gnuradio-examples/python/usrp/fm_tx4.py b/gnuradio-examples/python/usrp/fm_tx4.py
index a9201b3f4d5e8a517827ba277fea30d074c39663..da887d8bfd531f425420a3d2737948e25850895b 100755 (executable)
--- a/gnuradio-examples/python/usrp/fm_tx4.py
+++ b/gnuradio-examples/python/usrp/fm_tx4.py
@@ -18,7 +18,7 @@ from gnuradio import audio
 from gnuradio import blks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
 import math
 import sys
 

diff --git a/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py b/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
index 1cb161018fb90106be94c5e59db903764e09385e..66ee9f02d60c58c1efdf2ec9a608fcc0cd7a248b 100755 (executable)
--- a/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
+++ b/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
@@ -17,7 +17,7 @@ from gnuradio import audio
 from gnuradio import blks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
 import math
 import sys
 

diff --git a/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py b/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
index 9415cfab93da1fe76575edc6383eea405fa9aed3..798c4a7ebaf8de9b54fa0ba849fa0b6b3574cadb 100755 (executable)
--- a/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
+++ b/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
@@ -31,7 +31,7 @@ from gnuradio import audio
 from gnuradio import blks
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import stdgui, fftsink, scopesink, slider, form
-import usrp_dbid
+from usrpm import usrp_dbid
 
 from Numeric import convolve, array
 

diff --git a/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py b/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py
index 018a5b76e898b5a0e7d083915041d281db6a2dd0..868dee5ccb6c938c1ff577846b1855d32bb30631 100755 (executable)
--- a/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py
+++ b/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py
@@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui, fftsink, form
 from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
 import sys
 import math
 import wx

diff --git a/gnuradio-examples/python/usrp/usrp_spectrum_sense.py b/gnuradio-examples/python/usrp/usrp_spectrum_sense.py
index 182d055a6314c30e98f1d36845f28d7dcc0afdba..1d86e03cc1cb37fb90fcab7e8cb42cb63ed07f59 100755 (executable)
--- a/gnuradio-examples/python/usrp/usrp_spectrum_sense.py
+++ b/gnuradio-examples/python/usrp/usrp_spectrum_sense.py
@@ -6,7 +6,7 @@ from gnuradio import usrp
 from gnuradio import blks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
 import sys
 import math
 import struct

diff --git a/gnuradio-examples/python/usrp/usrp_tv_rcv.py b/gnuradio-examples/python/usrp/usrp_tv_rcv.py
index e8e439b80d7bad17e866f3698c0a282bd834048c..8fabc2b47046e0e0b9ba89530dea467ef6eb8a2c 100755 (executable)
--- a/gnuradio-examples/python/usrp/usrp_tv_rcv.py
+++ b/gnuradio-examples/python/usrp/usrp_tv_rcv.py
@@ -21,7 +21,7 @@ from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui, fftsink, form
 from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
 import sys
 import math
 import wx

diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
index 2844387317e306e0b248b39ccfbdcbaf89c76cc8..9ffb41fb0f04de77576671b58579f66f670883de 100755 (executable)
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
+++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
@@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui, fftsink, form
 from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
 import sys
 import math
 import wx

diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
index 40e7dd754cd36afc1cc1f3168a8976d93b36a620..efb0448fa207bfa6d4964fba76adc7747b20d0a3 100755 (executable)
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
+++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
@@ -6,7 +6,7 @@ from gnuradio import usrp
 from gnuradio import blks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
 import sys
 import math
 

diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
index 2e9acf4dc2909292de0e5211263c4ad0383ede1d..9aeae1171f067331fe3ca268150d172ee790cda0 100755 (executable)
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
+++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
@@ -6,7 +6,7 @@ from gnuradio import usrp
 from gnuradio import blks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
 import sys
 import math
 

diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
index b03f0944fdc5e7f315ee1f382f733a3eb7a49c49..1d4fb3370c447f35db4bf9f39ed2fed45ba78b6a 100755 (executable)
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
+++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
@@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui, fftsink, form, scopesink
 from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
 import sys
 import math
 import wx

diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py
index 640ffe872c8ca28b3abb40280f0c4835103c0c2e..4daa401f7a76a165f2dcf8843709118762aa4484 100644 (file)
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py
+++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py
@@ -59,7 +59,7 @@ from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui, fftsink, form
 from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
 import sys
 import math
 import wx

diff --git a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py b/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py
index dd565196779c54f4d9b13e20a08ced012b5a83a2..39ad688e1e4ae58dae384d092522dcfea7ae802d 100755 (executable)
--- a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py
+++ b/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py
@@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import slider, powermate
 from gnuradio.wxgui import stdgui, fftsink, form
 from optparse import OptionParser
-import usrp_dbid
+from usrpm import usrp_dbid
 import sys
 import math
 import wx

diff --git a/gr-radio-astronomy/src/python/usrp_psr_receiver.py b/gr-radio-astronomy/src/python/usrp_psr_receiver.py
index 91cb2e7ef3d26eba86ef509d1ecd2f818bad7ed0..759022cfb31475c6455313c203a62bc4b187921e 100755 (executable)
--- a/gr-radio-astronomy/src/python/usrp_psr_receiver.py
+++ b/gr-radio-astronomy/src/python/usrp_psr_receiver.py
@@ -30,7 +30,7 @@
 #
 #
 from gnuradio import gr, gru, blks, audio
-import usrp_dbid
+from usrpm import usrp_dbid
 from gnuradio import usrp, optfir
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option

diff --git a/gr-radio-astronomy/src/python/usrp_ra_receiver.py b/gr-radio-astronomy/src/python/usrp_ra_receiver.py
index 78c9b1e4736305d5d0f2a6a8dc1b1f22695599e9..2ecf946cba1a3bbfef3186982d344fa82a21df28 100755 (executable)
--- a/gr-radio-astronomy/src/python/usrp_ra_receiver.py
+++ b/gr-radio-astronomy/src/python/usrp_ra_receiver.py
@@ -22,7 +22,7 @@
 
 from gnuradio import gr, gru
 from gnuradio import usrp
-import usrp_dbid
+from usrpm import usrp_dbid
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import stdgui, ra_fftsink, ra_stripchartsink, ra_waterfallsink, form, slider

diff --git a/gr-usrp/src/db_base.py b/gr-usrp/src/db_base.py
index 0f34cd0acf28e127e375cd9e3007c9853a163e46..589af75466679f6e6f68ed11c97a1cd449ac78f2 100644 (file)
--- a/gr-usrp/src/db_base.py
+++ b/gr-usrp/src/db_base.py
@@ -19,9 +19,9 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import usrp_prims
 import weakref
-from usrp_fpga_regs import *
+from usrpm import usrp_prims
+from usrpm.usrp_fpga_regs import *
 
 class db_base(object):
     """

diff --git a/gr-usrp/src/db_basic.py b/gr-usrp/src/db_basic.py
index 1d936f2f59307ea19961268ffa093da0c684daf7..7d65ac1833931fef5265678628b255f047803fac 100644 (file)
--- a/gr-usrp/src/db_basic.py
+++ b/gr-usrp/src/db_basic.py
@@ -20,7 +20,7 @@
 # 
 
 import sys
-import usrp_dbid
+from usrpm import usrp_dbid
 import db_base
 import db_instantiator
 

diff --git a/gr-usrp/src/db_dbs_rx.py b/gr-usrp/src/db_dbs_rx.py
index 59c9a989779f06e69c0b6c07e1d2e18e246a7f13..5541df8c7407ab932413ac279d61065f0255ecc6 100644 (file)
--- a/gr-usrp/src/db_dbs_rx.py
+++ b/gr-usrp/src/db_dbs_rx.py
@@ -20,7 +20,7 @@
 # 
 
 import math
-import usrp_dbid
+from usrpm import usrp_dbid
 import db_base
 import db_instantiator
 

diff --git a/gr-usrp/src/db_flexrf.py b/gr-usrp/src/db_flexrf.py
index 5d8f4d88196fce3ad0b6b36ee580a9da6a9c869d..271b14728baf9d5c3100c83ff51c83a5dbd77425 100644 (file)
--- a/gr-usrp/src/db_flexrf.py
+++ b/gr-usrp/src/db_flexrf.py
@@ -22,10 +22,10 @@
 from gnuradio import usrp1
 import time,math
 
-import usrp_dbid
+from usrpm import usrp_dbid
 import db_base
 import db_instantiator
-from usrp_fpga_regs import *
+from usrpm.usrp_fpga_regs import *
 
 #debug_using_gui = True                  # Must be set to True or False
 debug_using_gui = False                  # Must be set to True or False

diff --git a/gr-usrp/src/db_flexrf_mimo.py b/gr-usrp/src/db_flexrf_mimo.py
index e961e0902134e37d9da10e7603564ed459b8014f..7fed805f648e95fef81d29d04db148cfff388aa5 100644 (file)
--- a/gr-usrp/src/db_flexrf_mimo.py
+++ b/gr-usrp/src/db_flexrf_mimo.py
@@ -22,10 +22,10 @@
 from gnuradio import usrp1
 import time,math
 
-import usrp_dbid
+from usrpm import usrp_dbid
 import db_base
 import db_instantiator
-from usrp_fpga_regs import *
+from usrpm.usrp_fpga_regs import *
 from db_flexrf import *
 
 # self._u.fpga_master_clock_freq()

diff --git a/gr-usrp/src/db_tv_rx.py b/gr-usrp/src/db_tv_rx.py
index 026f3e11a83adf2007c1f0bffe693753bf75a6ab..9fed8c52cefedb6a1c178e8407dd47129feafb66 100644 (file)
--- a/gr-usrp/src/db_tv_rx.py
+++ b/gr-usrp/src/db_tv_rx.py
@@ -22,7 +22,7 @@
 __all__ = ['tv_rx']
 
 import math
-import usrp_dbid
+from usrpm import usrp_dbid
 import db_base
 import db_instantiator
 

diff --git a/gr-usrp/src/usrp.py b/gr-usrp/src/usrp.py
index 90fb9695dd93d35aa4a140dc7e81c85ef6643b24..78e6c10182fb938ef5e2b93e232dfd748a1af2b5 100644 (file)
--- a/gr-usrp/src/usrp.py
+++ b/gr-usrp/src/usrp.py
@@ -21,11 +21,11 @@
 
 
 
-import usrp_prims
-import usrp_dbid
+from usrpm import usrp_prims
+from usrpm import usrp_dbid
 from gnuradio import usrp1              # usrp Rev 1 and later
 from gnuradio import gru
-from usrp_fpga_regs import *
+from usrpm.usrp_fpga_regs import *
 
 FPGA_MODE_NORMAL   = usrp1.FPGA_MODE_NORMAL
 FPGA_MODE_LOOPBACK = usrp1.FPGA_MODE_LOOPBACK

diff --git a/gr-usrp/src/usrp_multi.py b/gr-usrp/src/usrp_multi.py
index 6bda538fa1e962a76a738438afe2aab3fb36bb55..65c6c0b87cf4319527ed322b4c2e887682fccf68 100644 (file)
--- a/gr-usrp/src/usrp_multi.py
+++ b/gr-usrp/src/usrp_multi.py
@@ -25,7 +25,7 @@ from gnuradio.gr import hier_block_base
 from gnuradio import usrp
 from gnuradio import usrp1              # usrp Rev 1 and later
 from gnuradio import blks
-import usrp_prims
+from usrpm import usrp_prims
 import sys
 
 

diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
index 83f2984e7795420935d4d80e7d1a2a084273ca98..7d17a380af45493ba8201c60c103d8084470afd6 100644 (file)
--- a/usrp/host/lib/Makefile.am
+++ b/usrp/host/lib/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  USRP - Universal Software Radio Peripheral
 # 
-#  Copyright (C) 2003,2004,2006 Free Software Foundation, Inc.
+#  Copyright (C) 2003,2004,2006,2007 Free Software Foundation, Inc.
 # 
 #  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
@@ -137,7 +137,7 @@ noinst_HEADERS =                    \
        rate_to_regval.h                \
        usrp_local_sighandler.h         
 
-python_PYTHON =                                \
+usrppython_PYTHON =                    \
        usrp_dbid.py                    
 
 noinst_PYTHON =                                \

diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index be3bbf2a9f6acb03424ef4468e6401b1575b386a..8868d1ecb99153fd3385c99574cbe96fe221f897 100644 (file)
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2003,2004,2006 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,11 +21,9 @@
 
 include $(top_srcdir)/Makefile.common
 
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/usrp_prims
+ourpythondir = $(usrppythondir)
+ourlibdir    = $(usrppyexecdir)
 
-ourpythondir = $(pythondir)
-ourlibdir    = $(pyexecdir)
 
 INCLUDES = $(USRP_INCLUDES)            \
           $(PYTHON_CPPFLAGS)           \

diff --git a/usrp/host/swig/usrp_fpga_regs.py b/usrp/host/swig/usrp_fpga_regs.py
index 1b8b19cad93b36d1be26ad68126352aa70c5959f..e022518bdf9c6ca808832f6b66d3f799b58c7440 100644 (file)
--- a/usrp/host/swig/usrp_fpga_regs.py
+++ b/usrp/host/swig/usrp_fpga_regs.py
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import usrp_prims
+from usrpm import usrp_prims
 
 # Copy everything that starts with FR_ or bmFR_ from the usrp_prims
 # name space into our name space.  This is effectively a python binding for