commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r3263 - in gnuradio/branches/developers/jcorgan/ezdop:


From: jcorgan
Subject: [Commit-gnuradio] r3263 - in gnuradio/branches/developers/jcorgan/ezdop: . config gr-atsc/src/python gr-audio-osx/src gr-gsm-fr-vocoder/src/python gr-radio-astronomy/src/python gr-trellis/src/python gr-usrp/src
Date: Sat, 12 Aug 2006 15:18:17 -0600 (MDT)

Author: jcorgan
Date: 2006-08-12 15:18:16 -0600 (Sat, 12 Aug 2006)
New Revision: 3263

Modified:
   gnuradio/branches/developers/jcorgan/ezdop/config/grc_usrp.m4
   gnuradio/branches/developers/jcorgan/ezdop/configure.ac
   gnuradio/branches/developers/jcorgan/ezdop/gr-atsc/src/python/run_tests.in
   gnuradio/branches/developers/jcorgan/ezdop/gr-audio-osx/src/mld_threads.h
   gnuradio/branches/developers/jcorgan/ezdop/gr-audio-osx/src/run_tests.in
   
gnuradio/branches/developers/jcorgan/ezdop/gr-gsm-fr-vocoder/src/python/run_tests.in
   
gnuradio/branches/developers/jcorgan/ezdop/gr-radio-astronomy/src/python/run_tests.in
   gnuradio/branches/developers/jcorgan/ezdop/gr-trellis/src/python/run_tests.in
   gnuradio/branches/developers/jcorgan/ezdop/gr-usrp/src/run_tests.in
Log:
Merged -r3251:HEAD into jcorgan/ezdop.

Modified: gnuradio/branches/developers/jcorgan/ezdop/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ezdop/config/grc_usrp.m4       
2006-08-12 21:13:37 UTC (rev 3262)
+++ gnuradio/branches/developers/jcorgan/ezdop/config/grc_usrp.m4       
2006-08-12 21:18:16 UTC (rev 3263)
@@ -59,11 +59,11 @@
     dnl check for SDCC 2.4.0
     USRP_SDCC([2.4.0],[],[succeeded=no])
     
-    AC_CHECK_FUNCS([getrusage sched_setscheduler],[],[succeeded=no])
-    AC_CHECK_FUNCS([sigaction snprintf],[],[succeeded=no])
+    AC_CHECK_FUNCS([getrusage sched_setscheduler])
+    AC_CHECK_FUNCS([sigaction snprintf])
 
     dnl we use these to handle possible byteswapping to and from the USRP.
-    AC_CHECK_HEADERS([byteswap.h],[],[succeeeded=no])
+    AC_CHECK_HEADERS([byteswap.h])
     AC_C_BIGENDIAN
 
     if test $succeeded = yes; then

Modified: gnuradio/branches/developers/jcorgan/ezdop/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ezdop/configure.ac     2006-08-12 
21:13:37 UTC (rev 3262)
+++ gnuradio/branches/developers/jcorgan/ezdop/configure.ac     2006-08-12 
21:18:16 UTC (rev 3263)
@@ -150,25 +150,25 @@
 dnl The order of the GR_ macros determines the order of compilation
 subdirs="config"
 GRC_GNURADIO_CORE
-#GRC_GNURADIO_EXAMPLES
-#GRC_USRP
-#GRC_GR_USRP                   dnl this must come after GRC_USRP
-#GRC_GR_AUDIO_ALSA
-#GRC_GR_AUDIO_JACK
-#GRC_GR_AUDIO_OSS
-#GRC_GR_AUDIO_OSX              dnl ***NOT TESTED***
-#GRC_GR_AUDIO_PORTAUDIO                dnl ***NOT TESTED***
-#GRC_GR_AUDIO_WINDOWS          dnl ***NOT TESTED***
-#GRC_GR_ATSC
-#GRC_GR_COMEDI
+GRC_GNURADIO_EXAMPLES
+GRC_USRP
+GRC_GR_USRP                    dnl this must come after GRC_USRP
+GRC_GR_AUDIO_ALSA
+GRC_GR_AUDIO_JACK
+GRC_GR_AUDIO_OSS
+GRC_GR_AUDIO_OSX               dnl ***NOT TESTED***
+GRC_GR_AUDIO_PORTAUDIO         dnl ***NOT TESTED***
+GRC_GR_AUDIO_WINDOWS           dnl ***NOT TESTED***
+GRC_GR_ATSC
+GRC_GR_COMEDI
 #GRC_GR_ERROR_CORRECTING_CODES  dnl disabled until fix for ticket:25
-#GRC_GR_GSM_FR_VOCODER
-#GRC_GR_RADAR
-#GRC_GR_RADIO_ASTRONOMY
-#GRC_GR_VIDEO_SDL
-#GRC_GR_WXGUI
-#GRC_PMT
-#GRC_GR_TRELLIS
+GRC_GR_GSM_FR_VOCODER
+GRC_GR_RADAR
+GRC_GR_RADIO_ASTRONOMY
+GRC_GR_VIDEO_SDL
+GRC_GR_WXGUI
+GRC_PMT
+GRC_GR_TRELLIS
 GRC_EZDOP
 GRC_GR_EZDOP                   dnl this must come after GRC_EZDOP
 

Modified: 
gnuradio/branches/developers/jcorgan/ezdop/gr-atsc/src/python/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/ezdop/gr-atsc/src/python/run_tests.in  
2006-08-12 21:13:37 UTC (rev 3262)
+++ gnuradio/branches/developers/jcorgan/ezdop/gr-atsc/src/python/run_tests.in  
2006-08-12 21:18:16 UTC (rev 3263)
@@ -25,6 +25,10 @@
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
+DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.

Modified: 
gnuradio/branches/developers/jcorgan/ezdop/gr-audio-osx/src/mld_threads.h
===================================================================
--- gnuradio/branches/developers/jcorgan/ezdop/gr-audio-osx/src/mld_threads.h   
2006-08-12 21:13:37 UTC (rev 3262)
+++ gnuradio/branches/developers/jcorgan/ezdop/gr-audio-osx/src/mld_threads.h   
2006-08-12 21:18:16 UTC (rev 3263)
@@ -26,7 +26,7 @@
 /* classes which allow for either pthreads or omni_threads */
 
 #ifdef _USE_OMNI_THREADS_
-#include <gnuradio/omnithread.h>
+#include <omnithread.h>
 #else
 #include <pthread.h>
 #endif

Modified: 
gnuradio/branches/developers/jcorgan/ezdop/gr-audio-osx/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/ezdop/gr-audio-osx/src/run_tests.in    
2006-08-12 21:13:37 UTC (rev 3262)
+++ gnuradio/branches/developers/jcorgan/ezdop/gr-audio-osx/src/run_tests.in    
2006-08-12 21:18:16 UTC (rev 3263)
@@ -27,6 +27,10 @@
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
+DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.

Modified: 
gnuradio/branches/developers/jcorgan/ezdop/gr-gsm-fr-vocoder/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ezdop/gr-gsm-fr-vocoder/src/python/run_tests.in
        2006-08-12 21:13:37 UTC (rev 3262)
+++ 
gnuradio/branches/developers/jcorgan/ezdop/gr-gsm-fr-vocoder/src/python/run_tests.in
        2006-08-12 21:18:16 UTC (rev 3263)
@@ -25,6 +25,10 @@
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
+DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.

Modified: 
gnuradio/branches/developers/jcorgan/ezdop/gr-radio-astronomy/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ezdop/gr-radio-astronomy/src/python/run_tests.in
       2006-08-12 21:13:37 UTC (rev 3262)
+++ 
gnuradio/branches/developers/jcorgan/ezdop/gr-radio-astronomy/src/python/run_tests.in
       2006-08-12 21:18:16 UTC (rev 3263)
@@ -25,6 +25,10 @@
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
+DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.

Modified: 
gnuradio/branches/developers/jcorgan/ezdop/gr-trellis/src/python/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ezdop/gr-trellis/src/python/run_tests.in   
    2006-08-12 21:13:37 UTC (rev 3262)
+++ 
gnuradio/branches/developers/jcorgan/ezdop/gr-trellis/src/python/run_tests.in   
    2006-08-12 21:18:16 UTC (rev 3263)
@@ -25,6 +25,10 @@
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
+DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.

Modified: gnuradio/branches/developers/jcorgan/ezdop/gr-usrp/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/ezdop/gr-usrp/src/run_tests.in 
2006-08-12 21:13:37 UTC (rev 3262)
+++ gnuradio/branches/developers/jcorgan/ezdop/gr-usrp/src/run_tests.in 
2006-08-12 21:18:16 UTC (rev 3263)
@@ -28,6 +28,10 @@
 PYTHONPATH="$grbld:$libbld:$libbld/.libs:$libsrc:$py:$usrpbld:$PYTHONPATH"
 export PYTHONPATH
 
+# For OS/X
address@hidden@/gnuradio-core/src/lib/.libs:@abs_top_builddir@/usrp/host/lib/.libs
+export DYLD_LIBRARY_PATH
+
 #
 # This is the simple part...
 # Run everything that matches qa_*.py and return the final result.





reply via email to

[Prev in Thread] Current Thread [Next in Thread]