lukas/WordClockESP
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

add fix for latest platformio build changes

Browse Source
This commit is contained in:
Rick Watson 2019-07-14 22:14:22 +01:00
parent 4bb4871a6d
commit 77771aa807
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
.pio
.pioenvs .pioenvs
.piolibdeps .piolibdeps
.clang_complete .clang_complete

31
timelib_fix.py
View File

@ -15,17 +15,22 @@ def findSubDirectoryFiles(root, subDirectoryPattern, fileName):
result.append(candidateFile) result.append(candidateFile)
return result return result
# lib deps directory def deleteTimeHeader(libDepsDir):
libDepsDir = os.path.join(env.subst('$PROJECT_DIR'), '.piolibdeps') timeHeaderFile = "Time.h"
timeHeaderFile = "Time.h" timeLibDirectoryPattern = "Time(_ID[0-9]+)?"
timeLibDirectoryPattern = "Time(_ID[0-9]+)?"
# delete the file, as long as we only find one # delete the file, as long as we only find one
if os.path.isdir(libDepsDir) : if os.path.isdir(libDepsDir) :
deletionCandidates = findSubDirectoryFiles(libDepsDir, timeLibDirectoryPattern, timeHeaderFile) deletionCandidates = findSubDirectoryFiles(libDepsDir, timeLibDirectoryPattern, timeHeaderFile)
numDeletionCandidates = len(deletionCandidates) numDeletionCandidates = len(deletionCandidates)
if numDeletionCandidates == 1: if numDeletionCandidates == 1:
os.remove(deletionCandidates[0]) os.remove(deletionCandidates[0])
elif numDeletionCandidates > 1: elif numDeletionCandidates > 1:
os.write(2, 'Can\'t delete Time.h, more than one instance found:\n' + '\n'.join(deletionCandidates)) os.write(2, 'Can\'t delete Time.h, more than one instance found:\n' + '\n'.join(deletionCandidates))
sys.exit(1) sys.exit(1)
# old lib deps directory
deleteTimeHeader(os.path.join(env.subst('$PROJECT_DIR'), '.piolibdeps'))
# new lib deps directory
deleteTimeHeader(os.path.join(env.subst('$PROJECTLIBDEPS_DIR'), env.subst('$PIOENV')))