[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] git://gnuradio.org/jcorgan branch, wip/gr-blocks-maste
|
From: |
git version control |
|
Subject: |
[Commit-gnuradio] git://gnuradio.org/jcorgan branch, wip/gr-blocks-master, updated. 3.6.1git-290-g312de88 |
|
Date: |
Wed, 4 Jul 2012 01:10:29 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/jcorgan".
The branch, wip/gr-blocks-master has been updated
via 312de88604d052142f91ae4eb292ccd25fac7963 (commit)
via b271b9d2ef0290b866f0afb22ba53c394c422418 (commit)
via dbc7a4c08ac27844e413a39a326bf1b50b09dd00 (commit)
via f2021f48926741abb62f9a54744191c81e5c950d (commit)
via 791eb5decfd028372a7f24b4056dac95a5fba5e5 (commit)
via eb2505b637075e75cafa700350d5b9297e1b7ef3 (commit)
via a5cbf3b508bcdbfdc955a92dc752218359c5c88a (commit)
via 86dd49f2b301fdd7e817632eeb2dcaf25c86af4c (commit)
via 5f13956bfac00dadf350d97ccc8ddd555dc9b10e (commit)
via 24edd7162378d8e56945562579845eeaed03ee1e (commit)
via 06c325cb925555d1864d67db20490eb67402868d (commit)
via 76258270f53da9a7b6bdeed0b38dde735956012e (commit)
via 744ffd50ac5a73ce3619ae11ef9cf04c0886d74a (commit)
via 84f9822b4a8fe4290e971c09b2bd99f1bf59517b (commit)
via f8581fb475267e1a97eaab962e423559fb4bfce2 (commit)
via 73800434abfb8c6efcf069222b5f0fea9c86870b (commit)
via e56c2c75fb656fd0663303407415c728da7526e1 (commit)
via 1827d7faf6030f67dd482d4933fb172150ebd8a6 (commit)
via 045d02d1a69c916e60d87b655adfacfceeceeaaf (commit)
via 30ea41c48215af4c50049aefb4ff0e59f14decfe (commit)
from 025f323d9857715a31a1117693c5debd19393a46 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 312de88604d052142f91ae4eb292ccd25fac7963
Author: Johnathan Corgan <address@hidden>
Date: Tue Jul 3 18:02:10 2012 -0700
blocks: apply swig fix
commit b271b9d2ef0290b866f0afb22ba53c394c422418
Merge: 84f9822 dbc7a4c
Author: Johnathan Corgan <address@hidden>
Date: Tue Jul 3 17:58:46 2012 -0700
Merge branch 'master' into wip/gr-blocks-master
commit dbc7a4c08ac27844e413a39a326bf1b50b09dd00
Merge: 791eb5d f2021f4
Author: Johnathan Corgan <address@hidden>
Date: Tue Jul 3 17:37:18 2012 -0700
Merge branch 'maint'
commit f2021f48926741abb62f9a54744191c81e5c950d
Author: Johnathan Corgan <address@hidden>
Date: Tue Jul 3 17:31:07 2012 -0700
volk: don't initialize phase in rotator
commit 791eb5decfd028372a7f24b4056dac95a5fba5e5
Merge: eb2505b 86dd49f
Author: Johnathan Corgan <address@hidden>
Date: Tue Jul 3 17:14:56 2012 -0700
Merge branch 'maint'
Conflicts:
gruel/src/swig/CMakeLists.txt
commit eb2505b637075e75cafa700350d5b9297e1b7ef3
Author: Josh Blum <address@hidden>
Date: Tue Jul 3 12:55:06 2012 -0700
cmake: minor tweaks to GrSwig.cmake
Added a custom print for docstring generation
Removed unused output line from custom command
commit a5cbf3b508bcdbfdc955a92dc752218359c5c88a
Author: Josh Blum <address@hidden>
Date: Tue Jul 3 12:04:00 2012 -0700
core: moved VMCIRCBUF related code to runtime
This build stuff should not be at the top level.
commit 86dd49f2b301fdd7e817632eeb2dcaf25c86af4c
Author: Josh Blum <address@hidden>
Date: Tue Jul 3 16:59:44 2012 -0700
Force swig compile ordering in gnuradio-core
commit 5f13956bfac00dadf350d97ccc8ddd555dc9b10e
Author: Josh Blum <address@hidden>
Date: Tue Jul 3 13:52:11 2012 -0700
docs: remove redundant retries from swig_doc.py
With proper build dependencies, it should not be needed.
commit 24edd7162378d8e56945562579845eeaed03ee1e
Author: Josh Blum <address@hidden>
Date: Tue Jul 3 13:27:11 2012 -0700
swig: use add_custom_target for swig docs dependency
This seems to fix the build dependency issue where generation gets called
multiple times and steps on itself.
commit 06c325cb925555d1864d67db20490eb67402868d
Author: Johnathan Corgan <address@hidden>
Date: Tue Jul 3 14:22:41 2012 -0700
swig: added GR_SWIG_TARGET_DEPS core_swig to other swig builds
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
commit 76258270f53da9a7b6bdeed0b38dde735956012e
Author: Johnathan Corgan <address@hidden>
Date: Tue Jul 3 14:21:05 2012 -0700
swig: added additional swig dependencies gruel/core
pmt swig gen depends upon the generated header
core depends upon pmt swig custom target
Conflicts:
gruel/src/swig/CMakeLists.txt
commit 744ffd50ac5a73ce3619ae11ef9cf04c0886d74a
Author: Josh Blum <address@hidden>
Date: Tue Jul 3 12:01:16 2012 -0700
core: added general_generated to swig deps
We generate the docs so its important that the docs see this header
generated first.
commit 84f9822b4a8fe4290e971c09b2bd99f1bf59517b
Author: Johnathan Corgan <address@hidden>
Date: Tue Jul 3 09:49:20 2012 -0700
blocks: added gr::blocks::not_XX (bb ss ii)
commit f8581fb475267e1a97eaab962e423559fb4bfce2
Merge: 7380043 045d02d
Author: Johnathan Corgan <address@hidden>
Date: Sun Jul 1 16:00:53 2012 -0700
Merge remote branch 'jblum-github/python_blocks2' into master
Conflicts:
gnuradio-core/CMakeLists.txt
gnuradio-core/src/lib/general/general.i
commit 045d02d1a69c916e60d87b655adfacfceeceeaaf
Author: Josh Blum <address@hidden>
Date: Fri Apr 27 10:03:28 2012 -0700
python-blocks: replace assertItemsEqual with assertEqual
commit 30ea41c48215af4c50049aefb4ff0e59f14decfe
Author: Josh Blum <address@hidden>
Date: Tue Apr 17 22:14:05 2012 -0700
this is squashed python blocks support
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 3 -
cmake/Modules/GrMiscUtils.cmake | 25 --
cmake/Modules/GrSwig.cmake | 7 +-
docs/doxygen/swig_doc.py | 100 ++-----
gnuradio-core/CMakeLists.txt | 4 +-
gnuradio-core/src/lib/general/CMakeLists.txt | 5 +
gnuradio-core/src/lib/general/general.i | 3 +-
gnuradio-core/src/lib/general/gr_block_gateway.cc | 184 +++++++++++
gnuradio-core/src/lib/general/gr_block_gateway.h | 212 +++++++++++++
.../src/lib/general/gr_block_gateway.i | 28 +-
gnuradio-core/src/lib/gengen/Makefile.gen | 333 --------------------
gnuradio-core/src/lib/runtime/CMakeLists.txt | 23 ++
gnuradio-core/src/lib/swig/CMakeLists.txt | 5 +-
.../src/python/gnuradio/gr/CMakeLists.txt | 3 +
gnuradio-core/src/python/gnuradio/gr/__init__.py | 3 +-
gnuradio-core/src/python/gnuradio/gr/gateway.py | 215 +++++++++++++
.../src/python/gnuradio/gr/qa_block_gateway.py | 235 ++++++++++++++
gr-atsc/src/lib/CMakeLists.txt | 2 +
gr-audio/swig/CMakeLists.txt | 2 +
gr-blocks/grc/blocks_block_tree.xml | 1 +
.../grc/blocks_not_xx.xml | 6 +-
gr-blocks/include/blocks/CMakeLists.txt | 1 +
.../include/blocks/{and_XX.h.t => not_XX.h.t} | 4 +-
gr-blocks/lib/CMakeLists.txt | 1 +
.../lib/{and_XX_impl.cc.t => not_XX_impl.cc.t} | 22 +-
gr-blocks/lib/{and_XX_impl.h.t => not_XX_impl.h.t} | 0
gr-blocks/python/qa_boolean_operators.py | 8 +-
gr-blocks/swig/CMakeLists.txt | 2 +
gr-blocks/swig/blocks_swig.i | 9 +
gr-comedi/src/CMakeLists.txt | 2 +
gr-digital/swig/CMakeLists.txt | 2 +-
gr-fcd/swig/CMakeLists.txt | 2 +
gr-fft/swig/CMakeLists.txt | 2 +
gr-noaa/swig/CMakeLists.txt | 2 +
gr-pager/swig/CMakeLists.txt | 2 +
gr-qtgui/swig/CMakeLists.txt | 2 +
gr-shd/swig/CMakeLists.txt | 2 +
gr-trellis/src/lib/CMakeLists.txt | 4 +-
gr-uhd/include/gr_uhd_usrp_source.h | 6 +
gr-uhd/lib/gr_uhd_usrp_source.cc | 23 ++-
gr-uhd/swig/CMakeLists.txt | 2 +
gr-video-sdl/src/CMakeLists.txt | 2 +
gr-vocoder/swig/CMakeLists.txt | 2 +
gr-wavelet/swig/CMakeLists.txt | 2 +
gruel/src/lib/pmt/CMakeLists.txt | 4 +-
gruel/src/swig/CMakeLists.txt | 3 +
.../volk/volk_32fc_s32fc_x2_rotator_32fc_a.h | 3 -
47 files changed, 1024 insertions(+), 489 deletions(-)
create mode 100644 gnuradio-core/src/lib/general/gr_block_gateway.cc
create mode 100644 gnuradio-core/src/lib/general/gr_block_gateway.h
copy gr-audio/swig/audio_swig.i =>
gnuradio-core/src/lib/general/gr_block_gateway.i (72%)
delete mode 100644 gnuradio-core/src/lib/gengen/Makefile.gen
create mode 100644 gnuradio-core/src/python/gnuradio/gr/gateway.py
create mode 100644 gnuradio-core/src/python/gnuradio/gr/qa_block_gateway.py
copy grc/blocks/gr_not_xx.xml => gr-blocks/grc/blocks_not_xx.xml (85%)
copy gr-blocks/include/blocks/{and_XX.h.t => not_XX.h.t} (92%)
copy gr-blocks/lib/{and_XX_impl.cc.t => not_XX_impl.cc.t} (75%)
copy gr-blocks/lib/{and_XX_impl.h.t => not_XX_impl.h.t} (100%)
hooks/post-receive
--
git://gnuradio.org/jcorgan
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] git://gnuradio.org/jcorgan branch, wip/gr-blocks-master, updated. 3.6.1git-290-g312de88,
git version control <=