diff options
Diffstat (limited to 'grc/base')
| -rw-r--r-- | grc/base/.gitignore | 2 | ||||
| -rw-r--r-- | grc/base/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | grc/base/Makefile.am | 41 | ||||
| -rw-r--r-- | grc/base/Platform.py | 2 | ||||
| -rw-r--r-- | grc/base/block_tree.dtd | 6 | ||||
| -rw-r--r-- | grc/base/flow_graph.dtd | 6 |
6 files changed, 11 insertions, 54 deletions
diff --git a/grc/base/.gitignore b/grc/base/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/grc/base/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/grc/base/CMakeLists.txt b/grc/base/CMakeLists.txt index c6d6a09eb..1087e842a 100644 --- a/grc/base/CMakeLists.txt +++ b/grc/base/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2011 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/grc/base/Makefile.am b/grc/base/Makefile.am deleted file mode 100644 index 6a95e33b9..000000000 --- a/grc/base/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright 2008, 2009 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -ourpythondir = $(pkgpythondir)/grc/base -ourpython_PYTHON = \ - odict.py \ - ParseXML.py \ - Block.py \ - Connection.py \ - Constants.py \ - Element.py \ - FlowGraph.py \ - Param.py \ - Platform.py \ - Port.py \ - __init__.py - -ourdatadir = $(pkgpythondir)/grc/base -dist_ourdata_DATA = \ - block_tree.dtd \ - flow_graph.dtd diff --git a/grc/base/Platform.py b/grc/base/Platform.py index a66c28ab9..94d0077ea 100644 --- a/grc/base/Platform.py +++ b/grc/base/Platform.py @@ -87,7 +87,7 @@ class Platform(_Element): else: self._blocks[key] = block self._blocks_n[key] = n - except ParseXML.XMLSyntaxError, e: + except ParseXML.XMLSyntaxError, e: try: #try to add the xml file as a block tree ParseXML.validate_dtd(xml_file, BLOCK_TREE_DTD) self._block_tree_files.append(xml_file) diff --git a/grc/base/block_tree.dtd b/grc/base/block_tree.dtd index be1524a38..7d4a13ccc 100644 --- a/grc/base/block_tree.dtd +++ b/grc/base/block_tree.dtd @@ -1,4 +1,4 @@ -<!-- +<!-- Copyright 2008 Free Software Foundation, Inc. This file is part of GNU Radio @@ -14,10 +14,10 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA --> <!-- - block_tree.dtd + block_tree.dtd Josh Blum The document type definition for a block tree category listing. --> diff --git a/grc/base/flow_graph.dtd b/grc/base/flow_graph.dtd index 904147b37..74f48f10a 100644 --- a/grc/base/flow_graph.dtd +++ b/grc/base/flow_graph.dtd @@ -1,4 +1,4 @@ -<!-- +<!-- Copyright 2008 Free Software Foundation, Inc. This file is part of GNU Radio @@ -14,10 +14,10 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA --> <!-- - flow_graph.dtd + flow_graph.dtd Josh Blum The document type definition for flow graph xml files. --> |