[Commit-gnuradio] r7634 - in gnuradio/branches/developers/jcorgan/usrpdb: . config usrpdb/src

[michaelld]

Author: michaelld
Date: 2008-02-11 13:35:31 -0700 (Mon, 11 Feb 2008)
New Revision: 7634

Modified:
   gnuradio/branches/developers/jcorgan/usrpdb/config/grc_usrp.m4
   gnuradio/branches/developers/jcorgan/usrpdb/config/grc_usrpdb.m4
   gnuradio/branches/developers/jcorgan/usrpdb/run_tests.sh.in
   gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_basic_rx.py
   gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_basic_tx.py
   gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_dbsrx.py
   gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_lfrx.py
   gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_lftx.py
   gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_usrpdb.py
Log:
usrpdb now:
* passes "make check"
* can be used with either "--enable" or "--with"
* is required for building 'usrp' component
Works on OSX 10.5; will test on Ubuntu 6.10 and 7.10.



Modified: gnuradio/branches/developers/jcorgan/usrpdb/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/usrpdb/config/grc_usrp.m4      
2008-02-11 16:01:31 UTC (rev 7633)
+++ gnuradio/branches/developers/jcorgan/usrpdb/config/grc_usrp.m4      
2008-02-11 20:35:31 UTC (rev 7634)
@@ -99,7 +99,7 @@
                ;;
         esac
         passed=yes
-       # Don't do usrp if omnithread, mblock, or pmt skipped
+       # Don't do usrp if omnithread, mblock, pmt, or usrpdb skipped
        if test x$omnithread_skipped = xyes; then
             AC_MSG_RESULT([Component usrp requires omnithread, which is not 
being built or specified via pre-installed files.])
            passed=no
@@ -112,6 +112,10 @@
             AC_MSG_RESULT([Component usrp requires pmt, which is not being 
built or specified via pre-installed files.])
             passed=no
         fi
+        if test x$usrpdb_skipped = xyes; then
+            AC_MSG_RESULT([Component usrp requires usrpdb, which is not being 
built or specified via pre-installed files.])
+            passed=no
+        fi
        # Don't do mblock if guile not available (inband requires it)
        AC_PATH_PROG(GUILE,guile)
        if test "$GUILE" = "" ; then

Modified: gnuradio/branches/developers/jcorgan/usrpdb/config/grc_usrpdb.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/usrpdb/config/grc_usrpdb.m4    
2008-02-11 16:01:31 UTC (rev 7633)
+++ gnuradio/branches/developers/jcorgan/usrpdb/config/grc_usrpdb.m4    
2008-02-11 20:35:31 UTC (rev 7634)
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+dnl Copyright 2008 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -19,17 +19,40 @@
 
 AC_DEFUN([GRC_USRPDB],[
     GRC_ENABLE([usrpdb])
+    GRC_WITH([usrpdb])
+    passed=no
+    if test x$with_usrpdb = xyes; then
+        if test x$enable_usrpdb = xyes; then
+           AC_MSG_ERROR([Component usrpdb: Cannot use both --enable and 
--with])
+        else
+           # on to the regular routine
+           PKG_CHECK_MODULES(USRPDB, usrpdb, passed=with,
+                   AC_MSG_RESULT([Component usrpdb: PKGCONFIG cannot find 
info]))
+            if test x$passed = xwith; then
+                usrpdb_INCLUDES=`$PKG_CONFIG --cflags-only-I usrp`
+               usrpdb_LA=$USRP_LIBS
+           fi
+       fi
+    fi
+    dnl if $passed = with, then "--with" worked; ignore the "--enable" stuff
+    dnl otherwise, $passed = no; check the "--enable" stuff
+    if test x$passed = xno; then
+        AC_CONFIG_FILES([ \
+           usrpdb/Makefile \
+           usrpdb/usrpdb.pc \
+            usrpdb/src/Makefile \
+           usrpdb/src/run_tests \
+        ])
 
-    AC_CONFIG_FILES([ \
-       usrpdb/Makefile \
-       usrpdb/usrpdb.pc \
-        usrpdb/src/Makefile \
-       usrpdb/src/run_tests \
+        passed=yes
+       usrpdb_INCLUDES="-I\${abs_top_srcdir}/usrpdb/src"
+        usrpdb_LA="\${abs_top_builddir}/usrpdb/src/libusrpdb.la"
+    fi
+    GRC_BUILD_CONDITIONAL([usrpdb],[
+        dnl run_tests is created from run_tests.in.  Make it executable.
+       AC_CONFIG_COMMANDS([run_tests_usrpdb], [chmod +x usrpdb/src/run_tests])
     ])
 
-    passed=yes
-    GRC_BUILD_CONDITIONAL([usrpdb],[
-       dnl run_tests is created from run_tests.in.  Make it executable.
-        AC_CONFIG_COMMANDS([run_tests_usrpdb], [chmod +x usrpdb/src/run_tests])
-       ])
+    AC_SUBST(usrpdb_INCLUDES)
+    AC_SUBST(usrpdb_LA)
 ])

Modified: gnuradio/branches/developers/jcorgan/usrpdb/run_tests.sh.in
===================================================================
--- gnuradio/branches/developers/jcorgan/usrpdb/run_tests.sh.in 2008-02-11 
16:01:31 UTC (rev 7633)
+++ gnuradio/branches/developers/jcorgan/usrpdb/run_tests.sh.in 2008-02-11 
20:35:31 UTC (rev 7634)
@@ -75,47 +75,46 @@
     fi
 done
 
-# Add the grlibdir paths to the front of any PATH variable
+# Add 'mylibdir' to the start of the library load path, to get local
+# (to this component) created libraries
+
+# For OS/X
+if [ "$DYLD_LIBRARY_PATH" = "" ]
+then
+    DYLD_LIBRARY_PATH=$mylibdir
+else
+    DYLD_LIBRARY_PATH=$mylibdir:$DYLD_LIBRARY_PATH
+fi
+
+# For Win32
+if [ "$PATH" = "" ]
+then
+    PATH=$mylibdir
+else
+    PATH=$mylibdir:$PATH
+fi
+
+# DYLD_LIBRARY_PATH and PATH will not be empty now
+
+# Add the grlibdir paths to the front of any library load variable
 if [ "$grlibdir" != "" ]
 then
     # For OS/X
-    if [ "$DYLD_LIBRARY_PATH" = "" ]
-    then
-       DYLD_LIBRARY_PATH=$grlibdir
-    else
-       DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH
-    fi
-
+    DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH
     # For Win32
-    if [ "$PATH" = "" ]
-    then
-       PATH=$grlibdir
-    else
-       PATH=$grlibdir:$PATH
-    fi
+    PATH=$grlibdir:$PATH
 fi
 
 # Where to find pre-installed libraries
 address@hidden@
 
-# Add the withdirs paths to the end of any PATH variable
+# Add the withdirs paths to the end of any library load variable
 if [ "$withlibdirs" != "" ]
 then
     # For OS/X
-    if [ "$DYLD_LIBRARY_PATH" = "" ]
-    then
-       DYLD_LIBRARY_PATH=$withlibdirs
-    else
-       DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$withlibdirs
-    fi
-
+    DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$withlibdirs
     # For Win32
-    if [ "$PATH" = "" ]
-    then
-       PATH=$withlibdirs
-    else
-       PATH=$PATH:$withlibdirs
-    fi
+    PATH=$PATH:$withlibdirs
 fi
 
 export DYLD_LIBRARY_PATH

Modified: gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_basic_rx.py
===================================================================
--- gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_basic_rx.py       
2008-02-11 16:01:31 UTC (rev 7633)
+++ gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_basic_rx.py       
2008-02-11 20:35:31 UTC (rev 7634)
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
+from gnuradio import gr_unittest
 import usrpdb
 
 class qa_basic_rx(gr_unittest.TestCase):

Modified: gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_basic_tx.py
===================================================================
--- gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_basic_tx.py       
2008-02-11 16:01:31 UTC (rev 7633)
+++ gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_basic_tx.py       
2008-02-11 20:35:31 UTC (rev 7634)
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
+from gnuradio import gr_unittest
 import usrpdb
 
 class qa_basic_tx(gr_unittest.TestCase):

Modified: gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_dbsrx.py
===================================================================
--- gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_dbsrx.py  
2008-02-11 16:01:31 UTC (rev 7633)
+++ gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_dbsrx.py  
2008-02-11 20:35:31 UTC (rev 7634)
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
+from gnuradio import gr_unittest
 import usrpdb
 
 class qa_dbsrx(gr_unittest.TestCase):

Modified: gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_lfrx.py
===================================================================
--- gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_lfrx.py   
2008-02-11 16:01:31 UTC (rev 7633)
+++ gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_lfrx.py   
2008-02-11 20:35:31 UTC (rev 7634)
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
+from gnuradio import gr_unittest
 import usrpdb
 
 class qa_lfrx(gr_unittest.TestCase):

Modified: gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_lftx.py
===================================================================
--- gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_lftx.py   
2008-02-11 16:01:31 UTC (rev 7633)
+++ gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_lftx.py   
2008-02-11 20:35:31 UTC (rev 7634)
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
+from gnuradio import gr_unittest
 import usrpdb
 
 class qa_lftx(gr_unittest.TestCase):

Modified: gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_usrpdb.py
===================================================================
--- gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_usrpdb.py 
2008-02-11 16:01:31 UTC (rev 7633)
+++ gnuradio/branches/developers/jcorgan/usrpdb/usrpdb/src/qa_usrpdb.py 
2008-02-11 20:35:31 UTC (rev 7634)
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
+from gnuradio import gr_unittest
 import usrpdb
 
 class qa_usrpdb (gr_unittest.TestCase):