-
-
Notifications
You must be signed in to change notification settings - Fork 381
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed compiler-cache on Windows when there are non-ASCII characters i…
…n file path (#2733) * Increased logging during compile * Added integration test * Fixed dependency file parsing on Windows * Fixed panic in convertAnsiBytesToString implementation
- Loading branch information
Showing
5 changed files
with
190 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
// This file is part of arduino-cli. | ||
// | ||
// Copyright 2024 ARDUINO SA (http://www.arduino.cc/) | ||
// | ||
// This software is released under the GNU General Public License version 3, | ||
// which covers the main part of arduino-cli. | ||
// The terms of this license can be found at: | ||
// https://www.gnu.org/licenses/gpl-3.0.en.html | ||
// | ||
// You can be released from the requirements of the above licenses by purchasing | ||
// a commercial license. Buying such a license is mandatory if you want to | ||
// modify or otherwise use the software for commercial activities involving the | ||
// Arduino software without disclosing the source code of your own applications. | ||
// To purchase a commercial license, send an email to [email protected]. | ||
|
||
//go:build !windows | ||
|
||
package utils | ||
|
||
import ( | ||
"errors" | ||
) | ||
|
||
// placeholder for non-Windows machines | ||
func convertAnsiBytesToString([]byte) (string, error) { | ||
return "", errors.New("unimplemented") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
// This file is part of arduino-cli. | ||
// | ||
// Copyright 2024 ARDUINO SA (http://www.arduino.cc/) | ||
// | ||
// This software is released under the GNU General Public License version 3, | ||
// which covers the main part of arduino-cli. | ||
// The terms of this license can be found at: | ||
// https://www.gnu.org/licenses/gpl-3.0.en.html | ||
// | ||
// You can be released from the requirements of the above licenses by purchasing | ||
// a commercial license. Buying such a license is mandatory if you want to | ||
// modify or otherwise use the software for commercial activities involving the | ||
// Arduino software without disclosing the source code of your own applications. | ||
// To purchase a commercial license, send an email to [email protected]. | ||
|
||
package utils | ||
|
||
import ( | ||
"golang.org/x/sys/windows" | ||
) | ||
|
||
func convertAnsiBytesToString(data []byte) (string, error) { | ||
if len(data) == 0 { | ||
return "", nil | ||
} | ||
dataSize := int32(len(data)) | ||
size, err := windows.MultiByteToWideChar(windows.GetACP(), 0, &data[0], dataSize, nil, 0) | ||
if err != nil { | ||
return "", err | ||
} | ||
utf16 := make([]uint16, size) | ||
if _, err := windows.MultiByteToWideChar(windows.GetACP(), 0, &data[0], dataSize, &utf16[0], size); err != nil { | ||
return "", err | ||
} | ||
return windows.UTF16ToString(utf16), nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
// This file is part of arduino-cli. | ||
// | ||
// Copyright 2024 ARDUINO SA (http://www.arduino.cc/) | ||
// | ||
// This software is released under the GNU General Public License version 3, | ||
// which covers the main part of arduino-cli. | ||
// The terms of this license can be found at: | ||
// https://www.gnu.org/licenses/gpl-3.0.en.html | ||
// | ||
// You can be released from the requirements of the above licenses by purchasing | ||
// a commercial license. Buying such a license is mandatory if you want to | ||
// modify or otherwise use the software for commercial activities involving the | ||
// Arduino software without disclosing the source code of your own applications. | ||
// To purchase a commercial license, send an email to [email protected]. | ||
|
||
package compile | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/arduino/arduino-cli/internal/integrationtest" | ||
"github.com/arduino/go-paths-helper" | ||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
func TestBuildCacheLibWithNonASCIIChars(t *testing.T) { | ||
// See: https://github.com/arduino/arduino-cli/issues/2671 | ||
|
||
env, cli := integrationtest.CreateArduinoCLIWithEnvironment(t) | ||
t.Cleanup(env.CleanUp) | ||
|
||
tmpUserDir, err := paths.MkTempDir("", "Håkan") | ||
require.NoError(t, err) | ||
t.Cleanup(func() { tmpUserDir.RemoveAll() }) | ||
customEnv := cli.GetDefaultEnv() | ||
customEnv["ARDUINO_DIRECTORIES_USER"] = tmpUserDir.String() | ||
|
||
// Install Arduino AVR Boards and Servo lib | ||
_, _, err = cli.Run("core", "install", "arduino:[email protected]") | ||
require.NoError(t, err) | ||
_, _, err = cli.RunWithCustomEnv(customEnv, "lib", "install", "Servo") | ||
require.NoError(t, err) | ||
|
||
// Make a temp sketch | ||
sketchDir := tmpUserDir.Join("ServoSketch") | ||
sketchFile := sketchDir.Join("ServoSketch.ino") | ||
require.NoError(t, sketchDir.Mkdir()) | ||
require.NoError(t, sketchFile.WriteFile( | ||
[]byte("#include <Servo.h>\nvoid setup() {}\nvoid loop() {}\n"), | ||
)) | ||
|
||
// Compile sketch | ||
_, _, err = cli.RunWithCustomEnv(customEnv, "compile", "-b", "arduino:avr:uno", sketchFile.String()) | ||
require.NoError(t, err) | ||
|
||
// Compile sketch again | ||
out, _, err := cli.RunWithCustomEnv(customEnv, "compile", "-b", "arduino:avr:uno", "-v", sketchFile.String()) | ||
require.NoError(t, err) | ||
require.Contains(t, string(out), "Compiling library \"Servo\"\nUsing previously compiled file") | ||
} |