Merge branch 'master' of gnuradio.org:gnuradio

1 files changed, 84 insertions, 4 deletions

diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index 779972ff3..bd4f1a500 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011,2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -23,29 +23,102 @@
 include_directories(
     ${GNURADIO_CORE_INCLUDE_DIRS}
     ${GR_DIGITAL_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}/../include
 )
 
 include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})
 
+
+########################################################################
+# generate helper scripts to expand templated files
+########################################################################
+include(GrPython)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
+#!${PYTHON_EXECUTABLE}
+
+import sys, os, re
+sys.path.append('${GR_CORE_PYTHONPATH}')
+os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
+os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
+
+if __name__ == '__main__':
+    import build_utils
+    root, inp = sys.argv[1:3]
+    for sig in sys.argv[3:]:
+        name = re.sub ('X+', sig, root)
+        d = build_utils.standard_dict(name, sig, 'digital')
+        build_utils.expand_template(d, inp)
+
+")
+
+macro(expand_cc root)
+  #make a list of all the generated files
+  unset(expanded_files_cc)
+  unset(expanded_files_h)
+  foreach(sig ${ARGN})
+    string(REGEX REPLACE "X+" ${sig} name ${root})
+    list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
+    list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/../include/${name}.h)
+  endforeach(sig)
+  
+  #create a command to generate the files
+  add_custom_command(
+    OUTPUT ${expanded_files_cc}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.cc.t
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
+    ${root} ${root}.cc.t ${ARGN}
+  )
+  
+  #make source files depends on headers to force generation
+  set_source_files_properties(${expanded_files_cc}
+    PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
+  )
+  
+  #install rules for the generated cc files
+  list(APPEND generated_sources ${expanded_files_cc})  
+endmacro(expand_cc)
+
+########################################################################
+# Invoke macro to generate various sources
+########################################################################
+expand_cc(digital_chunks_to_symbols_XX         bf bc sf sc if ic)
+
 ########################################################################
 # Setup library
 ########################################################################
 list(APPEND gr_digital_sources
+    ${generated_sources}
+    digital_impl_glfsr.cc
     digital_impl_mpsk_snr_est.cc
+    digital_additive_scrambler_bb.cc
     digital_binary_slicer_fb.cc
+    digital_bytes_to_syms.cc
     digital_clock_recovery_mm_cc.cc
     digital_clock_recovery_mm_ff.cc
+    digital_cma_equalizer_cc.cc
     digital_constellation.cc
     digital_constellation_receiver_cb.cc
     digital_constellation_decoder_cb.cc
     digital_correlate_access_code_bb.cc
+    digital_correlate_access_code_tag_bb.cc
     digital_costas_loop_cc.cc
-    digital_cma_equalizer_cc.cc
+    digital_cpmmod_bc.cc
     digital_crc32.cc
+    digital_descrambler_bb.cc
+    digital_diff_decoder_bb.cc
+    digital_diff_encoder_bb.cc
+    digital_diff_phasor_cc.cc
     digital_fll_band_edge_cc.cc
+    digital_framer_sink_1.cc
+    digital_glfsr_source_b.cc
+    digital_glfsr_source_f.cc
+    digital_gmskmod_bc.cc
     digital_lms_dd_equalizer_cc.cc
     digital_kurtotic_equalizer_cc.cc
+    digital_map_bb.cc
     digital_mpsk_receiver_cc.cc
     digital_mpsk_snr_est_cc.cc
     digital_ofdm_cyclic_prefixer.cc
@@ -54,9 +127,14 @@ list(APPEND gr_digital_sources
     digital_ofdm_insert_preamble.cc
     digital_ofdm_mapper_bcv.cc
     digital_ofdm_sampler.cc
+    digital_packet_sink.cc
+    digital_pfb_clock_sync_ccf.cc
+    digital_pfb_clock_sync_fff.cc
+    digital_pn_correlator_cc.cc
+    digital_probe_density_b.cc
     digital_probe_mpsk_snr_est_c.cc
-    digital_gmskmod_bc.cc
-    digital_cpmmod_bc.cc
+    digital_scrambler_bb.cc
+    digital_simple_framer.cc
 )
 
 list(APPEND digital_libs
@@ -67,3 +145,5 @@ list(APPEND digital_libs
 add_library(gnuradio-digital SHARED ${gr_digital_sources})
 target_link_libraries(gnuradio-digital ${digital_libs})
 GR_LIBRARY_FOO(gnuradio-digital RUNTIME_COMPONENT "digital_runtime" DEVEL_COMPONENT "digital_devel")
+
+add_dependencies(gnuradio-digital digital_generated_includes digital_generated_swigs)