bugy#69 updated tools to consider changed project structure

bni72 · Jun 17, 2017 · dabe092 · dabe092
1 parent dbde047
commit dabe092
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/tools/build.py b/tools/build.py
@@ -5,7 +5,7 @@
 import shutil
 import zipfile
 
-import tools.init
+import init
 
 BUILD_FOLDER = 'build'
 
@@ -44,11 +44,12 @@ def get_files(self):
 
 
 build_info = BuildInfo()
-build_info.include(os.path.join('**', '*.py'))
-build_info.include('logging.json')
+build_info.include('launcher.py')
+build_info.include(os.path.join('src', '**', '*.py'))
+build_info.include(os.path.join('conf', 'logging.json'))
 build_info.include(os.path.join('web', '**'))
 build_info.include(os.path.join('conf', 'runners'))
-build_info.exclude('tests')
+build_info.exclude(os.path.join('src', 'tests'))
 build_info.exclude('tools')
 build_info.exclude('samples')
 build_info.exclude(BUILD_FOLDER)
@@ -61,4 +62,4 @@ def get_files(self):
 for file in build_info.get_files():
     zip.write(file)
 
-tools.init.prepare_project('')
+init.prepare_project('')
diff --git a/tools/init.py b/tools/init.py
@@ -5,7 +5,7 @@
 import urllib.request
 from html.parser import HTMLParser
 
-sys.path.insert(1, os.getcwd())
+sys.path.insert(1, os.path.join(sys.path[0], '..', 'src'))
 
 from utils import file_utils