goplus · tsingbx · Apr 9, 2025
diff --git a/.github/workflows/verification.yml b/.github/workflows/verification.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        llgo: [v0.10.1]
+        llgo: [v0.11.0]
         llcppg: [v0.2.1]
     steps:
       - name: Checkout
@@ -52,18 +52,23 @@ jobs:
       - name: Setup LLGo
         working-directory: .llgo
         run: |
-          echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-18 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-19 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 python3 python3-pip llvm-18-dev libuv1-dev clang-18 libunwind-dev libclang-18-dev lld-18 cmake pkg-config libgc-dev libssl-dev zlib1g-dev libffi-dev libcjson-dev
-          echo "/usr/lib/llvm-18/bin" >> $GITHUB_PATH
-          cd compiler
-          go install -v ./cmd/...
-          export LLGO_ROOT=$GITHUB_WORKSPACE/llgo
+          sudo apt-get install -y python3 python3-pip llvm-19-dev libuv1-dev clang-19 libunwind-dev libclang-19-dev lld-19 cmake pkg-config libgc-dev libssl-dev zlib1g-dev libffi-dev libcjson-dev
+          echo "/usr/lib/llvm-19/bin" >> $GITHUB_PATH
+          bash ./install.sh
+          echo $PWD
+          export LLGO_ROOT=$PWD
           echo "LLGO_ROOT=$LLGO_ROOT" >> $GITHUB_ENV
       - name: Setup LLCppg
         working-directory: .llcppg
         run: |
+          echo "Using LLGO_ROOT: $LLGO_ROOT"
+          echo $PWD
+          cd $PWD
+          go get github.com/goplus/lib/c
+          go mod tidy -e
           llgo install ./_xtool/llcppsymg
           llgo install ./_xtool/llcppsigfetch
           go install github.com/goplus/llcppg/cmd/llcppcfg@${{matrix.llcppg}}

diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-*.pc
+*.pc
+*.work
+.DS_Store
diff --git a/bzip2/_demo/compress/compress.go b/bzip2/_demo/compress/compress.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/goplus/llgo/c"
+	"github.com/goplus/lib/c"
 	"github.com/goplus/llpkg/bzip2"
 )
 

diff --git a/bzip2/_demo/decompress/decompress.go b/bzip2/_demo/decompress/decompress.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"unsafe"
 
-	"github.com/goplus/llgo/c"
+	"github.com/goplus/lib/c"
 	"github.com/goplus/llpkg/bzip2"
 )
 

diff --git a/bzip2/bzlib.go b/bzip2/bzlib.go
@@ -1,8 +1,9 @@
 package bzip2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 const RUN = 0

diff --git a/bzip2/go.mod b/bzip2/go.mod
@@ -2,4 +2,4 @@ module github.com/goplus/llpkg/bzip2
 
 go 1.20
 
-require github.com/goplus/llgo v0.10.0
+require github.com/goplus/lib v0.2.0
diff --git a/bzip2/go.sum b/bzip2/go.sum
@@ -1,2 +1,2 @@
-github.com/goplus/llgo v0.10.0 h1:s3U3cnO3cploF1xCCJleAb16NQFAmHxdUmdrNhRH3hY=
-github.com/goplus/llgo v0.10.0/go.mod h1:YfOHsT/g3lc9b4GclLj812YzdSsJr0kd3CCB830TqHE=
+github.com/goplus/lib v0.2.0 h1:AjqkN1XK5H23wZMMlpaUYAMCDAdSBQ2NMFrLtSh7W4g=
+github.com/goplus/lib v0.2.0/go.mod h1:SgJv3oPqLLHCu0gcL46ejOP3x7/2ry2Jtxu7ta32kp0=
diff --git a/bzip3/_demo/test/test.go b/bzip3/_demo/test/test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/goplus/llgo/c"
+	"github.com/goplus/lib/c"
 	zip "github.com/goplus/llpkg/bzip3"
 )
 

diff --git a/bzip3/go.mod b/bzip3/go.mod
@@ -2,4 +2,4 @@ module github.com/goplus/llpkg/bzip3
 
 go 1.20
 
-require github.com/goplus/llgo v0.10.0
+require github.com/goplus/lib v0.2.0
diff --git a/bzip3/go.sum b/bzip3/go.sum
@@ -1,2 +1,2 @@
-github.com/goplus/llgo v0.10.0 h1:s3U3cnO3cploF1xCCJleAb16NQFAmHxdUmdrNhRH3hY=
-github.com/goplus/llgo v0.10.0/go.mod h1:YfOHsT/g3lc9b4GclLj812YzdSsJr0kd3CCB830TqHE=
+github.com/goplus/lib v0.2.0 h1:AjqkN1XK5H23wZMMlpaUYAMCDAdSBQ2NMFrLtSh7W4g=
+github.com/goplus/lib v0.2.0/go.mod h1:SgJv3oPqLLHCu0gcL46ejOP3x7/2ry2Jtxu7ta32kp0=
diff --git a/bzip3/libbz3.go b/bzip3/libbz3.go
@@ -1,8 +1,9 @@
 package bzip3
 
 import (
-	"github.com/goplus/llgo/c"
 	_ "unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 const OK = 0

diff --git a/cargs/_demo/test/test.go b/cargs/_demo/test/test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	C "github.com/goplus/llgo/c"
+	C "github.com/goplus/lib/c"
 	"github.com/goplus/llpkg/cargs"
 )
 

diff --git a/cargs/cargs.go b/cargs/cargs.go
@@ -1,8 +1,9 @@
 package cargs
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 /**

diff --git a/cjson/_demo/hello/hello.go b/cjson/_demo/hello/hello.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/goplus/llpkg/cjson"
 
-	"github.com/goplus/llgo/c"
+	"github.com/goplus/lib/c"
 )
 
 func main() {

diff --git a/cjson/cJSON.go b/cjson/cJSON.go
@@ -1,8 +1,9 @@
 package cjson
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 const VERSION_MAJOR = 1

diff --git a/cjson/cJSON_Utils.go b/cjson/cJSON_Utils.go
@@ -1,8 +1,9 @@
 package cjson
 
 import (
-	"github.com/goplus/llgo/c"
 	_ "unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 /* Implement RFC6901 (https://tools.ietf.org/html/rfc6901) JSON Pointer spec. */

diff --git a/libxml2/HTMLparser.go b/libxml2/HTMLparser.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 type HtmlParserCtxt ParserCtxt

diff --git a/libxml2/HTMLtree.go b/libxml2/HTMLtree.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	_ "unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 // llgo:link (*Char).HtmlNewDoc C.htmlNewDoc

diff --git a/libxml2/SAX.go b/libxml2/SAX.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 //go:linkname GetPublicId C.getPublicId

diff --git a/libxml2/SAX2.go b/libxml2/SAX2.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 //go:linkname SAX2GetPublicId C.xmlSAX2GetPublicId

diff --git a/libxml2/_demo/hello/hello.go b/libxml2/_demo/hello/hello.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/goplus/llpkg/libxml2"
 
-	"github.com/goplus/llgo/c"
+	"github.com/goplus/lib/c"
 )
 
 func main() {

diff --git a/libxml2/c14n.go b/libxml2/c14n.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 type C14NMode c.Int

diff --git a/libxml2/catalog.go b/libxml2/catalog.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 type CatalogPrefer c.Int

diff --git a/libxml2/chvalid.go b/libxml2/chvalid.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	_ "unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 type X_xmlChSRange struct {

diff --git a/libxml2/debugXML.go b/libxml2/debugXML.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 /*

diff --git a/libxml2/dict.go b/libxml2/dict.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	_ "unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 type Dict X_xmlDict

diff --git a/libxml2/encoding.go b/libxml2/encoding.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 type CharEncError c.Int

diff --git a/libxml2/entities.go b/libxml2/entities.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	_ "unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 type EntityType c.Int

diff --git a/libxml2/hash.go b/libxml2/hash.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 type X_xmlHashTable struct {

diff --git a/libxml2/list.go b/libxml2/list.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 type X_xmlLink struct {

diff --git a/libxml2/nanoftp.go b/libxml2/nanoftp.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 // llgo:type C

diff --git a/libxml2/nanohttp.go b/libxml2/nanohttp.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 //go:linkname NanoHTTPInit C.xmlNanoHTTPInit

diff --git a/libxml2/parser.go b/libxml2/parser.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 const DEFAULT_VERSION = "1.0"

diff --git a/libxml2/parserInternals.go b/libxml2/parserInternals.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	_ "unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 const MAX_TEXT_LENGTH = 10000000

diff --git a/libxml2/pattern.go b/libxml2/pattern.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	_ "unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 type X_xmlPattern struct {

diff --git a/libxml2/relaxng.go b/libxml2/relaxng.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 type X_xmlRelaxNG struct {

diff --git a/libxml2/schemasInternals.go b/libxml2/schemasInternals.go
@@ -1,8 +1,9 @@
 package libxml2
 
 import (
-	"github.com/goplus/llgo/c"
 	"unsafe"
+
+	"github.com/goplus/lib/c"
 )
 
 const SCHEMAS_ANYATTR_SKIP = 1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module github.com/goplus/llpkg/bzip2

		go 1.20

		require github.com/goplus/llgo v0.10.0
		require github.com/goplus/lib v0.2.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"fmt"
     	"os"
-    	C "github.com/goplus/llgo/c"
+    	C "github.com/goplus/lib/c"
     	"github.com/goplus/llpkg/cargs"
     )
@@ Expand Down @@