Move VERSION inside chipsec/ directory

tweksteen · Aug 4, 2016 · a453c2a · a453c2a
1 parent 3871b8d
commit a453c2a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/source/tool/VERSION → source/tool/chipsec/VERSION b/source/tool/VERSION → source/tool/chipsec/VERSION
diff --git a/source/tool/chipsec/helper/linux/cores.c b/source/tool/chipsec/helper/linux/cores.c
@@ -11,7 +11,6 @@
 #include <asm/types.h>
 #include <linux/types.h>
 #define u64 uint64_t
-#include "../../../../drivers/linux/include/chipsec.h"
 
 #define BUF_LEN 4096
 

diff --git a/source/tool/chipsec_main.py b/source/tool/chipsec_main.py
@@ -159,7 +159,7 @@ def __init__(self, argv):
         self._unkownPlatform = True
         self._list_tags      = False
         self.version="    "
-        self.VERSION_FILE = os.path.join( self.CHIPSEC_FOLDER , "VERSION" )
+        self.VERSION_FILE = os.path.join( self.CHIPSEC_FOLDER , "chipsec", "VERSION" )
         if os.path.exists( self.VERSION_FILE ):
             with open(self.VERSION_FILE, "r") as verFile:
                 self.version = verFile.read()

diff --git a/source/tool/setup.py b/source/tool/setup.py
@@ -33,7 +33,7 @@
 tool_dir = os.path.dirname(os.path.abspath(__file__))
 
 package_data = { "chipsec.cfg": ["*.xml", "*.xsd"],
-                 ".": ["VERSION"]
+                 "chipsec": ["VERSION"]
                }
 
 if platform.system().lower() == "windows":
@@ -49,10 +49,10 @@
 
 if platform.system().lower() == "linux":
     data_files = []
-    extensions = [ Extension('cores', sources=['chipsec/helper/linux/cores.c']) ]
+    extensions = [ Extension('chipsec.helper.linux.cores', sources=['chipsec/helper/linux/cores.c']) ]
 
 version      = ""
-VERSION_FILE = os.path.join( os.path.dirname( __file__ ),'VERSION' )
+VERSION_FILE = os.path.join(os.path.dirname(__file__), 'chipsec', 'VERSION')
 if os.path.exists( VERSION_FILE ):
     with open(VERSION_FILE, "r") as verFile:
         version = "." + verFile.read()
@@ -61,16 +61,15 @@
 if os.path.exists( build_dir ):
     dir_util.remove_tree( build_dir )
 
-mypackages = ['.']
-for current, dirs, files in os.walk(tool_dir ):
+#TODO: Replace with setuptools find_packages()
+mypackages = []
+for current, dirs, files in os.walk(tool_dir):
     for file in files:
         if file == "__init__.py":
             pkg = current.replace(tool_dir+os.path.sep,"")
             pkg = pkg.replace(os.path.sep,'.')
             mypackages.append(pkg)
 
-#print mypackages
-
 
 setup(
         name            = 'chipsec',
@@ -81,6 +80,7 @@
         url             = 'https://github.com/chipsec/chipsec',
 
         data_files      = data_files,
+        scripts         = ['chipsec_main.py', 'chipsec_util.py'],
         packages        = mypackages,
         package_data    = package_data,
         ext_modules     = extensions