Merge upstream/main into readme branch and resolve README install docs conflict

Author: luoliwoshang

.github/actions/setup-llcppg/action.yml

@@ -8,8 +8,8 @@ inputs:
     description: "LLVM version to install (e.g. 18)"
     default: "19"
   llgo:
-    description: "LLGo version to download (e.g. v0.12.1)"
-    default: "v0.12.1"
+    description: "LLGo version to download (e.g. v0.12.14)"
+    default: "v0.12.14"
 runs:
   using: "composite"
   steps:
@@ -50,10 +50,6 @@ runs:
       echo "LLGO_ROOT: $LLGO_ROOT"
       llgo version
       clang --version
-  - name: Build
-    shell: bash
-    run: go build -v ./...
-
   - name: Install llcppg modules
     shell: bash
     run: |

.github/actions/setup-llcppg/download-llgo.sh

@@ -39,7 +39,8 @@ esac
 # Remove 'v' prefix from version if present
 VERSION_NUMBER="${VERSION#v}"
 FILENAME="llgo${VERSION_NUMBER}.${OS}-${ARCH}.tar.gz"
-URL="https://github.com/goplus/llgo/releases/download/${VERSION}/${FILENAME}"
+# Use fork releases while upstream release is not available yet.
+URL="https://github.com/luoliwoshang/llgo/releases/download/${VERSION}/${FILENAME}"
 
 echo "Downloading LLGo ${VERSION} for ${OS}-${ARCH}..."
 echo "URL: $URL"

.github/workflows/end2end.yml

@@ -24,7 +24,7 @@ jobs:
           - ubuntu-latest
           - ubuntu-24.04-arm
         llvm: [19]
-        llgo: [v0.12.1]
+        llgo: [v0.12.14]
         go: [1.23]
       fail-fast: false
     runs-on: ${{matrix.os}}

.github/workflows/gentest.yml

@@ -24,7 +24,7 @@ jobs:
           - ubuntu-latest
           - ubuntu-24.04-arm
         llvm: [19]
-        llgo: [v0.12.1]
+        llgo: [v0.12.14]
         go: [1.23]
       fail-fast: false
     runs-on: ${{matrix.os}}
@@ -69,4 +69,3 @@ jobs:
         path: ${{env.LLCPPG_TEST_LOG_DIR}}
         retention-days: 1
         include-hidden-files: true
-

.github/workflows/go.yml

@@ -25,7 +25,7 @@ jobs:
           - macos-latest
           - ubuntu-latest
         llvm: [19]
-        llgo: [v0.12.1]
+        llgo: [v0.12.14]
         go: [1.23]
       fail-fast: false
     runs-on: ${{matrix.os}}
@@ -54,8 +54,8 @@ jobs:
     # only can compile with llgo
     - name: Test llcppsymg & llcppsigfetch
       run: |
-        llgo test ./_xtool/llcppsigfetch/internal/...
-        llgo test ./_xtool/llcppsymg/internal/...
+        llgo test ./_xtool/parse/...
+        llgo test ./_xtool/symg/...
 
     - name: Test For LLGo and Go
       run: |

_xtool/internal/clangtool/inclusion.go

@@ -28,15 +28,19 @@ func GetInclusions(conf *Config, fn func(fileName string, depth int)) error {
 		if err != nil {
 			return err
 		}
-		defer os.Remove(tmpFile.Name())
+		tmpName := tmpFile.Name()
+		if err := tmpFile.Close(); err != nil {
+			_ = os.Remove(tmpName)
+			return err
+		}
+		defer os.Remove(tmpName)
 
 		inc := fmt.Sprintf("#include <%s>", conf.HeaderFileName)
-		_, err = tmpFile.Write([]byte(inc))
-		if err != nil {
+		if err := os.WriteFile(tmpName, []byte(inc), 0600); err != nil {
 			return err
 		}
 
-		file = tmpFile.Name()
+		file = tmpName
 	}
 
 	args := defaultArgs(conf.IsCpp)

_xtool/internal/header/header.go

@@ -50,7 +50,11 @@ func PkgHfileInfo(conf *Config) *PkgHfilesInfo {
 	if err != nil {
 		panic(err)
 	}
-	defer os.Remove(outfile.Name())
+	outfileName := outfile.Name()
+	if err := outfile.Close(); err != nil {
+		panic(err)
+	}
+	defer os.Remove(outfileName)
 
 	inters := make(map[string]struct{})
 	others := []string{} // impl & third
@@ -80,9 +84,9 @@ func PkgHfileInfo(conf *Config) *PkgHfilesInfo {
 		}
 	}
 
-	clangtool.ComposeIncludes(conf.Includes, outfile.Name())
+	clangtool.ComposeIncludes(conf.Includes, outfileName)
 	err = clangtool.GetInclusions(&clangtool.Config{
-		ComposedHeaderFile: outfile.Name(),
+		ComposedHeaderFile: outfileName,
 		CompileArgs:        conf.Args,
 	}, retrieveComposedHeadersFn)
 	if err != nil {

_xtool/llcppsigfetch/llcppsigfetch.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	clangutils "github.com/goplus/llcppg/_xtool/internal/clang"
-	"github.com/goplus/llcppg/_xtool/llcppsigfetch/internal/parse"
+	"github.com/goplus/llcppg/_xtool/parse"
 	llcppg "github.com/goplus/llcppg/config"
 	args "github.com/goplus/llcppg/internal/arg"
 )

_xtool/llcppsymg/llcppsymg.go

@@ -21,8 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/goplus/llcppg/_xtool/internal/symbol"
-	"github.com/goplus/llcppg/_xtool/llcppsymg/internal/symg"
+	"github.com/goplus/llcppg/_xtool/symg"
 	llcppg "github.com/goplus/llcppg/config"
 	args "github.com/goplus/llcppg/internal/arg"
 )
@@ -65,11 +64,10 @@ func main() {
 		fmt.Fprintln(os.Stderr, "Failed to parse config file:", ags.CfgFile)
 	}
 
-	libMode := symbol.ModeDynamic
+	libMode := symg.ModeDynamic
 	if conf.StaticLib {
-		libMode = symbol.ModeStatic
+		libMode = symg.ModeStatic
 	}
-
 	symbolTable, err := symg.Do(&symg.Config{
 		Libs:         conf.Libs,
 		CFlags:       conf.CFlags,