summaryrefslogtreecommitdiff
path: root/gr-trellis/lib
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2013-12-18 11:28:14 -0800
committerJohnathan Corgan <johnathan@corganlabs.com>2013-12-18 11:39:27 -0800
commit713703bc38d343ba2b1e5e84add0d51d6b7083af (patch)
tree6233295f733e24ae7972006afd89957ef5890498 /gr-trellis/lib
parentd183361a4bff5d9dfe232a5df9b23811d2774b94 (diff)
Revert "GNU Radio EXPAND macros for template files:"
This reverts commit 6fc200fcba65cc4d18d7b10381da72769c0183c4. The original commit causes excessive rebuild sensitivity by regenerating many public API header files at cmake time instead of at build time.
Diffstat (limited to 'gr-trellis/lib')
-rw-r--r--gr-trellis/lib/CMakeLists.txt85
1 files changed, 72 insertions, 13 deletions
diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt
index c60a939963..2fe7d3218c 100644
--- a/gr-trellis/lib/CMakeLists.txt
+++ b/gr-trellis/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2012-2013 Free Software Foundation, Inc.
+# Copyright 2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -37,20 +37,79 @@ if(ENABLE_GR_CTRLPORT)
include_directories(${ICE_INCLUDE_DIR})
endif(ENABLE_GR_CTRLPORT)
+#######################################################################
+# generate the python helper script which calls into the build utils
########################################################################
-# Invoke macro to generate various sources and headers
+include(GrPython)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
+#!${PYTHON_EXECUTABLE}
+
+import sys, os, re
+sys.path.append('${GR_RUNTIME_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_impl_dict2(name, sig, 'trellis')
+ 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}/${name}.h)
+ endforeach(sig)
+
+ #create a command to generate the source 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}
+ )
+
+ #create a command to generate the header file
+ add_custom_command(
+ OUTPUT ${expanded_files_h}
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.h.t
+ COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
+ ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
+ ${root} ${root}.h.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})
+ list(APPEND generated_headers ${expanded_files_h})
+endmacro(expand_cc)
+
+########################################################################
+# Invoke macro to generate various sources
########################################################################
-include(GrMiscUtils)
-GR_EXPAND_X_CC_H(trellis encoder_XX_impl bb bs bi ss si ii)
-GR_EXPAND_X_CC_H(trellis sccc_encoder_XX_impl bb bs bi ss si ii)
-GR_EXPAND_X_CC_H(trellis pccc_encoder_XX_impl bb bs bi ss si ii)
-GR_EXPAND_X_CC_H(trellis metrics_X_impl s i f c)
-GR_EXPAND_X_CC_H(trellis viterbi_X_impl b s i)
-GR_EXPAND_X_CC_H(trellis viterbi_combined_XX_impl sb ss si ib is ii fb fs fi cb cs ci)
-GR_EXPAND_X_CC_H(trellis sccc_decoder_X_impl b s i)
-GR_EXPAND_X_CC_H(trellis sccc_decoder_combined_XX_impl fb fs fi cb cs ci)
-GR_EXPAND_X_CC_H(trellis pccc_decoder_X_impl b s i)
-GR_EXPAND_X_CC_H(trellis pccc_decoder_combined_XX_impl fb fs fi cb cs ci)
+expand_cc(encoder_XX_impl bb bs bi ss si ii)
+expand_cc(sccc_encoder_XX_impl bb bs bi ss si ii)
+expand_cc(pccc_encoder_XX_impl bb bs bi ss si ii)
+expand_cc(metrics_X_impl s i f c)
+expand_cc(viterbi_X_impl b s i)
+expand_cc(viterbi_combined_XX_impl sb ss si ib is ii fb fs fi cb cs ci)
+expand_cc(sccc_decoder_X_impl b s i)
+expand_cc(sccc_decoder_combined_XX_impl fb fs fi cb cs ci)
+expand_cc(pccc_decoder_X_impl b s i)
+expand_cc(pccc_decoder_combined_XX_impl fb fs fi cb cs ci)
########################################################################
# Setup library