From ccca4c7d043bd5e14e48c67880da498c7d578734 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 6 Oct 2009 18:00:21 -0700 Subject: [PATCH] moved grc examples to gnuradio-examples/grc --- config/grc_gnuradio_examples.m4 | 11 ++++++----- config/grc_grc.m4 | 1 - gnuradio-examples/Makefile.am | 4 ++-- {grc/examples => gnuradio-examples/grc}/.gitignore | 0 {grc/examples => gnuradio-examples/grc}/Makefile.am | 3 ++- .../grc}/audio/.gitignore | 0 .../grc}/audio/cvsd_sweep.grc | 0 .../grc}/audio/dial_tone.grc | 0 .../grc}/demod/mpsk_demod.grc | 0 gnuradio-examples/grc/{ => demod}/pam_timing.grc | 0 .../grc}/simple/.gitignore | 0 .../grc}/simple/ber_simulation.grc | 0 .../grc}/simple/dpsk_loopback.grc | 0 .../grc}/simple/var_sink_taps.grc | 0 .../grc}/simple/variable_config.grc | 0 .../grc}/trellis/.gitignore | 0 .../grc}/trellis/interference_cancellation.grc | 0 .../grc}/trellis/readme.txt | 0 .../grc}/usrp/.gitignore | 0 .../grc}/usrp/usrp2_const_wave.grc | 0 .../grc}/usrp/usrp2_dpsk_mod.grc | 0 .../grc}/usrp/usrp2_fft.grc | 0 .../grc}/usrp/usrp_two_tone_loopback.grc | 0 .../grc}/usrp/usrp_wbfm_receive.grc | 0 .../grc}/xmlrpc/.gitignore | 0 .../grc}/xmlrpc/readme.txt | 0 .../grc}/xmlrpc/xmlrpc_client.grc | 0 .../grc}/xmlrpc/xmlrpc_client_script.py | 0 .../grc}/xmlrpc/xmlrpc_server.grc | 0 grc/Makefile.am | 1 - 30 files changed, 10 insertions(+), 10 deletions(-) rename {grc/examples => gnuradio-examples/grc}/.gitignore (100%) rename {grc/examples => gnuradio-examples/grc}/Makefile.am (97%) rename {grc/examples => gnuradio-examples/grc}/audio/.gitignore (100%) rename {grc/examples => gnuradio-examples/grc}/audio/cvsd_sweep.grc (100%) rename {grc/examples => gnuradio-examples/grc}/audio/dial_tone.grc (100%) rename {grc/examples => gnuradio-examples/grc}/demod/mpsk_demod.grc (100%) rename gnuradio-examples/grc/{ => demod}/pam_timing.grc (100%) rename {grc/examples => gnuradio-examples/grc}/simple/.gitignore (100%) rename {grc/examples => gnuradio-examples/grc}/simple/ber_simulation.grc (100%) rename {grc/examples => gnuradio-examples/grc}/simple/dpsk_loopback.grc (100%) rename {grc/examples => gnuradio-examples/grc}/simple/var_sink_taps.grc (100%) rename {grc/examples => gnuradio-examples/grc}/simple/variable_config.grc (100%) rename {grc/examples => gnuradio-examples/grc}/trellis/.gitignore (100%) rename {grc/examples => gnuradio-examples/grc}/trellis/interference_cancellation.grc (100%) rename {grc/examples => gnuradio-examples/grc}/trellis/readme.txt (100%) rename {grc/examples => gnuradio-examples/grc}/usrp/.gitignore (100%) rename {grc/examples => gnuradio-examples/grc}/usrp/usrp2_const_wave.grc (100%) rename {grc/examples => gnuradio-examples/grc}/usrp/usrp2_dpsk_mod.grc (100%) rename {grc/examples => gnuradio-examples/grc}/usrp/usrp2_fft.grc (100%) rename {grc/examples => gnuradio-examples/grc}/usrp/usrp_two_tone_loopback.grc (100%) rename {grc/examples => gnuradio-examples/grc}/usrp/usrp_wbfm_receive.grc (100%) rename {grc/examples => gnuradio-examples/grc}/xmlrpc/.gitignore (100%) rename {grc/examples => gnuradio-examples/grc}/xmlrpc/readme.txt (100%) rename {grc/examples => gnuradio-examples/grc}/xmlrpc/xmlrpc_client.grc (100%) rename {grc/examples => gnuradio-examples/grc}/xmlrpc/xmlrpc_client_script.py (100%) rename {grc/examples => gnuradio-examples/grc}/xmlrpc/xmlrpc_server.grc (100%) diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4 index 3225f3ab..685761ff 100644 --- a/config/grc_gnuradio_examples.m4 +++ b/config/grc_gnuradio_examples.m4 @@ -25,15 +25,16 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ AC_CONFIG_FILES([ \ gnuradio-examples/Makefile \ - gnuradio-examples/c++/Makefile \ - gnuradio-examples/python/Makefile \ - gnuradio-examples/python/apps/hf_explorer/Makefile \ + gnuradio-examples/c++/Makefile \ + gnuradio-examples/python/Makefile \ + gnuradio-examples/grc/Makefile \ + gnuradio-examples/python/apps/hf_explorer/Makefile \ gnuradio-examples/python/apps/hf_radio/Makefile \ gnuradio-examples/python/apps/Makefile \ gnuradio-examples/python/audio/Makefile \ gnuradio-examples/python/digital/Makefile \ gnuradio-examples/python/digital_voice/Makefile \ - gnuradio-examples/python/digital-bert/Makefile \ + gnuradio-examples/python/digital-bert/Makefile \ gnuradio-examples/python/mp-sched/Makefile \ gnuradio-examples/python/multi-antenna/Makefile \ gnuradio-examples/python/multi_usrp/Makefile \ @@ -41,7 +42,7 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ gnuradio-examples/python/ofdm/Makefile \ gnuradio-examples/python/pfb/Makefile \ gnuradio-examples/python/usrp/Makefile \ - gnuradio-examples/python/usrp2/Makefile \ + gnuradio-examples/python/usrp2/Makefile \ ]) GRC_BUILD_CONDITIONAL(gnuradio-examples) diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index 7ee009fa..16720b8f 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -50,7 +50,6 @@ AC_DEFUN([GRC_GRC],[ grc/Makefile \ grc/base/Makefile \ grc/blocks/Makefile \ - grc/examples/Makefile \ grc/freedesktop/Makefile \ grc/grc_gnuradio/Makefile \ grc/gui/Makefile \ diff --git a/gnuradio-examples/Makefile.am b/gnuradio-examples/Makefile.am index 360ae8b4..9ea890c1 100644 --- a/gnuradio-examples/Makefile.am +++ b/gnuradio-examples/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2007 Free Software Foundation, Inc. +# Copyright 2004,2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,5 +23,5 @@ include $(top_srcdir)/Makefile.common SUBDIRS = c++ if PYTHON -SUBDIRS += python +SUBDIRS += python grc endif diff --git a/grc/examples/.gitignore b/gnuradio-examples/grc/.gitignore similarity index 100% rename from grc/examples/.gitignore rename to gnuradio-examples/grc/.gitignore diff --git a/grc/examples/Makefile.am b/gnuradio-examples/grc/Makefile.am similarity index 97% rename from grc/examples/Makefile.am rename to gnuradio-examples/grc/Makefile.am index 54620e15..97417c5a 100644 --- a/grc/examples/Makefile.am +++ b/gnuradio-examples/grc/Makefile.am @@ -30,7 +30,8 @@ dist_audiodata_DATA = \ demoddatadir = $(grc_examples_prefix)/demod dist_demoddata_DATA = \ - demod/mpsk_demod.grc + demod/mpsk_demod.grc \ + demod/pam_timing.grc simpledatadir = $(grc_examples_prefix)/simple dist_simpledata_DATA = \ diff --git a/grc/examples/audio/.gitignore b/gnuradio-examples/grc/audio/.gitignore similarity index 100% rename from grc/examples/audio/.gitignore rename to gnuradio-examples/grc/audio/.gitignore diff --git a/grc/examples/audio/cvsd_sweep.grc b/gnuradio-examples/grc/audio/cvsd_sweep.grc similarity index 100% rename from grc/examples/audio/cvsd_sweep.grc rename to gnuradio-examples/grc/audio/cvsd_sweep.grc diff --git a/grc/examples/audio/dial_tone.grc b/gnuradio-examples/grc/audio/dial_tone.grc similarity index 100% rename from grc/examples/audio/dial_tone.grc rename to gnuradio-examples/grc/audio/dial_tone.grc diff --git a/grc/examples/demod/mpsk_demod.grc b/gnuradio-examples/grc/demod/mpsk_demod.grc similarity index 100% rename from grc/examples/demod/mpsk_demod.grc rename to gnuradio-examples/grc/demod/mpsk_demod.grc diff --git a/gnuradio-examples/grc/pam_timing.grc b/gnuradio-examples/grc/demod/pam_timing.grc similarity index 100% rename from gnuradio-examples/grc/pam_timing.grc rename to gnuradio-examples/grc/demod/pam_timing.grc diff --git a/grc/examples/simple/.gitignore b/gnuradio-examples/grc/simple/.gitignore similarity index 100% rename from grc/examples/simple/.gitignore rename to gnuradio-examples/grc/simple/.gitignore diff --git a/grc/examples/simple/ber_simulation.grc b/gnuradio-examples/grc/simple/ber_simulation.grc similarity index 100% rename from grc/examples/simple/ber_simulation.grc rename to gnuradio-examples/grc/simple/ber_simulation.grc diff --git a/grc/examples/simple/dpsk_loopback.grc b/gnuradio-examples/grc/simple/dpsk_loopback.grc similarity index 100% rename from grc/examples/simple/dpsk_loopback.grc rename to gnuradio-examples/grc/simple/dpsk_loopback.grc diff --git a/grc/examples/simple/var_sink_taps.grc b/gnuradio-examples/grc/simple/var_sink_taps.grc similarity index 100% rename from grc/examples/simple/var_sink_taps.grc rename to gnuradio-examples/grc/simple/var_sink_taps.grc diff --git a/grc/examples/simple/variable_config.grc b/gnuradio-examples/grc/simple/variable_config.grc similarity index 100% rename from grc/examples/simple/variable_config.grc rename to gnuradio-examples/grc/simple/variable_config.grc diff --git a/grc/examples/trellis/.gitignore b/gnuradio-examples/grc/trellis/.gitignore similarity index 100% rename from grc/examples/trellis/.gitignore rename to gnuradio-examples/grc/trellis/.gitignore diff --git a/grc/examples/trellis/interference_cancellation.grc b/gnuradio-examples/grc/trellis/interference_cancellation.grc similarity index 100% rename from grc/examples/trellis/interference_cancellation.grc rename to gnuradio-examples/grc/trellis/interference_cancellation.grc diff --git a/grc/examples/trellis/readme.txt b/gnuradio-examples/grc/trellis/readme.txt similarity index 100% rename from grc/examples/trellis/readme.txt rename to gnuradio-examples/grc/trellis/readme.txt diff --git a/grc/examples/usrp/.gitignore b/gnuradio-examples/grc/usrp/.gitignore similarity index 100% rename from grc/examples/usrp/.gitignore rename to gnuradio-examples/grc/usrp/.gitignore diff --git a/grc/examples/usrp/usrp2_const_wave.grc b/gnuradio-examples/grc/usrp/usrp2_const_wave.grc similarity index 100% rename from grc/examples/usrp/usrp2_const_wave.grc rename to gnuradio-examples/grc/usrp/usrp2_const_wave.grc diff --git a/grc/examples/usrp/usrp2_dpsk_mod.grc b/gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc similarity index 100% rename from grc/examples/usrp/usrp2_dpsk_mod.grc rename to gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc diff --git a/grc/examples/usrp/usrp2_fft.grc b/gnuradio-examples/grc/usrp/usrp2_fft.grc similarity index 100% rename from grc/examples/usrp/usrp2_fft.grc rename to gnuradio-examples/grc/usrp/usrp2_fft.grc diff --git a/grc/examples/usrp/usrp_two_tone_loopback.grc b/gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc similarity index 100% rename from grc/examples/usrp/usrp_two_tone_loopback.grc rename to gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc diff --git a/grc/examples/usrp/usrp_wbfm_receive.grc b/gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc similarity index 100% rename from grc/examples/usrp/usrp_wbfm_receive.grc rename to gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc diff --git a/grc/examples/xmlrpc/.gitignore b/gnuradio-examples/grc/xmlrpc/.gitignore similarity index 100% rename from grc/examples/xmlrpc/.gitignore rename to gnuradio-examples/grc/xmlrpc/.gitignore diff --git a/grc/examples/xmlrpc/readme.txt b/gnuradio-examples/grc/xmlrpc/readme.txt similarity index 100% rename from grc/examples/xmlrpc/readme.txt rename to gnuradio-examples/grc/xmlrpc/readme.txt diff --git a/grc/examples/xmlrpc/xmlrpc_client.grc b/gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc similarity index 100% rename from grc/examples/xmlrpc/xmlrpc_client.grc rename to gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc diff --git a/grc/examples/xmlrpc/xmlrpc_client_script.py b/gnuradio-examples/grc/xmlrpc/xmlrpc_client_script.py similarity index 100% rename from grc/examples/xmlrpc/xmlrpc_client_script.py rename to gnuradio-examples/grc/xmlrpc/xmlrpc_client_script.py diff --git a/grc/examples/xmlrpc/xmlrpc_server.grc b/gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc similarity index 100% rename from grc/examples/xmlrpc/xmlrpc_server.grc rename to gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc diff --git a/grc/Makefile.am b/grc/Makefile.am index 28408c4a..30b955a1 100644 --- a/grc/Makefile.am +++ b/grc/Makefile.am @@ -25,7 +25,6 @@ if PYTHON SUBDIRS = \ base \ blocks \ - examples \ grc_gnuradio \ gui \ python \ -- 2.30.2