Relocated libPINCE files to it's own folder

KuhakuPixel · Aug 26, 2016 · 947b849 · 947b849
1 parent 2a723e1
commit 947b849
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 24 deletions.
diff --git a/GUI/CustomAbstractTableModels/AsciiModel.py b/GUI/CustomAbstractTableModels/AsciiModel.py
@@ -1,7 +1,7 @@
 from PyQt5.QtCore import QVariant, Qt
 from GUI.CustomAbstractTableModels.HexModel import QHexModel
 
-import SysUtils
+from libPINCE import SysUtils
 
 
 class QAsciiModel(QHexModel):

diff --git a/GUI/CustomLabels/FlagRegisterLabel.py b/GUI/CustomLabels/FlagRegisterLabel.py
@@ -1,7 +1,7 @@
 from PyQt5.QtWidgets import QLabel, QMessageBox
 from PyQt5.QtGui import QCursor
 from PyQt5.QtCore import Qt
-import GDB_Engine
+from libPINCE import GDB_Engine
 from PINCE import DialogWithButtonsForm
 
 

diff --git a/GUI/CustomLabels/RegisterLabel.py b/GUI/CustomLabels/RegisterLabel.py
@@ -1,7 +1,7 @@
 from PyQt5.QtWidgets import QLabel
 from PyQt5.QtGui import QCursor
 from PyQt5.QtCore import Qt
-import GDB_Engine
+from libPINCE import GDB_Engine
 from PINCE import DialogWithButtonsForm
 
 

diff --git a/Notes.txt b/Notes.txt
@@ -1,12 +1,12 @@
 Code Relocations:
+	--libPINCE
+		GuiUtils.py is used to contain GUI related utility functions
+		SysUtils.py is used to contain all useful but non-GDB related libraries such as psutils
+		GDB_Engine.py is used to contain all GDB related functions
+		type_defs.py is used to contain all static&shared variable definitions
+		All codes that'll be injected to the inferior go to the folder "Injection"
+		/gdb_python_script/ contains all the python scripts that'll invoked from the gdb
 	PINCE.py is used to interract with GUI and other utility libraries
-	GuiUtils.py is used to contain GUI related utility functions
-	SysUtils.py is used to contain all useful but non-GDB related libraries such as psutils
-	GDB_Engine.py is used to contain all GDB related functions
-	type_defs.py is used to contain all static&shared variable definitions
-	All codes that'll be injected to the inferior go to the folder "Injection"
-	/linux-inject/ injects the codes found in the Injection directory to the target process, if your contribution about linux-inject is not only PINCE specific, please also contribute to the original project itself here->https://github.com/gaffe23/linux-inject
-	/gdb_python_script/ contains all the python scripts that'll invoked from the gdb
 	/media/ contains all the images, icons n' stuff
 	/pince-non-stop-files/ contains old codes that made the non-stop mode alive. It'll be re-implemented when the project finishes at basic level, this folder is just a... museum(?) for now
 **Don't touch anything in GUI folder, it contains auto-generated codes created by pyuic
diff --git a/PINCE.py b/PINCE.py
@@ -29,10 +29,10 @@
 import sys
 import traceback
 
-import GuiUtils
-import SysUtils
-import GDB_Engine
-import type_defs
+from libPINCE import GuiUtils
+from libPINCE import SysUtils
+from libPINCE import GDB_Engine
+from libPINCE import type_defs
 
 from GUI.MainWindow import Ui_MainWindow as MainWindow
 from GUI.SelectProcess import Ui_MainWindow as ProcessWindow

diff --git a/gdb_python_scripts/__init__.py → __init__.py b/gdb_python_scripts/__init__.py → __init__.py
diff --git a/libPINCE/.gitignore b/libPINCE/.gitignore
@@ -0,0 +1,5 @@
+__pycache__/
+.idea/*
+.directory
+*.py[cod]
+*$py.class
diff --git a/GDB_Engine.py → libPINCE/GDB_Engine.py b/GDB_Engine.py → libPINCE/GDB_Engine.py
@@ -22,8 +22,8 @@
 import os
 import ctypes
 import pickle
-import SysUtils
-import type_defs
+from . import SysUtils
+from . import type_defs
 
 INDEX_BYTE = type_defs.VALUE_INDEX.INDEX_BYTE
 INDEX_2BYTES = type_defs.VALUE_INDEX.INDEX_2BYTES
@@ -229,7 +229,7 @@ def attach(pid):
 
     # gdb scripts needs to know PINCE directory, unfortunately they don't start from the place where script exists
     send_command('set $PINCE_PATH=' + '"' + currentdir + '"')
-    send_command("source gdb_python_scripts/GDBCommandExtensions.py")
+    send_command("source libPINCE/gdb_python_scripts/GDBCommandExtensions.py")
     inferior_arch = get_inferior_arch()
     continue_inferior()
 

diff --git a/GuiUtils.py → libPINCE/GuiUtils.py b/GuiUtils.py → libPINCE/GuiUtils.py
@@ -17,7 +17,7 @@
 """
 from PyQt5.QtWidgets import QDesktopWidget
 from re import search, sub
-import type_defs
+from . import type_defs
 
 INDEX_BYTE = type_defs.VALUE_INDEX.INDEX_BYTE
 INDEX_2BYTES = type_defs.VALUE_INDEX.INDEX_2BYTES

diff --git a/Injection/.gitignore → libPINCE/Injection/.gitignore b/Injection/.gitignore → libPINCE/Injection/.gitignore
diff --git a/Injection/Notes.txt → libPINCE/Injection/Notes.txt b/Injection/Notes.txt → libPINCE/Injection/Notes.txt
diff --git a/Injection/example.c → libPINCE/Injection/example.c b/Injection/example.c → libPINCE/Injection/example.c
diff --git a/SysUtils.py → libPINCE/SysUtils.py b/SysUtils.py → libPINCE/SysUtils.py
@@ -20,7 +20,7 @@
 import shutil
 import sys
 import collections
-import type_defs
+from . import type_defs
 from re import match, search, IGNORECASE, split
 
 PINCE_IPC_PATH = type_defs.PATHS.PINCE_IPC_PATH

diff --git a/libPINCE/__init__.py b/libPINCE/__init__.py
@@ -0,0 +1 @@
+
diff --git a/gdb_python_scripts/GDBCommandExtensions.py → ...db_python_scripts/GDBCommandExtensions.py b/gdb_python_scripts/GDBCommandExtensions.py → ...db_python_scripts/GDBCommandExtensions.py
@@ -27,9 +27,9 @@
 PINCE_PATH = gdbvalue.string()
 sys.path.append(PINCE_PATH)  # Adds the PINCE directory to PYTHONPATH to import libraries from PINCE
 
-import gdb_python_scripts.ScriptUtils as ScriptUtils
-import SysUtils
-import type_defs
+from libPINCE.gdb_python_scripts import ScriptUtils
+from libPINCE import SysUtils
+from libPINCE import type_defs
 
 REGISTERS_32 = ["eax", "ebx", "ecx", "edx", "esi", "edi", "ebp", "esp", "eip"]
 REGISTERS_64 = ["rax", "rbx", "rcx", "rdx", "rsi", "rdi", "rbp", "rsp", "rip", "r8", "r9", "r10", "r11", "r12",

diff --git a/gdb_python_scripts/ScriptUtils.py → libPINCE/gdb_python_scripts/ScriptUtils.py b/gdb_python_scripts/ScriptUtils.py → libPINCE/gdb_python_scripts/ScriptUtils.py
@@ -24,8 +24,8 @@
 PINCE_PATH = gdbvalue.string()
 sys.path.append(PINCE_PATH)  # Adds the PINCE directory to PYTHONPATH to import libraries from PINCE
 
-import SysUtils
-import type_defs
+from libPINCE import SysUtils
+from libPINCE import type_defs
 
 INDEX_BYTE = type_defs.VALUE_INDEX.INDEX_BYTE
 INDEX_2BYTES = type_defs.VALUE_INDEX.INDEX_2BYTES

diff --git a/libPINCE/gdb_python_scripts/__init__.py b/libPINCE/gdb_python_scripts/__init__.py
@@ -0,0 +1 @@
+
diff --git a/type_defs.py → libPINCE/type_defs.py b/type_defs.py → libPINCE/type_defs.py