Skip to content

Commit 9316fb5

Browse files
committed
change llgo/c to lib/c
1 parent 995c8c0 commit 9316fb5

File tree

71 files changed

+145
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+145
-176
lines changed

.github/workflows/go.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525
- name: Set up Go
2626
uses: actions/setup-go@v4
2727
with:
28-
go-version: '1.23'
28+
go-version: '1.24'
2929

3030
- name: Install dependencies
3131
if: startsWith(matrix.os, 'macos')
3232
run: |
3333
brew update
34-
brew install llvm@${{matrix.llvm}} bdw-gc openssl libffi libuv
35-
brew link --force libffi
34+
brew install llvm@${{matrix.llvm}} lld bdw-gc openssl libffi libuv pkg-config
35+
brew link --overwrite lld libffi
3636
echo "$(brew --prefix llvm@${{matrix.llvm}})/bin" >> $GITHUB_PATH
3737
3838
# llcppg dependencies
@@ -50,10 +50,10 @@ jobs:
5050
- name: Install LLGO
5151
run: |
5252
git clone --branch v0.10.0 https://github.com/goplus/llgo.git
53+
cd llgo
54+
bash ./install.sh
5355
echo $PWD
54-
cd llgo/compiler
55-
go install -v ./cmd/...
56-
export LLGO_ROOT=$GITHUB_WORKSPACE/llgo
56+
export LLGO_ROOT=$PWD
5757
echo "LLGO_ROOT=$LLGO_ROOT" >> $GITHUB_ENV
5858
5959
- name: Build
@@ -62,11 +62,17 @@ jobs:
6262
- name: Set up Go for testing
6363
uses: actions/setup-go@v5
6464
with:
65-
go-version: '1.21'
65+
go-version: '1.24'
6666

6767
- name: Install llcppg modules
6868
run: |
6969
echo "Using LLGO_ROOT: $LLGO_ROOT"
70+
echo $PWD
71+
cd $PWD
72+
go get github.com/goplus/lib/c
73+
go get github.com/goplus/llpkg/cjson
74+
go get github.com/goplus/llcppg/_xtool/llcppsymg/config
75+
go mod tidy -e
7076
bash ./install.sh
7177
7278
- name: Test llcppsymg & llcppsigfetch

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ package main
9090

9191
import (
9292
"github.com/author/cjson"
93-
"github.com/goplus/llgo/c"
93+
"github.com/goplus/lib/c"
9494
)
9595

9696
func main() {
@@ -328,9 +328,9 @@ When a header file in the current project references types from third-party pack
328328
In llcppg, there is a consistent pattern for naming aliases related to the standard library. Any alias that starts with `c/` corresponds to a remote repository in the github.com/goplus/llgo.
329329

330330
For example:
331-
* The alias `c``github.com/goplus/llgo/c`
332-
* The alias `c/os``github.com/goplus/llgo/c/os`
333-
* The alias `c/time``github.com/goplus/llgo/c/time`
331+
* The alias `c``github.com/goplus/lib/c`
332+
* The alias `c/os``github.com/goplus/lib/c/os`
333+
* The alias `c/time``github.com/goplus/lib/c/time`
334334

335335
> Note: Standard library type conversion in llgo is not comprehensive. For standard library types that cannot be found in llgo, you will need to supplement these types in the corresponding package at https://github.com/goplus/llgo.
336336
@@ -367,7 +367,7 @@ You can see this in the generated code, where libxslt correctly references libxm
367367
package libxslt
368368

369369
import (
370-
"github.com/goplus/llgo/c"
370+
"github.com/goplus/lib/c"
371371
"github.com/goplus/llpkg/libxml2"
372372
"unsafe"
373373
)

_demo/cjsondemo/demo.go

Lines changed: 0 additions & 17 deletions
This file was deleted.

_demo/cjsondemo/go.mod

Lines changed: 0 additions & 8 deletions
This file was deleted.

_demo/cjsondemo/go.sum

Lines changed: 0 additions & 8 deletions
This file was deleted.

_llcppgtest/cjson/demo/hello/hello.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"cjson"
55
"unsafe"
66

7-
"github.com/goplus/llgo/c"
7+
"github.com/goplus/lib/c"
88
)
99

1010
func main() {

_llcppgtest/cjson/demo/readobj/readobj.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"cjson"
55
"fmt"
66

7-
"github.com/goplus/llgo/c"
7+
"github.com/goplus/lib/c"
88
)
99

1010
func main() {

_llcppgtest/gettext/demo/trans/trans.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"gettext"
55
"unsafe"
66

7-
"github.com/goplus/llgo/c"
7+
"github.com/goplus/lib/c"
88
)
99

1010
func handle(severity c.Int, message gettext.MessageT, filename *int8, lineno c.Ulong, column c.Ulong, multiline_p c.Int, message_text *int8) {

_llcppgtest/gmp/demo/isPrime/demo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
. "gmp"
66
"strconv"
77

8-
"github.com/goplus/llgo/c"
8+
"github.com/goplus/lib/c"
99
)
1010

1111
var primes = []int{2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, 953, 967, 971, 977, 983, 991, 997}

_llcppgtest/gpgerror/demo/keyerror/keyerror.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"gpgerror"
55

6-
"github.com/goplus/llgo/c"
6+
"github.com/goplus/lib/c"
77
)
88

99
var SOURCEMASK = gpgerror.SOURCEDIM - 1

0 commit comments

Comments
 (0)