Merge pull request #12 from ericsonj/develop

Develop
ericsonj · Mar 15, 2021 · 1f146fe · 1f146fe
2 parents 9c11cd1 + 51a6ba7
commit 1f146fe
Show file tree

Hide file tree

Showing 7 changed files with 141 additions and 6 deletions.
diff --git 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/pymakelib/resources/__init__.py b/pymakelib/resources/__init__.py
diff --git a/pymakelib/resources/gtk/__init__.py b/pymakelib/resources/gtk/__init__.py
diff --git a/pymakelib/resources/gtk/pybagui.glade b/pymakelib/resources/gtk/pybagui.glade
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+  <requires lib="gtk+" version="3.22"/>
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkHeaderBar">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="title" translatable="yes">pybuildanalyzer</property>
+            <property name="show_close_button">True</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkNotebook">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child>
+              <object class="GtkTreeView" id="tvRegions">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection"/>
+                </child>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Memory Regions</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkSearchEntry" id="entrySearch">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="primary_icon_name">edit-find-symbolic</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkTreeView" id="treeView">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="reorderable">True</property>
+                        <property name="search_column">1</property>
+                        <property name="enable_tree_lines">True</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection"/>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Memory Details</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child type="tab">
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git 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', '')
@@ -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/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
@@ -5,16 +5,17 @@
 
 setuptools.setup(
     name="pymaketool",
-    version="2.0.0",
+    version="2.0.1",
     author="Ericson Joseph",
     author_email="ericsonjoseph@gmail.com",
     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",