From f823bc970cc410c46a3bb8124ef466af70bfadaf Mon Sep 17 00:00:00 2001 From: Ericson Date: Mon, 15 Mar 2021 20:27:53 -0300 Subject: [PATCH 1/2] add resource pybagui.glade --- pymakelib/resources/__init__.py | 0 pymakelib/resources/gtk/__init__.py | 0 pymakelib/resources/gtk/pybagui.glade | 132 ++++++++++++++++++++++++++ scripts/pybuildanalyzer2 | 4 +- setup.py | 3 +- 5 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 pymakelib/resources/__init__.py create mode 100644 pymakelib/resources/gtk/__init__.py create mode 100644 pymakelib/resources/gtk/pybagui.glade diff --git a/pymakelib/resources/__init__.py b/pymakelib/resources/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pymakelib/resources/gtk/__init__.py b/pymakelib/resources/gtk/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pymakelib/resources/gtk/pybagui.glade b/pymakelib/resources/gtk/pybagui.glade new file mode 100644 index 0000000..733d68c --- /dev/null +++ b/pymakelib/resources/gtk/pybagui.glade @@ -0,0 +1,132 @@ + + + + + + False + + + + + + True + False + vertical + + + True + False + pybuildanalyzer + True + + + + + + False + True + 0 + + + + + True + True + + + True + True + + + + + + False + + + + + True + False + Memory Regions + + + False + + + + + True + False + vertical + + + True + True + edit-find-symbolic + False + False + + + False + True + 0 + + + + + True + True + in + + + True + True + True + 1 + True + + + + + + + + True + True + 1 + + + + + 1 + + + + + True + False + Memory Details + + + 1 + False + + + + + + + + + + + True + True + 1 + + + + + + diff --git a/scripts/pybuildanalyzer2 b/scripts/pybuildanalyzer2 index cce43dc..67532ef 100755 --- a/scripts/pybuildanalyzer2 +++ b/scripts/pybuildanalyzer2 @@ -515,6 +515,8 @@ if mapfile: # ------------------------------- +from pkg_resources import resource_filename + for sec in sections: if sec.size > 0 and sec.addr > 0: syms = list(filter(lambda x: x.ndx == sec.nr and x.size > 0, symbols)) @@ -536,7 +538,7 @@ if regions and sectionsMap: r.sections.append(sec) if args.gtk: - win = GtkRegionsWin(regions, "pybagui.glade") + win = GtkRegionsWin(regions, resource_filename("pymakelib.resources.gtk", "pybagui.glade")) win.show() else: view = MemRegionView(regions) diff --git a/setup.py b/setup.py index 6de1a76..a5795bf 100644 --- a/setup.py +++ b/setup.py @@ -11,10 +11,11 @@ description="Python Makefile Tool", long_description=long_description, long_description_content_type="text/markdown", - scripts = ['scripts/pymaketool', 'scripts/pymaketesting', 'scripts/pybuildanalyzer', 'scripts/pybuildanalyzer2'], + scripts = ['scripts/pymaketool', 'scripts/pymaketesting', 'scripts/pybuildanalyzer', 'scripts/pybuildanalyzer2', 'scripts/pymakedot'], url="https://github.com/ericsonj/pymaketool", license="MIT", packages=setuptools.find_packages(), + package_data={'': ['*.glade']}, classifiers=[ "Programming Language :: Python :: 3", "License :: OSI Approved :: MIT License", From 51a6ba794962881e4b9e9bcc96d115ac91d952ef Mon Sep 17 00:00:00 2001 From: Ericson Date: Mon, 15 Mar 2021 20:30:01 -0300 Subject: [PATCH 2/2] to v2.0.1 --- docs/source/conf.py | 2 +- scripts/pybuildanalyzer2 | 2 +- scripts/pymaketool | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 729fb2e..3108210 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -22,7 +22,7 @@ author = 'Ericson Joseph' # The full version, including alpha/beta/rc tags -release = '2.0.0' +release = '2.0.1' version = release diff --git a/scripts/pybuildanalyzer2 b/scripts/pybuildanalyzer2 index 67532ef..7d585da 100755 --- a/scripts/pybuildanalyzer2 +++ b/scripts/pybuildanalyzer2 @@ -396,7 +396,7 @@ class MemRegionView: parser = argparse.ArgumentParser(description='Builder Analyzer for ARM firmware') parser.add_argument('elf', type=str, help='ELF file') parser.add_argument('-g', '--gtk', help='Show in gtk window', action="store_true") -parser.add_argument('-v', '--version', action='version', version='%(prog)s 2.0.0') +parser.add_argument('-v', '--version', action='version', version='%(prog)s 2.0.1') args = parser.parse_args() cross_compile_prefix = os.environ.get('CROSS_COMPILE', '') diff --git a/scripts/pymaketool b/scripts/pymaketool index 5b8c784..70509d6 100755 --- a/scripts/pymaketool +++ b/scripts/pymaketool @@ -49,7 +49,7 @@ log = Logger.getLogger() parser = argparse.ArgumentParser() parser.add_argument('goal', type=str, help='Makefile command goal', default=None, nargs='?') parser.add_argument('--init', type=str, help='initialize project', const=os.path.basename(os.getcwd()), dest='project_name', nargs='?') -parser.add_argument('-v', '--version', action='version', version='%(prog)s 2.0.0') +parser.add_argument('-v', '--version', action='version', version='%(prog)s 2.0.1') args = parser.parse_args() goal = args.goal diff --git a/setup.py b/setup.py index a5795bf..a73fa62 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="pymaketool", - version="2.0.0", + version="2.0.1", author="Ericson Joseph", author_email="ericsonjoseph@gmail.com", description="Python Makefile Tool",