From 073e79d03b53d6e9617e402826d49e4384611c81 Mon Sep 17 00:00:00 2001 From: Haolan Date: Wed, 10 Sep 2025 11:47:02 +0800 Subject: [PATCH] chore: rename ArchiveSrcDir --- internal/crosscompile/compile/compile.go | 8 ++++---- internal/crosscompile/compile/libc/libc_test.go | 8 ++++---- internal/crosscompile/compile/libc/newlibesp.go | 8 ++++---- internal/crosscompile/compile/libc/picolibc.go | 8 ++++---- internal/crosscompile/compile/rtlib/compiler_rt.go | 8 ++++---- internal/crosscompile/compile/rtlib/rt_test.go | 4 ++-- internal/crosscompile/libc.go | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/crosscompile/compile/compile.go b/internal/crosscompile/compile/compile.go index acfec5b3..ded11530 100644 --- a/internal/crosscompile/compile/compile.go +++ b/internal/crosscompile/compile/compile.go @@ -104,10 +104,10 @@ type CompileConfig struct { } type LibConfig struct { - Url string - Name string // Library name (e.g., "picolibc", "musl", "glibc") - Version string - ArchiveSrcDir string + Url string + Name string // Library name (e.g., "picolibc", "musl", "glibc") + Version string + ResourceSubDir string } // String returns a string representation of the library configuration diff --git a/internal/crosscompile/compile/libc/libc_test.go b/internal/crosscompile/compile/libc/libc_test.go index 9a994ef3..b866f1dd 100644 --- a/internal/crosscompile/compile/libc/libc_test.go +++ b/internal/crosscompile/compile/libc/libc_test.go @@ -26,8 +26,8 @@ func TestGetNewlibESP32Config_LibConfig(t *testing.T) { } expectedArchiveSrcDir := "newlib-esp-4.3.0_20250211-patch3" - if config.ArchiveSrcDir != expectedArchiveSrcDir { - t.Errorf("Expected ArchiveSrcDir '%s', got '%s'", expectedArchiveSrcDir, config.ArchiveSrcDir) + if config.ResourceSubDir != expectedArchiveSrcDir { + t.Errorf("Expected ResourceSubDir '%s', got '%s'", expectedArchiveSrcDir, config.ResourceSubDir) } // Test String() method @@ -57,8 +57,8 @@ func TestGetPicolibcConfig_LibConfig(t *testing.T) { } expectedArchiveSrcDir := "picolibc-main" - if config.ArchiveSrcDir != expectedArchiveSrcDir { - t.Errorf("Expected ArchiveSrcDir '%s', got '%s'", expectedArchiveSrcDir, config.ArchiveSrcDir) + if config.ResourceSubDir != expectedArchiveSrcDir { + t.Errorf("Expected ResourceSubDir '%s', got '%s'", expectedArchiveSrcDir, config.ResourceSubDir) } // Test String() method diff --git a/internal/crosscompile/compile/libc/newlibesp.go b/internal/crosscompile/compile/libc/newlibesp.go index cb55f495..eb3917cc 100644 --- a/internal/crosscompile/compile/libc/newlibesp.go +++ b/internal/crosscompile/compile/libc/newlibesp.go @@ -29,10 +29,10 @@ func withDefaultCCFlags(ccflags []string) []string { // GetNewlibESP32Config returns the configuration for downloading and building newlib for ESP32 func GetNewlibESP32Config() compile.LibConfig { return compile.LibConfig{ - Url: "https://github.com/goplus/newlib/archive/refs/tags/esp-4.3.0_20250211-patch3.tar.gz", - Name: "newlib-esp32", - Version: "esp-4.3.0_20250211-patch3", - ArchiveSrcDir: "newlib-esp-4.3.0_20250211-patch3", + Url: "https://github.com/goplus/newlib/archive/refs/tags/esp-4.3.0_20250211-patch3.tar.gz", + Name: "newlib-esp32", + Version: "esp-4.3.0_20250211-patch3", + ResourceSubDir: "newlib-esp-4.3.0_20250211-patch3", } } diff --git a/internal/crosscompile/compile/libc/picolibc.go b/internal/crosscompile/compile/libc/picolibc.go index 680c1ed7..45344762 100644 --- a/internal/crosscompile/compile/libc/picolibc.go +++ b/internal/crosscompile/compile/libc/picolibc.go @@ -10,10 +10,10 @@ import ( // GetPicolibcConfig returns the configuration for downloading and building picolibc func GetPicolibcConfig() compile.LibConfig { return compile.LibConfig{ - Name: "picolibc", - Version: "v0.1.0", - Url: "https://github.com/goplus/picolibc/archive/refs/heads/main.zip", - ArchiveSrcDir: "picolibc-main", + Name: "picolibc", + Version: "v0.1.0", + Url: "https://github.com/goplus/picolibc/archive/refs/heads/main.zip", + ResourceSubDir: "picolibc-main", } } diff --git a/internal/crosscompile/compile/rtlib/compiler_rt.go b/internal/crosscompile/compile/rtlib/compiler_rt.go index d526251c..0be8cf64 100644 --- a/internal/crosscompile/compile/rtlib/compiler_rt.go +++ b/internal/crosscompile/compile/rtlib/compiler_rt.go @@ -102,10 +102,10 @@ func withPlatformSpecifiedFiles(baseDir, target string, files []string) []string func GetCompilerRTConfig() compile.LibConfig { return compile.LibConfig{ - Name: "compiler-rt", - Url: "https://github.com/goplus/compiler-rt/archive/refs/tags/xtensa_release_19.1.2.tar.gz", - Version: "xtensa_release_19.1.2", - ArchiveSrcDir: "compiler-rt-xtensa_release_19.1.2", + Name: "compiler-rt", + Url: "https://github.com/goplus/compiler-rt/archive/refs/tags/xtensa_release_19.1.2.tar.gz", + Version: "xtensa_release_19.1.2", + ResourceSubDir: "compiler-rt-xtensa_release_19.1.2", } } diff --git a/internal/crosscompile/compile/rtlib/rt_test.go b/internal/crosscompile/compile/rtlib/rt_test.go index 6e7d1541..5f5f2548 100644 --- a/internal/crosscompile/compile/rtlib/rt_test.go +++ b/internal/crosscompile/compile/rtlib/rt_test.go @@ -25,8 +25,8 @@ func TestGetCompilerRTConfig_LibConfig(t *testing.T) { } expectedArchiveSrcDir := "compiler-rt-xtensa_release_19.1.2" - if config.ArchiveSrcDir != expectedArchiveSrcDir { - t.Errorf("Expected ArchiveSrcDir '%s', got '%s'", expectedArchiveSrcDir, config.ArchiveSrcDir) + if config.ResourceSubDir != expectedArchiveSrcDir { + t.Errorf("Expected ResourceSubDir '%s', got '%s'", expectedArchiveSrcDir, config.ResourceSubDir) } // Test String() method diff --git a/internal/crosscompile/libc.go b/internal/crosscompile/libc.go index c19eeab9..225a4a56 100644 --- a/internal/crosscompile/libc.go +++ b/internal/crosscompile/libc.go @@ -40,7 +40,7 @@ func getLibcCompileConfigByName(baseDir, libcName, target, mcpu string) (outputD return libcDir, compileConfig, err } - if err = checkDownloadAndExtractLib(config.Url, libcDir, config.ArchiveSrcDir); err != nil { + if err = checkDownloadAndExtractLib(config.Url, libcDir, config.ResourceSubDir); err != nil { return } @@ -70,7 +70,7 @@ func getRTCompileConfigByName(baseDir, rtName, target string) (outputDir string, return rtDir, compileConfig, err } - if err = checkDownloadAndExtractLib(config.Url, rtDir, config.ArchiveSrcDir); err != nil { + if err = checkDownloadAndExtractLib(config.Url, rtDir, config.ResourceSubDir); err != nil { return }