Merge pull request #3 from luoliwoshang/llcppg/dep

chore:pkg origin; ci:llgo install
goplus · Nov 28, 2024 · 49e4aae · 49e4aae
2 parents ffbdabf + 7bcd416
commit 49e4aae
Show file tree

Hide file tree

Showing 26 changed files with 81 additions and 49 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -5,14 +5,20 @@ name: Go
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "**" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "**" ]
 
 jobs:
 
-  build:
-    runs-on: ubuntu-latest
+  test:
+    strategy:
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-24.04
+        llvm: [18]
+    runs-on: ${{matrix.os}}
     steps:
     - uses: actions/checkout@v4
 
@@ -21,11 +27,37 @@ jobs:
       with:
         go-version: '1.20'
 
+    - name: Install dependencies
+      if: startsWith(matrix.os, 'macos')
+      run: |
+        brew update
+        brew install llvm@${{matrix.llvm}} bdw-gc openssl libffi
+        brew link --force libffi
+        echo "$(brew --prefix llvm@${{matrix.llvm}})/bin" >> $GITHUB_PATH
+
+        # llcppg dependencies
+        brew install cjson
+
+    - name: Install dependencies
+      if: startsWith(matrix.os, 'ubuntu')
+      run: |
+        echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-${{matrix.llvm}} main" | sudo tee /etc/apt/sources.list.d/llvm.list
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+        sudo apt-get update
+        sudo apt-get install -y llvm-${{matrix.llvm}}-dev clang-${{matrix.llvm}} libclang-${{matrix.llvm}}-dev lld-${{matrix.llvm}} pkg-config libgc-dev libssl-dev zlib1g-dev libffi-dev libcjson-dev
+        echo "/usr/lib/llvm-${{matrix.llvm}}/bin" >> $GITHUB_PATH
+
+    - name: Install LLGO
+      run: |
+        go install github.com/goplus/llgo/cmd/llgo@main
+
     - name: Build
       run: go build -v ./...
 
+    - name: Install llcppg dependencies
+      run: bash .github/workflows/install_llcppg_depend.sh
+
     - name: Test
       run: go test -v ./...
 
-    # - name: Install llcppg dependencies
-    #  run: bash .github/workflows/install_llcppg_depend.sh
+
diff --git a/.github/workflows/install_llcppg_depend.sh b/.github/workflows/install_llcppg_depend.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
 
-llgo install ./chore/_xtool/llcppsymg
-llgo install ./chore/_xtool/llcppsigfetch
-go install ./chore/gogensig
+llgo install ./_xtool/llcppsymg
+llgo install ./_xtool/llcppsigfetch
+go install ./cmd/gogensig
diff --git a/_xtool/llcppsigfetch/parse/cvt_test/cvt.go b/_xtool/llcppsigfetch/parse/cvt_test/cvt.go
@@ -3,11 +3,11 @@ package cvttest
 import (
 	"fmt"
 
+	"github.com/goplus/llcppg/_xtool/llcppsigfetch/parse"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/clangutils"
 	"github.com/goplus/llgo/c"
 	"github.com/goplus/llgo/c/cjson"
 	"github.com/goplus/llgo/c/clang"
-	"github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/clangutils"
 )
 
 func RunTest(testName string, testCases []string) {

diff --git a/_xtool/llcppsigfetch/parse/cvt_test/decl_test/class_test/class.go b/_xtool/llcppsigfetch/parse/cvt_test/decl_test/class_test/class.go
@@ -1,6 +1,6 @@
 package main
 
-import test "github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse/cvt_test"
+import test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test"
 
 func main() {
 	TestClassDecl()

diff --git a/_xtool/llcppsigfetch/parse/cvt_test/decl_test/comment_test/comment.go b/_xtool/llcppsigfetch/parse/cvt_test/decl_test/comment_test/comment.go
@@ -1,6 +1,6 @@
 package main
 
-import test "github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse/cvt_test"
+import test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test"
 
 func main() {
 	TestDoc()

diff --git a/_xtool/llcppsigfetch/parse/cvt_test/decl_test/enum_test/enum.go b/_xtool/llcppsigfetch/parse/cvt_test/decl_test/enum_test/enum.go
@@ -1,6 +1,6 @@
 package main
 
-import test "github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse/cvt_test"
+import test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test"
 
 func main() {
 	TestEnumDecl()

diff --git a/_xtool/llcppsigfetch/parse/cvt_test/decl_test/func_test/func.go b/_xtool/llcppsigfetch/parse/cvt_test/decl_test/func_test/func.go
@@ -1,6 +1,6 @@
 package main
 
-import test "github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse/cvt_test"
+import test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test"
 
 func main() {
 	TestFuncDecl()

diff --git a/_xtool/llcppsigfetch/parse/cvt_test/decl_test/scope_test/scope.go b/_xtool/llcppsigfetch/parse/cvt_test/decl_test/scope_test/scope.go
@@ -1,6 +1,6 @@
 package main
 
-import test "github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse/cvt_test"
+import test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test"
 
 func main() {
 	TestScope()

diff --git a/_xtool/llcppsigfetch/parse/cvt_test/decl_test/struct_test/struct.go b/_xtool/llcppsigfetch/parse/cvt_test/decl_test/struct_test/struct.go
@@ -1,6 +1,6 @@
 package main
 
-import test "github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse/cvt_test"
+import test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test"
 
 func main() {
 	TestStructDecl()

diff --git a/_xtool/llcppsigfetch/parse/cvt_test/decl_test/typedef_test/typedef.go b/_xtool/llcppsigfetch/parse/cvt_test/decl_test/typedef_test/typedef.go
@@ -1,6 +1,6 @@
 package main
 
-import test "github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse/cvt_test"
+import test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test"
 
 func main() {
 	TestTypeDefDecl()

diff --git a/_xtool/llcppsigfetch/parse/cvt_test/decl_test/union_test/union.go b/_xtool/llcppsigfetch/parse/cvt_test/decl_test/union_test/union.go
@@ -1,6 +1,6 @@
 package main
 
-import test "github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse/cvt_test"
+import test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test"
 
 func main() {
 	TestUnionDecl()

diff --git a/_xtool/llcppsigfetch/parse/cvt_test/preprocess_test/preprocess.go b/_xtool/llcppsigfetch/parse/cvt_test/preprocess_test/preprocess.go
@@ -1,9 +1,9 @@
 package main
 
 import (
+	test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/clangutils"
 	"github.com/goplus/llgo/c"
-	test "github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse/cvt_test"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/clangutils"
 )
 
 func main() {

diff --git a/_xtool/llcppsigfetch/parse/cvt_test/type_test/type.go b/_xtool/llcppsigfetch/parse/cvt_test/type_test/type.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/goplus/llcppg/_xtool/llcppsigfetch/parse"
+	test "github.com/goplus/llcppg/_xtool/llcppsigfetch/parse/cvt_test"
+	"github.com/goplus/llcppg/ast"
 	"github.com/goplus/llgo/c"
 	"github.com/goplus/llgo/c/cjson"
 	"github.com/goplus/llgo/c/clang"
-	"github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse"
-	test "github.com/goplus/llgo/chore/_xtool/llcppsigfetch/parse/cvt_test"
-	"github.com/goplus/llgo/chore/llcppg/ast"
 )
 
 func main() {

diff --git a/_xtool/llcppsigfetch/parse/parse.go b/_xtool/llcppsigfetch/parse/parse.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/goplus/llgo/c/cjson"
 	"github.com/goplus/llcppg/_xtool/llcppsymg/clangutils"
+	"github.com/goplus/llgo/c/cjson"
 )
 
 type dbgFlags = int

diff --git a/_xtool/llcppsymg/_cmptest/args_test/args.go b/_xtool/llcppsymg/_cmptest/args_test/args.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/args"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/args"
 )
 
 func main() {

diff --git a/_xtool/llcppsymg/_cmptest/clangutils_test/clangutils.go b/_xtool/llcppsymg/_cmptest/clangutils_test/clangutils.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/goplus/llcppg/_xtool/llcppsymg/clangutils"
 	"github.com/goplus/llgo/c"
 	"github.com/goplus/llgo/c/clang"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/clangutils"
 )
 
 func main() {

diff --git a/_xtool/llcppsymg/_cmptest/config_test/config.go b/_xtool/llcppsymg/_cmptest/config_test/config.go
@@ -7,8 +7,8 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/config"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/config/cfgparse"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/config"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/config/cfgparse"
 )
 
 func main() {

diff --git a/_xtool/llcppsymg/_cmptest/parse_test/parse.go b/_xtool/llcppsymg/_cmptest/parse_test/parse.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/parse"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/parse"
 )
 
 func main() {

diff --git a/_xtool/llcppsymg/_cmptest/symbol_test/symbol.go b/_xtool/llcppsymg/_cmptest/symbol_test/symbol.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"sort"
 
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/parse"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/symbol"
-	"github.com/goplus/llgo/chore/llcppg/types"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/parse"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/symbol"
+	"github.com/goplus/llcppg/types"
 	"github.com/goplus/llgo/xtool/nm"
 )
 

diff --git a/_xtool/llcppsymg/_cmptest/symg_test/symg.go b/_xtool/llcppsymg/_cmptest/symg_test/symg.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/parse"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/symbol"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/parse"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/symbol"
 	"github.com/goplus/llgo/xtool/nm"
 )
 

diff --git a/_xtool/llcppsymg/config/config.go b/_xtool/llcppsymg/config/config.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"unsafe"
 
+	"github.com/goplus/llcppg/types"
 	"github.com/goplus/llgo/c"
 	"github.com/goplus/llgo/c/cjson"
-	"github.com/goplus/llgo/chore/llcppg/types"
 )
 
 type Conf struct {

diff --git a/_xtool/llcppsymg/llcppsymg.go b/_xtool/llcppsymg/llcppsymg.go
@@ -21,11 +21,11 @@ import (
 	"io"
 	"os"
 
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/args"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/config"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/config/cfgparse"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/parse"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/symbol"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/args"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/config"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/config/cfgparse"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/parse"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/symbol"
 )
 
 func main() {

diff --git a/_xtool/llcppsymg/parse/parse.go b/_xtool/llcppsymg/parse/parse.go
@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/goplus/llcppg/_xtool/llcppsymg/clangutils"
 	"github.com/goplus/llgo/c"
 	"github.com/goplus/llgo/c/clang"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/clangutils"
 )
 
 type SymbolInfo struct {

diff --git a/_xtool/llcppsymg/symbol/symbol.go b/_xtool/llcppsymg/symbol/symbol.go
@@ -8,12 +8,12 @@ import (
 	"strings"
 	"unsafe"
 
+	"github.com/goplus/llcppg/_xtool/llcppsymg/config"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/config/cfgparse"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/parse"
+	"github.com/goplus/llcppg/types"
 	"github.com/goplus/llgo/c"
 	"github.com/goplus/llgo/c/cjson"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/config"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/config/cfgparse"
-	"github.com/goplus/llgo/chore/_xtool/llcppsymg/parse"
-	"github.com/goplus/llgo/chore/llcppg/types"
 	"github.com/goplus/llgo/xtool/nm"
 )
 

diff --git a/go.mod b/go.mod
@@ -2,6 +2,4 @@ module github.com/goplus/llcppg
 
 go 1.20
 
-require (
-    github.com/goplus/llgo v0.9.7
-)
+require github.com/goplus/llgo v0.9.8-0.20241127093550-38a7f4f7d589
diff --git a/go.sum b/go.sum
@@ -1,2 +1,4 @@
 github.com/goplus/llgo v0.9.7 h1:LRF2Fq9ts4QrVxOPZufexalbIoJ1oiBERjCWQ45wxbg=
 github.com/goplus/llgo v0.9.7/go.mod h1:5Fs+08NslqofJ7xtOiIXugkurYOoQvY02ZkFNWA1uEI=
+github.com/goplus/llgo v0.9.8-0.20241127093550-38a7f4f7d589 h1:u0aqHCN6z+Md1FYB052ROjP/6PVlFBtWWuTi/LGuifs=
+github.com/goplus/llgo v0.9.8-0.20241127093550-38a7f4f7d589/go.mod h1:1phqPJEgr/uw59PRz/NB7s54OoP+NGjC6pz0HovT5JY=
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"fmt"
     	"sort"
-    	"github.com/goplus/llgo/chore/_xtool/llcppsymg/parse"
+    	"github.com/goplus/llcppg/_xtool/llcppsymg/parse"
     )
     func main() {
@@ Expand Down @@