[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/04: grc: replace templated xml files wit
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/04: grc: replace templated xml files with search and replace for qt4 |
Date: |
Fri, 2 Sep 2016 16:54:07 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 8e36f2d4aca96b4815c50647e935f06b34040282
Author: Sebastian Koslowski <address@hidden>
Date: Tue Aug 30 09:49:58 2016 +0200
grc: replace templated xml files with search and replace for qt4
---
grc/blocks/CMakeLists.txt | 23 +++++++++++++++++++----
grc/blocks/{options.xml.cmakein => options.xml} | 2 +-
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/grc/blocks/CMakeLists.txt b/grc/blocks/CMakeLists.txt
index 8d93852..d46b1fe 100644
--- a/grc/blocks/CMakeLists.txt
+++ b/grc/blocks/CMakeLists.txt
@@ -22,7 +22,18 @@ include(GrPython)
file(GLOB xml_files "*.xml")
-configure_file(options.xml.cmakein "${CMAKE_CURRENT_BINARY_DIR}/options.xml"
@ONLY)
+macro(REPLACE_IN_FILE _xml_block match replace)
+ set(xml_block_src "${CMAKE_CURRENT_SOURCE_DIR}/${_xml_block}")
+ set(xml_block "${CMAKE_CURRENT_BINARY_DIR}/${_xml_block}")
+
+ list(REMOVE_ITEM xml_files "${xml_block_src}")
+ file(READ "${xml_block_src}" xml_block_src_text)
+ string(REPLACE "${match}" "${replace}"
+ xml_block_text "${xml_block_src_text}")
+ file(WRITE "${xml_block}" "${xml_block_text}")
+
+ list(APPEND generated_xml_files "${xml_block}")
+endmacro()
macro(GEN_BLOCK_XML _generator _xml_block)
set(generator ${CMAKE_CURRENT_SOURCE_DIR}/${_generator})
@@ -32,13 +43,17 @@ macro(GEN_BLOCK_XML _generator _xml_block)
DEPENDS ${generator} OUTPUT ${xml_block}
COMMAND ${PYTHON_EXECUTABLE} ${generator} ${xml_block}
)
-endmacro(GEN_BLOCK_XML)
+endmacro()
+
+GEN_BLOCK_XML(variable_struct.xml.py variable_struct.xml)
-GEN_BLOCK_XML(variable_struct.xml.py variable_struct.xml)
+if(DESIRED_QT_VERSION EQUAL 4)
+ REPLACE_IN_FILE(options.xml PyQt5 PyQt4)
+endif()
add_custom_target(grc_generated_xml ALL DEPENDS ${generated_xml_files})
install(
- FILES ${xml_files} "${CMAKE_CURRENT_BINARY_DIR}/options.xml"
${generated_xml_files}
+ FILES ${xml_files} ${generated_xml_files}
DESTINATION ${GRC_BLOCKS_DIR}
)
diff --git a/grc/blocks/options.xml.cmakein b/grc/blocks/options.xml
similarity index 99%
rename from grc/blocks/options.xml.cmakein
rename to grc/blocks/options.xml
index 985662f..e032692 100644
--- a/grc/blocks/options.xml.cmakein
+++ b/grc/blocks/options.xml
@@ -16,7 +16,7 @@ from grc_gnuradio import wxgui as grc_wxgui
import wx
#end if
#if $generate_options() == 'qt_gui'
-from address@hidden@ import Qt
+from PyQt5 import Qt
import sys
#end if
#if not $generate_options().startswith('hb')