summaryrefslogtreecommitdiff
path: root/gr-trellis
Commit message (Collapse)AuthorAgeFilesLines
* Merge master/fix_build_dir_order into next, then fix conflicts and redo come ↵Michael L Dickens2013-01-042-3/+8
|\ | | | | | | of the INCLUDE_DIRS order
| * Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ↵Michael L Dickens2013-01-011-3/+6
| | | | | | | | ordered as: internal build and source for this component, other components (internal build and source, or already installed), non-project non-system dependencies (e.g., Qt, Boost, Python), system dependencies (e.g., CoreAudio).
* | Merge branch 'next_blocks' into nextTom Rondeau2012-12-2929-259/+263
|\ \ | | | | | | | | | | | | | | | Conflicts: gr-trellis/CMakeLists.txt gr-trellis/python/CMakeLists.txt
| * | grc: updating GRC exmaples for new component changes.Tom Rondeau2012-12-276-205/+205
| | |
| * | blocks: removes blocks moved to gr-blocks from gnuradio-core.Tom Rondeau2012-12-2124-55/+59
| | | | | | | | | | | | Also fixes up some other missing moves.
* | | trellis: converted gr-trellis to new style.Tom Rondeau2012-12-29162-7746/+6822
|/ /
* | Merge branch 'master' into nextTom Rondeau2012-12-121-2/+0
|\| | | | | | | | | Conflicts: gr-digital/swig/CMakeLists.txt
| * build: removing core_swig from GR_SWIG_TARGET_DEPS. Seems to have been the ↵Tom Rondeau2012-12-121-2/+0
| | | | | | | | cause of the parallel build woes.
* | gr: added missing dependencies for unit testsJosh Blum2012-11-141-1/+1
| |
* | gr: misc test dependencies for new componentsJosh Blum2012-11-141-1/+1
| |
* | Merge branch 'master' into nextJohnathan Corgan2012-11-141-9/+8
|\| | | | | | | | | | | | | | | | | Conflicts: gr-atsc/src/lib/CMakeLists.txt gr-digital/python/CMakeLists.txt gr-trellis/src/python/CMakeLists.txt gr-vocoder/python/CMakeLists.txt gr-wavelet/python/CMakeLists.txt
| * gr: same change for common PYTHON test pathsJosh Blum2012-11-141-7/+7
| | | | | | | | | | | | | | Conflicts: gr-analog/python/CMakeLists.txt gr-blocks/python/CMakeLists.txt
| * gr: set a common GR_TEST_TARGET_DEPS for all module unit testsJosh Blum2012-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each unit test shares common dependencies, but we have been neglecting to set these. In this changeset, we set one top level GR_TEST_TARGET_DEPS, and simply append module-specific dependencies for each test. This also helps to fix QA tests on windows which were missing the dependencies list. Conflicts: gr-analog/python/CMakeLists.txt gr-blocks/python/CMakeLists.txt
* | analog: fixing up GRC and other examples to use gr-analog for sig and noise ↵Tom Rondeau2012-11-105-1110/+1194
| | | | | | | | sources.
* | analog: removed noise and sig sources from core.Tom Rondeau2012-11-103-5/+7
| | | | | | | | Fixed QA code for components that do not use gr-analog.
* | fixing up various QA issues with new components.Tom Rondeau2012-11-102-2/+3
| |
* | analog: removing gr-analog as a required dependency when not actually necessary.Tom Rondeau2012-11-0619-22/+101
| | | | | | | | Examples that use gr-analog test for it first.
* | analog: Removing reference to gr.sig_source_X and gr.noise_source_X where ↵Tom Rondeau2012-11-0621-27/+43
| | | | | | | | | | | | | | | | possible. Passing make and make test. Examples and apps need testing. gr-filter relies on sig_source and noise_source, so can't remove them from core.
* | Merge branch 'master' into nextJohnathan Corgan2012-11-041-1/+2
|\|
| * gr: added python -B everywhere for clean source treeJosh Blum2012-11-041-1/+2
| |
* | Merge remote branch 'reynwar/comments_next' into nextJohnathan Corgan2012-08-281-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: gr-digital/include/digital_constellation.h gr-digital/python/bpsk.py gr-digital/python/qpsk.py
| * \ Merged comments branch into comments_next branch.Ben Reynwar2012-08-101-0/+1
| |\ \
| | * | Merge branch 'master' into commentsBen Reynwar2012-08-081-1/+3
| | |\|
| | * | docs: Adding/editing top-level docstrings.Ben Reynwar2012-05-211-0/+1
| | | |
* | | | trellis: fixing trellis examples for gr-filter update.Tom Rondeau2012-08-204-11/+11
| | | |
* | | | trellis: updating gr-trellis to handle changes with gr-digital.Tom Rondeau2012-08-2027-193/+240
| | | | | | | | | | | | | | | | (mostly namespace issues in C++).
* | | | digital: moved metric_type.h to digital include dir. Fixed gr-trellis to ↵Tom Rondeau2012-08-146-15/+15
|/ / / | | | | | | | | | work with this.
* | | Merge branch 'master' into nextJohnathan Corgan2012-07-031-1/+3
|\ \ \ | | |/ | |/|
| * | swig: added GR_SWIG_TARGET_DEPS core_swig to other swig buildsJohnathan Corgan2012-07-031-1/+3
| |/ | | | | | | | | | | | | | | | | I have not encountered an issue, however this is the correct thing to do. Now individual components swig builds depend on the gr core swig target. Conflicts: gr-filter/swig/CMakeLists.txt
* / core: removed gr_chunks_to_symbols_XX after move to gr-digitalJohnathan Corgan2012-06-0622-25/+25
|/
* Removed whitespace and added dtools/bin/remove-whitespace as a tool to do ↵Tom Rondeau2012-04-1381-1559/+1559
| | | | | | this in the future. The sed script was provided by Moritz Fischer.
* Merge branch 'maint'Johnathan Corgan2012-04-091-0/+2
|\
| * gr: fix 2 places where pyc files get generated in-treeJosh Blum2012-04-091-0/+2
| | | | | | | | Included the GrPython module to define PYTHON_DASH_B.
* | Merge branch 'master' into nextTom Rondeau2012-04-071-0/+2
|\|
| * trellis: bug fix to make sure file is closed.Achilleas Anastasopoulos2012-04-071-0/+2
| |
* | Merge branch 'rm_python_ext' into cmake_buildsTom Rondeau2012-04-0344-3/+5623
|\ \ | | | | | | | | | | | | Conflicts: CMakeLists.txt
| * | examples: Reworked locations and installation of examples.Tom Rondeau2012-04-0344-3/+5623
| | | | | | | | | | | | All python and GRC examples directly associated with a top-level component are now in that examples directory. Examples are split into c++, python, and grc dirs but are all installed into $prefix/share/gnuradio/examples/<component>.
* | | Removes all references to guile and scheme, which are no longer needed.Tom Rondeau2012-04-013-208/+0
|/ / | | | | | | The remaining pmt_serial_tags.scm is parsed by Python already. Future modifications could change this format to not confuse the point.
* | Merge branch 'master' into nextJohnathan Corgan2012-03-221-2/+2
|\|
| * volk: added volk as depedency for various componentsJosh Blum2012-03-221-2/+2
| | | | | | | | | | | | Its important to list the dependent libraries for a test so the library path can be correctly set. This is necessary on platforms without dynamic re-linking.
* | Removed autotools, gr-waveform, some cleanupJohnathan Corgan2011-12-0818-751/+0
|/ | | | Nick Foster owes Nick Corgan a six-pack of beer!
* docs: fixes some warnings.Tom Rondeau2011-12-061-3/+3
| | | | There is way too much institutional knowledge in these makefiles now. Another reason I'm glad we're going to cmake, which is being kept more sane as all of the problems are already known.
* Fixed warnings generated by variable declaration order.Tom Rondeau2011-12-061-1/+1
|
* trellis fixing trellis grc files to know about gr-digital.Achilleas Anastasopoulos2011-12-064-16/+16
|
* docs: more fixes for generated swig files. This worked before the merge, but ↵Tom Rondeau2011-12-051-0/+1
| | | | this forces the build system to generate these before processing the other swig files.
* docs: better install of swig docs .i files since we actually have a variable ↵Tom Rondeau2011-12-041-4/+5
| | | | to take care of it already.
* docs: fixing variable for location of header files (SOURCE not BINARY).Tom Rondeau2011-11-301-1/+1
|
* docs: more appropriate variable to use when setting the include/headers ↵Tom Rondeau2011-11-281-1/+1
| | | | directory.
* docs: installing generated _doc.i files under autotools.Tom Rondeau2011-11-281-0/+3
|
* docs: better use of BUILT_SOURCES so I'm not overriding the standard build ↵Tom Rondeau2011-11-271-2/+2
| | | | instructions for it.