platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect "includes" for project generator

Browse Source
This commit is contained in:
Ivan Kravets
2015-06-29 16:36:02 +03:00
parent b80c525952
commit 80b012c157
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platformio/builder/tools/platformio.py
View File

@ -141,8 +141,8 @@ def LookupSources(env, variant_dir, src_dir, duplicate=True, src_filter=None):
for item in _match_sources(src_dir, src_filter or SRC_DEFAULT_FILTER): for item in _match_sources(src_dir, src_filter or SRC_DEFAULT_FILTER):
_reldir = dirname(item) _reldir = dirname(item)
_src_dir = join(src_dir, _reldir) _src_dir = join(src_dir, _reldir) if _reldir else src_dir
_var_dir = join(variant_dir, _reldir) _var_dir = join(variant_dir, _reldir) if _reldir else variant_dir
if _var_dir not in variants: if _var_dir not in variants:
variants.append(_var_dir) variants.append(_var_dir)
@ -173,11 +173,11 @@ def BuildFramework(env):
framework) framework)
def BuildLibrary(env, variant_dir, library_dir, src_filter=None): def BuildLibrary(env, variant_dir, src_dir, src_filter=None):
lib = env.Clone() lib = env.Clone()
return lib.Library( return lib.Library(
lib.subst(variant_dir), lib.subst(variant_dir),
lib.LookupSources(variant_dir, library_dir, src_filter=src_filter) lib.LookupSources(variant_dir, src_dir, src_filter=src_filter)
) )

6
platformio/ide/tpls/qtcreator/platformio.pro.tpl
View File

@ -2,19 +2,17 @@ win32 {
HOMEDIR += $$(USERPROFILE) HOMEDIR += $$(USERPROFILE)
} }
else { else {
HOMEDIR += $$(PWD) HOMEDIR += $$(HOME)
} }
% for include in includes: % for include in includes:
% if include.startswith(user_home_dir): % if include.startswith(user_home_dir):
INCLUDEPATH += "${HOME}{{include.replace(user_home_dir, "")}}" INCLUDEPATH += "$$(HOMEDIR){{include.replace(user_home_dir, "")}}"
% else: % else:
INCLUDEPATH += "{{include}}" INCLUDEPATH += "{{include}}"
% end % end
% end % end
win32:INCLUDEPATH ~= s,/,\\,g
% for define in defines: % for define in defines:
DEFINES += "{{define}}" DEFINES += "{{define}}"
% end % end