Skip to content

Fixed path of the gen cpp and compile_flags files. #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 27, 2020
Merged

Fixed path of the gen cpp and compile_flags files. #29

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d6cc2f
Fixed path of the gen cpp and compile_flags files.
Jul 23, 2020
98e078c
Do not escape line breaks for 'window/showMessage'
Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fixed path of the gen cpp and compile_flags files. 
#28 has fixed the location of the `ino` file but the generated `cpp` and
`compile_flags.txt` were not moved into the sketch folder.
Touching the `ino` file triggered a `'textDocument/didChange'` event,
but the `updateFileData` call failed as the files were not found.

This commit moves the files into the appropriate location.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
  • Loading branch information
Akos Kitta committed Jul 23, 2020
commit 4d6cc2fbc9d8b060f98318fb4ba391ab843e20e3
6 changes: 3 additions & 3 deletions handler/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ func generateCpp(inoCode []byte, sourcePath, fqbn string) (cppPath string, cppCo
}

// Generate compile_flags.txt
cppPath = filepath.Join(rootTempDir, sketchFileName+".cpp")
flagsPath, err := generateCompileFlags(rootTempDir, inoPath, sourcePath, fqbn)
cppPath = filepath.Join(sketchTempPath, sketchFileName+".cpp")
flagsPath, err := generateCompileFlags(sketchTempPath, inoPath, sourcePath, fqbn)
if err != nil {
return
}
Expand All @@ -63,7 +63,7 @@ func generateCpp(inoCode []byte, sourcePath, fqbn string) (cppPath string, cppCo
}

// Generate target file
cppCode, err = generateTargetFile(rootTempDir, inoPath, cppPath, fqbn)
cppCode, err = generateTargetFile(sketchTempPath, inoPath, cppPath, fqbn)
return
}

Expand Down