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

2021.4 #19

Merged
edraft merged 237 commits from 2021.4 into master 2021-04-01 10:13:33 +02:00
Conversation 0 Commits 237 Files Changed 325 +10 -6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit df5e61cf98 - Show all commits

16
src/cpl_cli/publish/publisher_service.py
View File

@ -39,6 +39,10 @@ class PublisherService(PublisherABC):
self._included_dirs: list[str] = [] self._included_dirs: list[str] = []
self._distributed_files: list[str] = [] self._distributed_files: list[str] = []
self._src_path_part = 'src/'
if sys.platform == 'win32':
self._src_path_part = 'src\\'
@property @property
def source_path(self) -> str: def source_path(self) -> str:
return self._source_path return self._source_path
@ -54,8 +58,8 @@ class PublisherService(PublisherABC):
:param file: :param file:
:return: :return:
""" """
if 'src/' in file: if self._src_path_part in file:
file = file.replace('src/', '', 1) file = file.replace(self._src_path_part, '', 1)
dirs = os.path.dirname(file).split('/') dirs = os.path.dirname(file).split('/')
for d in dirs: for d in dirs:
@ -230,8 +234,8 @@ class PublisherService(PublisherABC):
for file in self._included_files: for file in self._included_files:
dist_file = file dist_file = file
if 'src/' in dist_file: if self._src_path_part in dist_file:
dist_file = dist_file.replace('src/', '', 1) dist_file = dist_file.replace(self._src_path_part, '', 1)
output_path = os.path.join(build_path, os.path.dirname(dist_file)) output_path = os.path.join(build_path, os.path.dirname(dist_file))
output_file = os.path.join(build_path, dist_file) output_file = os.path.join(build_path, dist_file)
@ -252,8 +256,8 @@ class PublisherService(PublisherABC):
for empty_dir in self._included_dirs: for empty_dir in self._included_dirs:
dist_dir = empty_dir dist_dir = empty_dir
if 'src/' in dist_dir: if self._src_path_part in dist_dir:
dist_dir = dist_dir.replace('src/', '', 1) dist_dir = dist_dir.replace(self._src_path_part, '', 1)
output_path = os.path.join(build_path, dist_dir) output_path = os.path.join(build_path, dist_dir)
if not os.path.isdir(output_path): if not os.path.isdir(output_path):