5 files changed, 12 insertions, 94 deletions
diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake
index fbbea5fee0..00a53d04d9 100644
--- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake
+++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake
@@ -51,4 +51,12 @@ endif()
 if(NOT DEFINED LIB_SUFFIX AND LIB64_CONVENTION AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$")
     set(LIB_SUFFIX 64)
 endif()
+
+########################################################################
+# Detect /lib versus /lib64
+########################################################################
+if (CMAKE_INSTALL_LIBDIR MATCHES lib64)
+    set(LIB_SUFFIX 64)
+endif()
+
 set(LIB_SUFFIX ${LIB_SUFFIX} CACHE STRING "lib directory suffix")
diff --git a/gr-utils/python/utils/CMakeLists.txt b/gr-utils/python/utils/CMakeLists.txt
index 46a21c1508..3ce335c4ed 100644
--- a/gr-utils/python/utils/CMakeLists.txt
+++ b/gr-utils/python/utils/CMakeLists.txt
@@ -49,6 +49,5 @@ GR_PYTHON_INSTALL(
     gr_plot_short
     gr_plot_qt
     gr_read_file_metadata
-    grcc
     DESTINATION ${GR_RUNTIME_DIR}
 )
diff --git a/gr-utils/python/utils/gr_plot_const b/gr-utils/python/utils/gr_plot_const
index 28f6a540da..653a2539b4 100755
--- a/gr-utils/python/utils/gr_plot_const
+++ b/gr-utils/python/utils/gr_plot_const
@@ -230,11 +230,11 @@ def main():
                       help="Specify where to start in the file [default=%(default)r]")
     parser.add_argument("-R", "--sample-rate", type=float, default=1.0,
                       help="Set the sampler rate of the data [default=%(default)r]")
-    parser.add_argument("file", metavar="FILE", nargs=1,
+    parser.add_argument("file", metavar="FILE",
                       help="Input file with complex samples")
     args = parser.parse_args()
 
-    dc = draw_constellation(args.file[0], args)
+    dc = draw_constellation(args.file, args)
 
 if __name__ == "__main__":
     try:
diff --git a/gr-utils/python/utils/gr_read_file_metadata b/gr-utils/python/utils/gr_read_file_metadata
index 2a907687d6..a05e7ad2c7 100644
--- a/gr-utils/python/utils/gr_read_file_metadata
+++ b/gr-utils/python/utils/gr_read_file_metadata
@@ -76,8 +76,8 @@ if __name__ == "__main__":
     parser = ArgumentParser(conflict_handler="resolve", description=description)
     parser.add_argument("-D", "--detached", action="store_true",
                       help="Used if header is detached.")
-    parser.add_argument("file", metavar="FILE", nargs=1,
+    parser.add_argument("file", metavar="FILE",
                       help="Input file");
     args = parser.parse_args()
 
-    main(args.file[0], args.detached)
+    main(args.file, args.detached)
diff --git a/gr-utils/python/utils/grcc b/gr-utils/python/utils/grcc
deleted file mode 100755
index e93802f051..0000000000
--- a/gr-utils/python/utils/grcc
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2012 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.
-#
-
-import os
-import sys
-from argparse import ArgumentParser
-import warnings
-warnings.simplefilter('ignore')
-
-from gnuradio import gr
-
-try:
-    from grc.core.Platform import Platform
-except ImportError:
-    from gnuradio.grc.core.Platform import Platform
-
-
-class GRCC:
-    def __init__(self, grcfile, out_dir):
-        self.out_dir = out_dir
-        self.platform = Platform(
-            prefs_file=gr.prefs(),
-            version=gr.version(),
-            version_parts=(gr.major_version(), gr.api_version(), gr.minor_version())
-        )
-        data = self.platform.parse_flow_graph(grcfile)
-
-        self.fg = self.platform.get_new_flow_graph()
-        self.fg.import_data(data)
-        self.fg.grc_file_path = os.path.abspath(grcfile)
-        self.fg.validate()
-
-        if not self.fg.is_valid():
-            raise StandardError("\n\n".join(
-                ["Validation failed:"] + self.fg.get_error_messages()
-            ))
-
-        self.gen = self.platform.Generator(self.fg, out_dir)
-        self.gen.write()
-
-    def exec_program(self):
-        progname = self.fg.get_option('id')
-        os.system("{0}/{1}.py".format(self.out_dir, progname))
-
-
-def main():
-    description = "Compiles a GRC file (.grc) into a GNU Radio Python program. The program is stored in ~/.grc_gnuradio by default, but this location can be changed with the -d option."
-
-    parser = ArgumentParser(description=description)
-    parser.add_argument("-d", "--directory",
-            default='{0}/.grc_gnuradio/'.format(os.environ["HOME"]),
-            help="Specify the directory to output the compile program [default=%(default)s]")
-    parser.add_argument("-e", "--execute", action="store_true", default=False,
-            help="Run the program after compiling [default=%(default)s]")
-    parser.add_argument('grc_file', metavar="GRC_FILE", help=".grc file to compile")
-    args = parser.parse_args()
-
-    try:
-        g = GRCC(args.grc_file, args.directory + "/")
-    except Exception as e:
-        sys.stderr.write(str(e) + "\n")
-        sys.stderr.write("Error during file compilation.\n")
-        sys.exit(1)
-
-    if args.execute:
-        g.exec_program()
-
-
-if __name__ == "__main__":
-    main()