Skip to content

Commit a405e90

Browse files
committed
Merge branch 'topic/lkql/remove_manage_py' into 'master'
Definitely remove 'manage.py' See merge request eng/libadalang/langkit-query-language!425
2 parents 0d669aa + 81c4dab commit a405e90

File tree

4 files changed

+14
-57
lines changed

4 files changed

+14
-57
lines changed

.github/workflows/main.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ jobs:
7272
7373
- name: Build LKQL
7474
run: |
75-
eval `lkql/manage.py setenv`
75+
eval `python -m langkit.scripts.lkm setenv`
7676
GPR_ARGS=-XLIBRARY_TYPE=relocatable make
7777
7878
- name: Test LKQL
7979
run: |
80-
eval `lkql/manage.py setenv`
80+
eval `python -m langkit.scripts.lkm setenv`
8181
make test
8282
8383
- name: Deploy
@@ -88,4 +88,3 @@ jobs:
8888
publish_dir: ./user_manual/build/html
8989
user_name: 'github-actions[bot]'
9090
user_email: 'github-actions[bot]@users.noreply.github.com'
91-

README.md

+7-10
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@ The syntax is not stable for now.
77

88
## High level overview
99

10-
[`lkql/`](lkql): Contains:
11-
* Langkit language definition for the LKQL parser
12-
* Implementation of the LKQL interpreter (in
13-
[`lkql/extensions/src`](lkql/extensions/src)). Embedding the LKQL interpreter
14-
only requires using the `lkql` project.
15-
* Command line app for the interpreter
10+
[`lkql/`](lkql): Langkit language definition for the LKQL parser.
1611

17-
[`lkql_checker`](lkql_checker): LKQL command line checker. Can run "checks"
18-
that will flag specific lines of code in a given Ada codebase.
12+
[`lkql_checker/`](lkql_checker): GNATcheck sources and predefined LKQL rules.
13+
14+
[`lkql_jit/`](lkql_jit): LKQL reference implementation using the Truffle Java
15+
framework.
1916

2017
## Building & using
2118

@@ -29,14 +26,14 @@ paths.
2926
- Building LKQL is done via
3027

3128
```
32-
lkql/manage.py make
29+
lkm make
3330
```
3431

3532
- You can then make LKQL available (binaries, Ada libraries, and Python lib)
3633
via:
3734

3835
```
39-
eval `lkql/manage.py setenv`
36+
eval `lkm setenv`
4037
```
4138

4239
- LKQL checker (linter based on lkql) is built separately:

lkql/manage.py

-40
This file was deleted.

lkql_jit/README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ For information, the tested version of GraalVM is graalvm-ce-java17-22.3.1.
3333
$[langkit]> pip3 install -r requirement-pypi.txt
3434
$[langkit]> ./manage.py make
3535
$[langkit]> eval `./manage.py setenv`
36+
$[langkit]> export PATH="/path/to/langkit/scripts:$PATH"
3637
```
3738

3839
If you get a Python error about the langkit library, add the langkit directory to your `PYTHONPATH`
@@ -50,8 +51,8 @@ $[langkit]> mvn -f langkit/java_support install
5051
### 2) Build and install Libadalang
5152

5253
```sh
53-
$[libadalang]> ./manage.py make --enable-java
54-
$[libadalang]> eval `./manage.py setenv`
54+
$[libadalang]> lkm make --enable-java
55+
$[libadalang]> eval `lkm setenv`
5556
```
5657

5758
Make sure the Java bindings are installed locally
@@ -63,8 +64,8 @@ $[libadalang]> mvn -f build/java install
6364
### 3) Build and install Liblkqllang
6465

6566
```sh
66-
$[langkit-query-language/lkql]> ./manage.py make --enable-java
67-
$[langkit-query-language/lkql]> eval `./manage.py setenv`
67+
$[langkit-query-language/lkql]> lkm make --enable-java
68+
$[langkit-query-language/lkql]> eval `lkm setenv`
6869
```
6970

7071
As for Libadalang, make sure Java bindings are installed

0 commit comments

Comments
 (0)