Skip to content

Commit 3190763

Browse files
committed
revert changes of bazel file
1 parent af37800 commit 3190763

File tree

5 files changed

+55
-13
lines changed

5 files changed

+55
-13
lines changed

.github/workflows/godel_build.yml

+14-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,13 @@ jobs:
2626
mkdir build
2727
cd build
2828
cmake ..
29-
make -j4
29+
make -j6
30+
- name: Test
31+
run: |
32+
cd godel-script
33+
./build/godel
34+
./build/godel --version
35+
./build/godel -h --color-off
3036
3137
linux-x86_64-build:
3238
runs-on: ubuntu-latest
@@ -47,4 +53,10 @@ jobs:
4753
mkdir build
4854
cd build
4955
cmake ..
50-
make -j4
56+
make -j6
57+
- name: Test
58+
run: |
59+
cd godel-script
60+
./build/godel
61+
./build/godel --version
62+
./build/godel -h --color-off

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,9 @@ build/
3434
### VS Code ###
3535
.vscode/
3636
.cloudide
37+
38+
### Bazel ###
39+
bazel-bin
40+
bazel-CodeFuse-Query
41+
bazel-out
42+
bazel-testlogs

godel-script/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# build directory
2+
build
3+
cmake-build

godel-script/README.md

+29-10
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub fn hello() -> string {
3434
* GödelScript [Query](./docs/language-reference/queries.md)
3535
* GödelScript [Statement](./docs/language-reference/functions.md#statement)
3636
* GödelScript [Expression](./docs/language-reference/functions.md#expression)
37-
* GödelScript [Query Example](./example)
37+
* GödelScript [Query Example](../example)
3838
* GödelScript [Syntax Definition](./docs/syntax.md)
3939

4040
## Compilation
@@ -43,19 +43,38 @@ Structure of this project:
4343

4444
```
4545
.
46-
|-- dockerFile
47-
|-- docs godel-script documents
48-
|-- godel-backend godel-script backend
49-
| |-- extension godel-script souffle extension
50-
| |-- souffle souffle source code
51-
| +-- tools souffle build tools
52-
+-- godel-frontend godel-script frontend
53-
+-- src godel-frontend source code
46+
|-- docs godel-script documents
47+
|-- godel-backend godel-script backend
48+
| |-- extension godel-script souffle extension
49+
| |-- souffle souffle source code
50+
| +-- tools souffle build tools
51+
+-- godel-frontend godel-script frontend
52+
+-- src godel-frontend source code
5453
```
5554

5655
Need C++ standard at least `-std=c++17`.
5756

58-
### Build Godel Script
57+
### Apply Patch On Soufflé Submodule
58+
59+
GödelScript uses a self-modified soufflé from a much older branch of public soufflé,
60+
now we use patch to make sure it could be built successfully.
61+
62+
Use this command to apply patch:
63+
64+
```bash
65+
cd souffle
66+
git am ../../0001-init-self-used-souffle-from-public-souffle.patch
67+
```
68+
69+
Use these commands to revert:
70+
71+
```bash
72+
cd souffle
73+
git apply -R ../0001-init-self-used-souffle-from-public-souffle.patch
74+
git reset HEAD~
75+
```
76+
77+
### Build GödelScript
5978

6079
Use command below:
6180

godel-script/docs/syntax.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -245,4 +245,6 @@ Usage: [Initializer List](./language-reference/functions.md#initializer-list)
245245
```ebnf
246246
initializer = "{" [initializer_pair ","] "}";
247247
initializer_pair = identifier ":" or_expr;
248-
```
248+
```
249+
250+
Back to [README.md](../README.md#documents)

0 commit comments

Comments
 (0)