Skip to content

Fixed a compatibility issue with the 0.11.0 CLI. #28

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.

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 1 commit into from
Jun 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build.sh
arduino-language-server*
37 changes: 26 additions & 11 deletions handler/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,29 @@ import (
)

func generateCpp(inoCode []byte, sourcePath, fqbn string) (cppPath string, cppCode []byte, err error) {
rawTempDir, err := ioutil.TempDir("", "ino2cpp-")
// The CLI expects the `theSketchName.ino` file to be in `some/path/theSketchName` folder.
// Expected folder structure: `/path/to/temp/ino2cpp-${random}/theSketchName/theSketchName.ino`.
rawRootTempDir, err := ioutil.TempDir("", "ino2cpp-")
if err != nil {
err = errors.Wrap(err, "Error while creating temporary directory.")
return
}
tempDir, err := filepath.EvalSymlinks(rawTempDir)
rootTempDir, err := filepath.EvalSymlinks(rawRootTempDir)
if err != nil {
err = errors.Wrap(err, "Error while resolving symbolic links of temporary directory.")
return
}

// Write source file to temp dir
name := filepath.Base(sourcePath)
if !strings.HasSuffix(name, ".ino") {
name += ".ino"
sketchName := filepath.Base(sourcePath)
if strings.HasSuffix(sketchName, ".ino") {
sketchName = sketchName[:len(sketchName)-len(".ino")]
}
inoPath := filepath.Join(tempDir, name)
sketchTempPath := filepath.Join(rootTempDir, sketchName)
createDirIfNotExist(sketchTempPath)

// Write source file to temp dir
sketchFileName := sketchName + ".ino"
inoPath := filepath.Join(sketchTempPath, sketchFileName)
err = ioutil.WriteFile(inoPath, inoCode, 0600)
if err != nil {
err = errors.Wrap(err, "Error while writing source file to temporary directory.")
Expand All @@ -41,14 +47,14 @@ func generateCpp(inoCode []byte, sourcePath, fqbn string) (cppPath string, cppCo
}

// Copy all header files to temp dir
err = copyHeaderFiles(filepath.Dir(sourcePath), tempDir)
err = copyHeaderFiles(filepath.Dir(sourcePath), rootTempDir)
if err != nil {
return
}

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

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

func createDirIfNotExist(dir string) {
if _, err := os.Stat(dir); os.IsNotExist(err) {
err = os.MkdirAll(dir, os.ModePerm)
if err != nil {
panic(err)
}
}
}

func copyHeaderFiles(sourceDir string, destDir string) error {
fileInfos, err := ioutil.ReadDir(sourceDir)
if err != nil {
Expand Down