[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3443 - in gnuradio/branches/developers/jcorgan/wip: .
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r3443 - in gnuradio/branches/developers/jcorgan/wip: . config gnuradio-core/src/lib/filter gnuradio-core/src/python/gnuradio/gr gr-atsc/src/python gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-error-correcting-codes/src/lib/libecc/mld gr-error-correcting-codes/src/python gr-ezdop/src/python gr-gsm-fr-vocoder/src/python gr-radar/src/lib gr-radar/src/python gr-radio-astronomy/src/python gr-trellis gr-trellis/doc gr-trellis/src/lib gr-trellis/src/python gr-usrp/src gr-video-sdl/src |
|
Date: |
Sun, 27 Aug 2006 13:07:13 -0600 (MDT) |
Author: jcorgan
Date: 2006-08-27 13:07:13 -0600 (Sun, 27 Aug 2006)
New Revision: 3443
Added:
gnuradio/branches/developers/jcorgan/wip/run_tests.sh.in
Modified:
gnuradio/branches/developers/jcorgan/wip/
gnuradio/branches/developers/jcorgan/wip/Makefile.am
gnuradio/branches/developers/jcorgan/wip/config/grc_usrp.m4
gnuradio/branches/developers/jcorgan/wip/configure.ac
gnuradio/branches/developers/jcorgan/wip/gnuradio-core/src/lib/filter/assembly.h
gnuradio/branches/developers/jcorgan/wip/gnuradio-core/src/python/gnuradio/gr/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-atsc/src/python/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-audio-alsa/src/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-audio-jack/src/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-audio-oss/src/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-audio-osx/src/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-audio-portaudio/src/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-audio-windows/src/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-comedi/src/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/libecc/mld/n2bs.cc
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/libecc/mld/n2bs.h
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/python/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/python/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-ezdop/src/python/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-gsm-fr-vocoder/src/python/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-radar/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-radar/src/python/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-radio-astronomy/src/python/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-trellis/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-trellis/doc/
gnuradio/branches/developers/jcorgan/wip/gr-trellis/doc/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-trellis/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/wip/gr-trellis/src/python/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-usrp/src/run_tests.in
gnuradio/branches/developers/jcorgan/wip/gr-video-sdl/src/run_tests.in
Log:
Merged -r3418:3441 from trunk into jcorgan/wip.
Property changes on: gnuradio/branches/developers/jcorgan/wip
___________________________________________________________________
Name: svn:ignore
- configure
Makefile.in
config.log
config.guess
config.h
ltmain.sh
config.sub
Makefile
config.status
stamp-h1
config.h.in
autom4te.cache
libtool
missing
aclocal.m4
install-sh
depcomp
py-compile
compile
build
+ configure
Makefile.in
config.log
config.guess
config.h
ltmain.sh
config.sub
Makefile
config.status
stamp-h1
config.h.in
autom4te.cache
libtool
missing
aclocal.m4
install-sh
depcomp
py-compile
compile
build
run_tests.sh
Modified: gnuradio/branches/developers/jcorgan/wip/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/Makefile.am 2006-08-27
19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/Makefile.am 2006-08-27
19:07:13 UTC (rev 3443)
@@ -21,10 +21,11 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
- bootstrap \
- configure \
- config.h.in
+EXTRA_DIST = \
+ bootstrap \
+ configure \
+ config.h.in \
+ run_tests.sh.in
SUBDIRS = @build_dirs@
DIST_SUBDIRS = @build_dirs@ @skipped_dirs@
Modified: gnuradio/branches/developers/jcorgan/wip/config/grc_usrp.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/config/grc_usrp.m4 2006-08-27
19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/config/grc_usrp.m4 2006-08-27
19:07:13 UTC (rev 3443)
@@ -48,8 +48,6 @@
UTILS_FUNC_MKSTEMP
# These checks don't fail
- AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
- AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
AC_C_BIGENDIAN
AC_CHECK_HEADERS([byteswap.h])
AC_CHECK_FUNCS([getrusage sched_setscheduler])
Modified: gnuradio/branches/developers/jcorgan/wip/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/configure.ac 2006-08-27
19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/configure.ac 2006-08-27
19:07:13 UTC (rev 3443)
@@ -47,6 +47,9 @@
GR_NO_UNDEFINED dnl do we need the -no-undefined linker flag
GR_SCRIPTING
+AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
+AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
+
dnl Checks for libraries.
AC_CHECK_LIB(socket,socket)
@@ -187,9 +190,13 @@
AC_CONFIG_FILES([\
Makefile \
+ run_tests.sh
config/Makefile
])
+dnl run_tests.sh is created from run_tests.in.sh. Make it executable.
+AC_CONFIG_COMMANDS([run_tests_build], [chmod +x run_tests.sh])
+
AC_OUTPUT
echo
Modified:
gnuradio/branches/developers/jcorgan/wip/gnuradio-core/src/lib/filter/assembly.h
===================================================================
---
gnuradio/branches/developers/jcorgan/wip/gnuradio-core/src/lib/filter/assembly.h
2006-08-27 19:03:39 UTC (rev 3442)
+++
gnuradio/branches/developers/jcorgan/wip/gnuradio-core/src/lib/filter/assembly.h
2006-08-27 19:07:13 UTC (rev 3443)
@@ -23,10 +23,19 @@
#ifndef _ASSEMBLY_H_
#define _ASSEMBLY_H_
+#if defined (__APPLE__) && defined (__APPLE_CC__)
+// XCode ignores the .scl and .type functions in XCode 2.2.1 and 2.3,
+// but creates an error in XCode 2.4. Just ignore them.
-#ifndef __ELF__
+#define GLOB_SYMB(f) _ ## f
+#define DEF_FUNC_HEAD(f) /* none */
+
+#define FUNC_TAIL(f) /* none*/
+
+#elif !defined (__ELF__)
+
/*
* Too bad, the following define does not work as expected --SF
* #define GLOB_SYMB(f) __USER_LABEL_PREFIX__ ## f
Modified:
gnuradio/branches/developers/jcorgan/wip/gnuradio-core/src/python/gnuradio/gr/run_tests.in
===================================================================
---
gnuradio/branches/developers/jcorgan/wip/gnuradio-core/src/python/gnuradio/gr/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++
gnuradio/branches/developers/jcorgan/wip/gnuradio-core/src/python/gnuradio/gr/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,33 +1,14 @@
#!/bin/sh
address@hidden@/gnuradio-core/src/lib/swig
address@hidden@/gnuradio-core/src/lib/swig
address@hidden@/gnuradio-core/src/python
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-PYTHONPATH="$swigbld:$swigbld/.libs:$swigsrc:$py"
-export PYTHONPATH
+# Note: calling master run_tests.sh in gnuradio core is not strictly
+# correct, as it will result in a partially bogus PYTHONPATH, but it
+# does make the correct paths in the second half so all is well.
-# for OS/X
-DYLD_LIBRARY_PATH="@abs_top_builddir@/gnuradio-core/src/lib/.libs"
-export DYLD_LIBRARY_PATH
-
-# Don't load user or system prefs
-GR_DONT_LOAD_PREFS=1
-export GR_DONT_LOAD_PREFS
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- echo $file
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gnuradio-core \
+ @abs_top_builddir@/gnuradio-core \
+ @srcdir@
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-atsc/src/python/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-atsc/src/python/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-atsc/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,51 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-atsc/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-atsc/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-atsc/src/python
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-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.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-atsc \
+ @abs_top_builddir@/gr-atsc \
+ @srcdir@
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-audio-alsa/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-audio-alsa/src/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-audio-alsa/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-alsa/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-alsa/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-alsa/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-alsa \
+ @abs_top_builddir@/gr-audio-alsa \
+ @srcdir@
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-audio-jack/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-audio-jack/src/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-audio-jack/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-jack/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-jack/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-jack/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-jack \
+ @abs_top_builddir@/gr-audio-jack \
+ @srcdir@
Modified: gnuradio/branches/developers/jcorgan/wip/gr-audio-oss/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-audio-oss/src/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-audio-oss/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-oss/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-oss/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-oss/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-oss \
+ @abs_top_builddir@/gr-audio-oss \
+ @srcdir@
Modified: gnuradio/branches/developers/jcorgan/wip/gr-audio-osx/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-audio-osx/src/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-audio-osx/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,53 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-osx/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-osx/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-osx/src
-
-# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-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.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-osx \
+ @abs_top_builddir@/gr-audio-osx \
+ @srcdir@
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-audio-portaudio/src/run_tests.in
===================================================================
---
gnuradio/branches/developers/jcorgan/wip/gr-audio-portaudio/src/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++
gnuradio/branches/developers/jcorgan/wip/gr-audio-portaudio/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-portaudio/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-portaudio/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-portaudio/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-portaudio \
+ @abs_top_builddir@/gr-audio-portaudio \
+ @srcdir@
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-audio-windows/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-audio-windows/src/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-audio-windows/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-audio-windows/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-audio-windows/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-audio-windows/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-audio-windows \
+ @abs_top_builddir@/gr-audio-windows \
+ @srcdir@
Modified: gnuradio/branches/developers/jcorgan/wip/gr-comedi/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-comedi/src/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-comedi/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,49 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-comedi/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-comedi/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-comedi/src
-
-# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-comedi \
+ @abs_top_builddir@/gr-comedi \
+ @srcdir@
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/libecc/mld/n2bs.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/libecc/mld/n2bs.cc
2006-08-27 19:03:39 UTC (rev 3442)
+++
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/libecc/mld/n2bs.cc
2006-08-27 19:07:13 UTC (rev 3443)
@@ -25,11 +25,11 @@
static const int g_num_bits_per_byte = 8;
-std::string DoIt (int64_t number, size_t digits)
+std::string DoIt (long long number, char digits)
{
std::string retVal (digits, '0');
if (number != 0)
- for (int n = --digits; n >= 0; n--) {
+ for (char n = digits-1; n >= 0; n--) {
if (number & 1) {
retVal[n] = '1';
}
@@ -38,51 +38,63 @@
return (retVal);
}
-std::string n2bs (int8_t number, size_t digits)
+std::string n2bs (char number, unsigned char digits)
{
- if (digits > (sizeof (int8_t) * g_num_bits_per_byte))
- digits = sizeof (int8_t);
- return DoIt ((int64_t) number, digits);
+ if (digits > (unsigned char)(sizeof (char) * g_num_bits_per_byte))
+ digits = sizeof (char) * g_num_bits_per_byte;
+ return DoIt ((long long) number, (char) digits);
}
-std::string n2bs (int16_t number, size_t digits)
+std::string n2bs (short number, unsigned char digits)
{
- if (digits > (sizeof (int16_t) * g_num_bits_per_byte))
- digits = sizeof (int16_t);
- return DoIt ((int64_t) number, digits);
+ if (digits > (unsigned char)(sizeof (short) * g_num_bits_per_byte))
+ digits = sizeof (short) * g_num_bits_per_byte;
+ return DoIt ((long long) number, (char) digits);
}
-std::string n2bs (int32_t number, size_t digits)
+std::string n2bs (int number, unsigned char digits)
{
- if (digits > (sizeof (int32_t) * g_num_bits_per_byte))
- digits = sizeof (int32_t);
- return DoIt ((int64_t) number, digits);
+ if (digits > (unsigned char)(sizeof (int) * g_num_bits_per_byte))
+ digits = sizeof (int) * g_num_bits_per_byte;
+ return DoIt ((long long) number, (char) digits);
}
-std::string n2bs (int64_t number, size_t digits)
+std::string n2bs (long number, unsigned char digits)
{
- if (digits > (sizeof (int64_t) * g_num_bits_per_byte))
- digits = sizeof (int64_t);
- return DoIt (number, digits);
+ if (digits > (unsigned char)(sizeof (long long) * g_num_bits_per_byte))
+ digits = sizeof (long long) * g_num_bits_per_byte;
+ return DoIt (number, (char) digits);
}
-std::string n2bs (u_int8_t number, size_t digits)
+std::string n2bs (long long number, unsigned char digits)
{
- if (digits > (sizeof (u_int8_t) * g_num_bits_per_byte))
- digits = sizeof (u_int8_t);
- return DoIt ((int64_t) number, digits);
+ if (digits > (unsigned char)(sizeof (long long) * g_num_bits_per_byte))
+ digits = sizeof (long long) * g_num_bits_per_byte;
+ return DoIt (number, (char) digits);
}
-std::string n2bs (u_int16_t number, size_t digits)
+std::string n2bs (unsigned char number, unsigned char digits)
{
- if (digits > (sizeof (u_int16_t) * g_num_bits_per_byte))
- digits = sizeof (u_int16_t);
- return DoIt ((int64_t) number, digits);
+ if (digits > (unsigned char)(sizeof (unsigned char) * g_num_bits_per_byte))
+ digits = sizeof (unsigned char) * g_num_bits_per_byte;
+ return DoIt ((long long) number, (char) digits);
}
-std::string n2bs (u_int32_t number, size_t digits)
+std::string n2bs (unsigned short number, unsigned char digits)
{
- if (digits > (sizeof (u_int32_t) * g_num_bits_per_byte))
- digits = sizeof (u_int32_t);
- return DoIt ((int64_t) number, digits);
+ if (digits > (unsigned char)(sizeof (unsigned short) * g_num_bits_per_byte))
+ digits = sizeof (unsigned short) * g_num_bits_per_byte;
+ return DoIt ((long long) number, (char) digits);
}
-std::string n2bs (u_int64_t number, size_t digits)
+std::string n2bs (unsigned int number, unsigned char digits)
{
- if (digits > (sizeof (u_int64_t) * g_num_bits_per_byte))
- digits = sizeof (u_int64_t);
- return DoIt ((int64_t) number, digits);
+ if (digits > (unsigned char)(sizeof (unsigned int) * g_num_bits_per_byte))
+ digits = sizeof (unsigned int) * g_num_bits_per_byte;
+ return DoIt ((long long) number, (char) digits);
}
+std::string n2bs (unsigned long number, unsigned char digits)
+{
+ if (digits > (unsigned char)(sizeof (unsigned long long) *
g_num_bits_per_byte))
+ digits = sizeof (unsigned long long) * g_num_bits_per_byte;
+ return DoIt ((long long) number, (char) digits);
+}
+std::string n2bs (unsigned long long number, unsigned char digits)
+{
+ if (digits > (unsigned char)(sizeof (unsigned long long) *
g_num_bits_per_byte))
+ digits = sizeof (unsigned long long) * g_num_bits_per_byte;
+ return DoIt ((long long) number, (char) digits);
+}
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/libecc/mld/n2bs.h
===================================================================
---
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/libecc/mld/n2bs.h
2006-08-27 19:03:39 UTC (rev 3442)
+++
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/lib/libecc/mld/n2bs.h
2006-08-27 19:07:13 UTC (rev 3443)
@@ -25,21 +25,204 @@
#include <string>
-std::string n2bs (int8_t number, size_t digits);
-std::string n2bs (int16_t number, size_t digits);
-std::string n2bs (int32_t number, size_t digits);
-#if 1
-std::string n2bs (long number, size_t digits);
-#endif
-std::string n2bs (int64_t number, size_t digits);
-std::string n2bs (u_int8_t number, size_t digits);
-std::string n2bs (u_int16_t number, size_t digits);
-std::string n2bs (u_int32_t number, size_t digits);
-#if 1
-std::string n2bs (unsigned long number, size_t digits);
-#endif
-std::string n2bs (u_int64_t number, size_t digits);
+std::string n2bs (char number, unsigned char digits);
+std::string n2bs (short number, unsigned char digits);
+std::string n2bs (int number, unsigned char digits);
+std::string n2bs (long number, unsigned char digits);
+std::string n2bs (long long number, unsigned char digits);
+std::string n2bs (unsigned char number, unsigned char digits);
+std::string n2bs (unsigned short number, unsigned char digits);
+std::string n2bs (unsigned int number, unsigned char digits);
+std::string n2bs (unsigned long number, unsigned char digits);
+std::string n2bs (unsigned long long number, unsigned char digits);
-void cout_binary (int number, int digits);
+inline std::string n2bs (char number, char digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (short number, char digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (int number, char digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long number, char digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long long number, char digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned char number, char digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned short number, char digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned int number, char digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long number, char digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long long number, char digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (char number, unsigned short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (short number, unsigned short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (int number, unsigned short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long number, unsigned short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long long number, unsigned short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned char number, unsigned short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned short number, unsigned short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned int number, unsigned short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long number, unsigned short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long long number, unsigned short digits)
+{return (n2bs (number, (unsigned char) digits));};
+
+inline std::string n2bs (char number, short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (short number, short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (int number, short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long number, short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long long number, short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned char number, short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned short number, short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned int number, short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long number, short digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long long number, short digits)
+{return (n2bs (number, (unsigned char) digits));};
+
+inline std::string n2bs (char number, unsigned int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (short number, unsigned int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (int number, unsigned int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long number, unsigned int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long long number, unsigned int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned char number, unsigned int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned short number, unsigned int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned int number, unsigned int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long number, unsigned int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long long number, unsigned int digits)
+{return (n2bs (number, (unsigned char) digits));};
+
+inline std::string n2bs (char number, int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (short number, int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (int number, int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long number, int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long long number, int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned char number, int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned short number, int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned int number, int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long number, int digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long long number, int digits)
+{return (n2bs (number, (unsigned char) digits));};
+
+inline std::string n2bs (char number, unsigned long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (short number, unsigned long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (int number, unsigned long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long number, unsigned long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long long number, unsigned long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned char number, unsigned long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned short number, unsigned long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned int number, unsigned long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long number, unsigned long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long long number, unsigned long digits)
+{return (n2bs (number, (unsigned char) digits));};
+
+inline std::string n2bs (char number, long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (short number, long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (int number, long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long number, long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long long number, long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned char number, long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned short number, long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned int number, long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long number, long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long long number, long digits)
+{return (n2bs (number, (unsigned char) digits));};
+
+inline std::string n2bs (char number, unsigned long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (short number, unsigned long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (int number, unsigned long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long number, unsigned long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long long number, unsigned long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned char number, unsigned long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned short number, unsigned long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned int number, unsigned long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long number, unsigned long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long long number, unsigned long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+
+inline std::string n2bs (char number, long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (short number, long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (int number, long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long number, long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (long long number, long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned char number, long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned short number, long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned int number, long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long number, long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+inline std::string n2bs (unsigned long long number, long long digits)
+{return (n2bs (number, (unsigned char) digits));};
+
#endif /* INCLUDED_N2BS_H */
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/python/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/python/Makefile.am
2006-08-27 19:03:39 UTC (rev 3442)
+++
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/python/Makefile.am
2006-08-27 19:07:13 UTC (rev 3443)
@@ -23,7 +23,7 @@
EXTRA_DIST = run_tests.in
-# Disable qa checks due to non-standard directory structure (eb)
+# Disabled until fix for finding an audio module in build tree
# TESTS = run_tests
noinst_PYTHON = qa_test_coding_1.py qa_test_coding_2.py
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/python/run_tests.in
===================================================================
---
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/python/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++
gnuradio/branches/developers/jcorgan/wip/gr-error-correcting-codes/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,49 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-error-correcting-codes/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-error-correcting-codes/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-error-correcting-codes/src/python
-
-# Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-error-correcting-codes \
+ @abs_top_builddir@/gr-error-correcting-codes \
+ @srcdir@
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-ezdop/src/python/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-ezdop/src/python/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-ezdop/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,51 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-ezdop/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-ezdop/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-ezdop/src/lib
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-# For OS/X
address@hidden@/gnuradio-core/src/lib/.libs:@abs_top_builddir@/ezdop/src/host/ezdop/.libs
-export DYLD_LIBRARY_PATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-ezdop \
+ @abs_top_builddir@/gr-ezdop \
+ @srcdir@
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-gsm-fr-vocoder/src/python/run_tests.in
===================================================================
---
gnuradio/branches/developers/jcorgan/wip/gr-gsm-fr-vocoder/src/python/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++
gnuradio/branches/developers/jcorgan/wip/gr-gsm-fr-vocoder/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,51 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-gsm-fr-vocoder/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-gsm-fr-vocoder/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-gsm-fr-vocoder/src/python
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-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.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-gsm-fr-vocoder \
+ @abs_top_builddir@/gr-gsm-fr-vocoder \
+ @srcdir@
Modified: gnuradio/branches/developers/jcorgan/wip/gr-radar/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-radar/src/lib/Makefile.am
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-radar/src/lib/Makefile.am
2006-08-27 19:07:13 UTC (rev 3443)
@@ -57,6 +57,13 @@
simulation.h \
simulation.cc
+# magic flags
+libradar_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
+
+# link the libraray against the c++ standard library
+libradar_la_LIBADD = \
+ -lstdc++
+
bin_PROGRAMS = \
xambi \
eb-xambi \
@@ -78,23 +85,7 @@
# This gets howto.py installed in the right place
# ourpython_PYTHON =
-#ourlib_LTLIBRARIES = _howto.la
-# These are the source files that go into the shared library
-#_howto_la_SOURCES = \
-# howto.cc \
-# howto_square_ff.cc \
-# howto_square2_ff.cc
-
-# magic flags
-#_howto_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-
-# link the library against some comon swig runtime code and the
-# c++ standard library
-#_howto_la_LIBADD = \
-# $(PYTHON_LDFLAGS) \
-# -lstdc++
-
#howto.cc howto.py: howto.i $(ALL_IFILES)
# $(SWIG) $(SWIGPYTHONARGS) -module howto -o howto.cc $<
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-radar/src/python/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-radar/src/python/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-radar/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@gr-radar/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-radar/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-radar/src/python
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-radar \
+ @abs_top_builddir@/gr-radar \
+ @srcdir@
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-radio-astronomy/src/python/run_tests.in
===================================================================
---
gnuradio/branches/developers/jcorgan/wip/gr-radio-astronomy/src/python/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++
gnuradio/branches/developers/jcorgan/wip/gr-radio-astronomy/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,51 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-radio-astronomy/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-radio-astronomy/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-radio-astronomy/src/python
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-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.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-radio-astronomy \
+ @abs_top_builddir@/gr-radio-astronomy \
+ @srcdir@
Modified: gnuradio/branches/developers/jcorgan/wip/gr-trellis/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-trellis/Makefile.am
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-trellis/Makefile.am
2006-08-27 19:07:13 UTC (rev 3443)
@@ -21,6 +21,5 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = src
-DIST_SUBDIRS = src doc
+SUBDIRS = src doc
Property changes on: gnuradio/branches/developers/jcorgan/wip/gr-trellis/doc
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
howto-write-a-block.html
gr_block.h.xml
howto_1.i.xml
howto_square_ff.cc.xml
howto_square_ff.h.xml
qa_howto_1.py.xml
src_lib_Makefile_1.am.xml
src_lib_Makefile_2.am.xml
howto_square2_ff.cc.xml
howto_square2_ff.h.xml
+ Makefile
Makefile.in
*.html
Modified: gnuradio/branches/developers/jcorgan/wip/gr-trellis/doc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-trellis/doc/Makefile.am
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-trellis/doc/Makefile.am
2006-08-27 19:07:13 UTC (rev 3443)
@@ -19,33 +19,46 @@
# Boston, MA 02111-1307, USA.
#
-TARGETS = gr-trellis.html
+docdir=$(prefix)/share/doc/@address@hidden@VERSION@
+HTML_FILES =
-# To avoid build problems for folks who don't have xmlto installed, we
-# don't build the docs by default.
+if HAS_XMLTO
+HTML_FILES += \
+ gr-trellis.html
+endif
-# html: $(TARGETS)
-all: $(TARGETS)
+all: $(HTML_FILES)
+EXTRA_DIST = \
+ gr-trellis.xml \
+ make_numbered_listing.py \
+ test_tcm.py \
+ test_tcm.py.xml
-EXTRA_DIST =
-
-
BUILT_XML_FILES =
-
-gr-trellis.html : gr-trellis.xml $(BUILT_XML_FILES)
-
-
-
# ----------------------------------------------------------------
-clean:
- -rm -f $(TARGETS) $(BUILT_XML_FILES)
-
%.html : %.xml
xmlto html-nochunks $<
%.xml : % make_numbered_listing.py
./make_numbered_listing.py $<
+
+install-data-local:
+ mkdir -p $(DESTDIR)$(docdir)/html
+ @for i in $(HTML_FILES); do \
+ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html"; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \
+ done
+
+uninstall-local:
+ @for i in $(HTML_FILES); do \
+ echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
+ $(RM) $(DESTDIR)$(docdir)/$$i; \
+ done
+ $(RM) -fr $(DESTDIR)$(docdir)/html
+
+clean-local:
+ $(RM) -fr $(HTML_FILES) *~
\ No newline at end of file
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-trellis/src/lib/Makefile.am
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-trellis/src/lib/Makefile.am
2006-08-27 19:07:13 UTC (rev 3443)
@@ -73,7 +73,7 @@
$(GENERATED_CC)
# magic flags
-_trellis_la_LDFLAGS = -module -avoid-version
+_trellis_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
# link the library against some comon swig runtime code and the
# c++ standard library
Modified:
gnuradio/branches/developers/jcorgan/wip/gr-trellis/src/python/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-trellis/src/python/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-trellis/src/python/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,51 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-trellis/src/lib
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-trellis/src/lib
-# Where to look in the src tree for hand written python code
address@hidden@/gr-trellis/src/python
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-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.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-trellis \
+ @abs_top_builddir@/gr-trellis \
+ @srcdir@
Modified: gnuradio/branches/developers/jcorgan/wip/gr-usrp/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-usrp/src/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-usrp/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,54 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-usrp/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-usrp/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-usrp/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-# Where to look for USRP lib in current build tree
address@hidden@/usrp/host/lib
-
-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.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-usrp \
+ @abs_top_builddir@/gr-usrp \
+ @srcdir@
Modified: gnuradio/branches/developers/jcorgan/wip/gr-video-sdl/src/run_tests.in
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/gr-video-sdl/src/run_tests.in
2006-08-27 19:03:39 UTC (rev 3442)
+++ gnuradio/branches/developers/jcorgan/wip/gr-video-sdl/src/run_tests.in
2006-08-27 19:07:13 UTC (rev 3443)
@@ -1,47 +1,10 @@
#!/bin/sh
-# All this strange PYTHONPATH manipulation is required to run our
-# tests using our just built shared library and swig-generated python
-# code prior to installation.
+# 1st parameter is absolute path to component source directory
+# 2nd parameter is absolute path to component build directory
+# 3rd parameter is path to Python QA directory
-# build tree == src tree unless you're doing a VPATH build.
-# If you don't know what a VPATH build is, you're not doing one. Relax...
-
address@hidden@
address@hidden@
-
-# Where to look in the build tree for our shared library
address@hidden@/gr-video-sdl/src
-# Where to look in the src tree for swig generated python code
address@hidden@/gr-video-sdl/src
-# Where to look in the src tree for hand written python code
address@hidden@/gr-video-sdl/src
-
-# Where to look for GNU Radio python modules in current build tree
address@hidden@/gnuradio-core/src/python
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
-grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
-
-PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
-export PYTHONPATH
-
-#
-# This is the simple part...
-# Run everything that matches qa_*.py and return the final result.
-#
-
-ok=yes
-for file in @srcdir@/qa_*.py
-do
- if ! $file
- then
- ok=no
- fi
-done
-
-if [ $ok = yes ]
-then
- exit 0
-else
- exit 1
-fi
address@hidden@/run_tests.sh \
+ @abs_top_srcdir@/gr-video-sdl \
+ @abs_top_builddir@/gr-video-sdl \
+ @srcdir@
Copied: gnuradio/branches/developers/jcorgan/wip/run_tests.sh.in (from rev
3441, gnuradio/trunk/run_tests.sh.in)
===================================================================
--- gnuradio/branches/developers/jcorgan/wip/run_tests.sh.in
(rev 0)
+++ gnuradio/branches/developers/jcorgan/wip/run_tests.sh.in 2006-08-27
19:07:13 UTC (rev 3443)
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# First argument is absolute path to top of component source directory
+# Second argument is absolute path to top of component build directory
+# Third argument is component source directory for qa tests
+
+# Where to find my swig generated shared library
+mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs
+
+# Where to find my swig generated python module
+mysrcdir=$1/src:$1/src/lib
+
+# Where to find my hand written python modules
+mypydir=$1/src:$1/src/python
+
+# Where to find core's swig generated shared libraries
address@hidden@/gnuradio-core/src/lib/swig
+grswigdir=$grswigdir:$grswigdir/.libs
+
+# Where to find core's python modules
address@hidden@/gnuradio-core/src/python
+
+# Where to find core's master library files
address@hidden@/gnuradio-core/src/lib
+grlibdir=$grlibdir:$grlibdir/.libs
+
+# Construct search path for python modules
+PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$grswigdir:$grpydir:$PYTHONPATH"
+export PYTHONPATH
+
+# For OS/X
+DYLD_LIBRARY_PATH=$grlibdir
+export DYLD_LIBRARY_PATH
+
+# For Win32
+PATH=$grlibdir:$PATH
+
+# Don't load user or system prefs
+GR_DONT_LOAD_PREFS=1
+export GR_DONT_LOAD_PREFS
+
+# Run everything that matches qa_*.py and return the final result.
+
+ok=yes
+for file in $3/qa_*.py
+do
+ if ! $file
+ then
+ ok=no
+ fi
+done
+
+if [ $ok = yes ]
+then
+ exit 0
+else
+ exit 1
+fi
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3443 - in gnuradio/branches/developers/jcorgan/wip: . config gnuradio-core/src/lib/filter gnuradio-core/src/python/gnuradio/gr gr-atsc/src/python gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-error-correcting-codes/src/lib/libecc/mld gr-error-correcting-codes/src/python gr-ezdop/src/python gr-gsm-fr-vocoder/src/python gr-radar/src/lib gr-radar/src/python gr-radio-astronomy/src/python gr-trellis gr-trellis/doc gr-trellis/src/lib gr-trellis/src/python gr-usrp/src gr-video-sdl/src,
jcorgan <=