Skip to content

Mr/197 use system provided adacut #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adacore-bot merged 6 commits into from
Dec 18, 2024
Merged

Mr/197 use system provided adacut #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c462286
rm adacut
leogermond Dec 17, 2024
a415f35
quiz: use system adacut
leogermond Dec 17, 2024
b2e69b4
CI: install adacut
leogermond Dec 17, 2024
62d0ed1
rm adacut testsuite
leogermond Dec 17, 2024
e0b18a8
replace all usages of adacut.py
leogermond Dec 17, 2024
9afa825
Apply 1 suggestion(s) to 1 file(s)
dm-at-ada Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
alr toolchain --install gnat_native=12.2.1 gprbuild=22.0.1

- name: Setup Python
run: python3 -m pip install pytest epycs pandocfilters
run: python3 -m pip install pytest epycs pandocfilters adacut

- name: Run PyTest
run: pytest --ignore=cached_gnat --ignore=courses/fundamentals_of_ada/labs/radar/test_all.py
Expand Down
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ lint-rst:
services:
- image:ada-trainings
stage: build
before_script:
- python3 -m pip install adacut
script:
- python3 contrib/fix_broken_titles.py --check
- python3 contrib/ci/fix_prelude.py
Expand Down
214 changes: 0 additions & 214 deletions contrib/adacut.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion contrib/example_extract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import difflib

scripts_dir = Path(__file__).parent
adacut = esubp.cmd.python.arg(scripts_dir / "adacut.py")
adacut = esubp.cmd.adacut

esubp.verbose = True

Expand Down
4 changes: 1 addition & 3 deletions contrib/quiz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
import shutil

SCRIPTS = Path(__file__).parent
ADACUT_PY = SCRIPTS / "adacut.py"
assert ADACUT_PY.is_file()

debug = False

adacut = cmd.python.arg(ADACUT_PY)
adacut = cmd.adacut
gprbuild = cmd.gprbuild.arg("-p")


Expand Down
1 change: 0 additions & 1 deletion contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-C/main.adb
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-K_-m_question/main.adb
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1/main.adb
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1_2/main.adb
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1_3/main.adb
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_2/main.adb
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-dc_1/main.adb
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-kc_1/main.adb
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-kc_4/main.adb
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions contrib/testsuite/adacut/unconstrained_arrays_declaration/template/main.adb
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions contrib/testsuite/conftest.py
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions contrib/testsuite/test_adacut.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion courses/fundamentals_of_ada/examples/protected_objects_2/cut_extracts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash
set -e
FWD=$(dirname "$0")
ADACUT=$FWD/../../../../contrib/adacut.py
ADACUT=$(which adacut)

(
set -e
Expand Down
2 changes: 1 addition & 1 deletion courses/fundamentals_of_ada/examples/protected_objects_lock_free/cut_extracts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env bash
set -e
FWD=$(dirname "$0")
ADACUT=$FWD/../../../../contrib/adacut.py
ADACUT=$(which adacut)

(
set -e
Expand Down
Loading
Loading