small change to structure so that the default vector data is included…

… in the python package
danielplohmann · Jan 16, 2019 · 25f1ba0 · 25f1ba0
1 parent 509e943
commit 25f1ba0
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/data/html_frame.html → apiscout/data/html_frame.html b/data/html_frame.html → apiscout/data/html_frame.html
diff --git a/data/winapi1024v1.txt → apiscout/data/winapi1024v1.txt b/data/winapi1024v1.txt → apiscout/data/winapi1024v1.txt
diff --git a/data/winapi_contexts.csv → apiscout/data/winapi_contexts.csv b/data/winapi_contexts.csv → apiscout/data/winapi_contexts.csv
diff --git a/collect.py b/collect.py
@@ -48,7 +48,7 @@ def get_all_db_files():
 
 
 def get_winapi1024_path():
-    return get_this_dir() + os.sep + "data" + os.sep + "winapi1024v1.txt"
+    return get_this_dir() + os.sep + "apiscout" + os.sep + "data" + os.sep + "winapi1024v1.txt"
 
 
 def get_file_list(root_path, required_part):

diff --git a/export.py b/export.py
@@ -39,7 +39,7 @@ def get_this_dir():
     return os.path.abspath(os.path.join(os.path.dirname(__file__)))
 
 def get_winapi1024_path():
-    return get_this_dir() + os.sep + "data" + os.sep + "winapi1024v1.txt"
+    return get_this_dir() + os.sep + "apiscout" + os.sep + "data" + os.sep + "winapi1024v1.txt"
 
 
 def main():

diff --git a/match.py b/match.py
@@ -39,7 +39,7 @@ def get_this_dir():
     return os.path.abspath(os.path.join(os.path.dirname(__file__)))
 
 def get_winapi1024_path():
-    return get_this_dir() + os.sep + "data" + os.sep + "winapi1024v1.txt"
+    return get_this_dir() + os.sep + "apiscout" + os.sep +  "data" + os.sep + "winapi1024v1.txt"
 
 
 def main():

diff --git a/scout.py b/scout.py
@@ -45,7 +45,7 @@ def get_all_db_files():
 
 
 def get_winapi1024_path():
-    return get_this_dir() + os.sep + "data" + os.sep + "winapi1024v1.txt"
+    return get_this_dir() + os.sep + "apiscout" + os.sep + "data" + os.sep + "winapi1024v1.txt"
 
 
 def get_base_addr(args):

diff --git a/setup.py b/setup.py
@@ -18,5 +18,7 @@
     author_email='daniel.plohmann@mailbox.org',
     url='https://github.com/daniel-plohmann/apiscout',
     license=LICENSE,
-    packages=find_packages(exclude=('tests', 'docs'))
+    # packages=find_packages(exclude=('tests', 'docs')),
+    packages = ["apiscout"],
+    package_data={"apiscout": ["data/winapi1024v1.txt"]},
 )
diff --git a/tests/testVector.py b/tests/testVector.py
@@ -29,6 +29,7 @@
 import unittest
 
 from apiscout.ApiVector import ApiVector
+import apiscout
 
 LOG = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO, format="%(asctime)-15s %(message)s")
@@ -97,9 +98,9 @@ def testDictConversions(self):
         self.assertEquals(result_dict, expected)
 
     def testLoadWinApi1024Definition(self):
-        THIS_FILE_PATH = str(os.path.abspath(__file__))
-        PROJECT_ROOT = str(os.path.abspath(os.sep.join([THIS_FILE_PATH, "..", ".."])))
-        winapi_path = os.sep.join([PROJECT_ROOT , "data", "winapi1024v1.txt"])
+        module_path = os.path.dirname(os.path.realpath(apiscout.__file__))
+        LOG.info("Using module path %s" % module_path)
+        winapi_path = os.sep.join([module_path, "data", "winapi1024v1.txt"])
         apivector = ApiVector(winapi_path)
         self.assertEquals(len(apivector._winapi1024), 1024)