sh-edraft.de/sh_cpl
2
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

CLI Release 2021.4.0.post3

Browse Source
This commit is contained in:
Sven Heidemann
2021-05-22 15:10:50 +02:00
parent 59832742b6
commit 7a48917fb4
21 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpl_cli/live_server/__init__.py
View File

@@ -15,11 +15,11 @@ __title__ = 'cpl_cli.live_server'
__author__ = 'Sven Heidemann'
__license__ = 'MIT'
__copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
__version__ = '2021.4.0.post2'
__version__ = '2021.4.0.post3'
from collections import namedtuple
# imports:
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
version_info = VersionInfo(major='2021', minor='4', micro='0.post2')
version_info = VersionInfo(major='2021', minor='4', micro='0.post3')

17
src/cpl_cli/live_server/live_server_thread.py
View File

@@ -71,13 +71,14 @@ class LiveServerThread(threading.Thread):
return
# set cwd to src/
self._env.set_working_directory(os.path.abspath(os.path.join(self._path, '../')))
self._env.set_working_directory(os.path.abspath(os.path.join(self._path)))
src_cwd = os.path.abspath(os.path.join(self._path, '../'))
if sys.platform == 'win32':
self._env_vars['PYTHONPATH'] = f'{self._env.working_directory};' \
f'{os.path.join(self._env.working_directory, self._build_settings.source_path)}'
self._env_vars['PYTHONPATH'] = f'{src_cwd};' \
f'{os.path.join(self._env.working_directory, self._build_settings.source_path)}'
else:
self._env_vars['PYTHONPATH'] = f'{self._env.working_directory}:' \
f'{os.path.join(self._env.working_directory, self._build_settings.source_path)}'
self._env_vars['PYTHONPATH'] = f'{src_cwd}:' \
f'{os.path.join(self._env.working_directory, self._build_settings.source_path)}'
Console.set_foreground_color(ForegroundColorEnum.green)
Console.write_line('Read successfully')
@@ -86,6 +87,8 @@ class LiveServerThread(threading.Thread):
Console.write_line(f'Started at {now.strftime("%Y-%m-%d %H:%M:%S")}\n\n')
Console.set_foreground_color(ForegroundColorEnum.default)
os.chdir(self._env.working_directory)
self._command = [self._executable, self._main, ''.join(self._args)]
self._command = [self._executable, self._main]
if len(self._args) > 0:
self._command.append(''.join(self._args))
subprocess.run(self._command, env=self._env_vars)