diff --git a/.github/workflows/gh_pages.yml b/.github/workflows/gh_pages.yml deleted file mode 100644 index 7ebf9ba4e..000000000 --- a/.github/workflows/gh_pages.yml +++ /dev/null @@ -1,68 +0,0 @@ -on: - workflow_dispatch: - push: - branches: - - master -jobs: - build: - runs-on: ubuntu-20.04 - name: Build GitHub Pages - steps: - - name: Install dependencies - run: | - sudo apt install dosfstools gnat gprbuild - dd if=/dev/zero of=/tmp/vfat.img bs=1048576 count=800 - mkfs.vfat /tmp/vfat.img - mkdir ada-auth - sudo mount /tmp/vfat.img ada-auth -o loop,uid=$UID - - name: Checkout ada-auth - uses: actions/checkout@v2 - with: - path: ada-auth - fetch-depth: 0 - - name: Generate HTML - run: | - gprbuild -p -P ada-auth/ada_form.gpr - mkdir ada-auth/source/output - for VERSION in 5 4 ; do - for RM in rm aarm; do - mkdir /tmp/$RM-$VERSION-{N,P,A}C - (cd ada-auth/source - if [ $VERSION -eq 5 ]; then - ../.obj/Arm_Form $RM HTML New-Only 5 5 /tmp/$RM-$VERSION-NC/ - ../.obj/Arm_Form $RM HTML Show-Changes 1 5 /tmp/$RM-$VERSION-AC/ - ../.obj/Arm_Form $RM HTML Show-Changes 5 5 /tmp/$RM-$VERSION-PC/ - else - git checkout version-$VERSION - gprbuild -P ../ada_form.gpr - ../.obj/Arm_Form $RM HTML New-Only $VERSION; mv Output/* /tmp/$RM-$VERSION-NC/ - ../.obj/Arm_Form $RM HTML Show-Changes $VERSION; mv Output/* /tmp/$RM-$VERSION-AC/ - ../.obj/Arm_Form $RM HTML Changes-Only $VERSION; mv Output/* /tmp/$RM-$VERSION-PC/ - fi - cd /tmp/ - for J in $RM-$VERSION-{N,P,A}C/*-Ttl.html; do - mv $J ${J^^[tl]} - done - ) - done - done - - # Set up .netrc file with GitHub credentials - cat << EOF > $HOME/.netrc - machine github.com - login sync_bot - password $GITHUB_ACCESS_TOKEN - EOF - chmod 600 $HOME/.netrc - cd ada-auth - git checkout gh-pages - rm -rf {rm,aarm}-* - cp -r -f /tmp/{rm,aarm}-* . - git add {rm,aarm}-* - if [ `git status -s |wc -l` != 0 ]; then - git config user.email "reznikmm@gmail.com" - git config user.name "Max Reznik" - git commit -m "Update for $GITHUB_SHA" - git push - git status - fi diff --git a/.gitignore b/.gitignore index 557637d5c..2ee08372d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +alire .obj diff --git a/README.md b/README.md index d62937453..576c924f7 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,16 @@ It contains See details about Ada formatting tool in [command.txt](progs/command.txt) -To build it with GNAT I provide a project file (ada_form.gpr), -that isn't a part of CVS repository. Just run: +## Building + +This is an Alire crate that you can build with: ``` -gprbuild -p -P ada_form.gpr +alr build ``` +## When updating the source docs + If you use case sensitive filesystem you need edit master file converting file names to lowercase: @@ -27,4 +30,3 @@ sed -i -e '/@Source/s/<[^>]*>/\L\0/' aa-aarm.msm mkdir output ../.obj/ada_form aa-aarm.msm ``` - diff --git a/ada_form.gpr b/ada_form.gpr index 9f3c25a8d..2a4c1ec35 100644 --- a/ada_form.gpr +++ b/ada_form.gpr @@ -18,6 +18,8 @@ project Ada_Form is for Spec ("arm_syntax") use "arm_syn.ads"; for Spec ("arm_format.data") use "arm_frmd.ads"; for Spec ("arm_texinfo") use "arm_texi.ads"; + for Spec ("arm_paragraph") use "arm_para.ads"; + for Spec ("arm_blackhole") use "arm_blac.ads"; for Body ("arm_master") use "arm_mast.adb"; for Body ("arm_contents") use "arm_cont.adb"; @@ -31,6 +33,8 @@ project Ada_Form is for Body ("arm_format.data") use "arm_frmd.adb"; for Body ("arm_format.scan") use "arm_frms.adb"; for Body ("arm_texinfo") use "arm_texi.adb"; + for Body ("arm_paragraph") use "arm_para.adb"; + for Body ("arm_blackhole") use "arm_blac.adb"; end Naming; package Compiler is diff --git a/alire.toml b/alire.toml new file mode 100644 index 000000000..50309d1d1 --- /dev/null +++ b/alire.toml @@ -0,0 +1,15 @@ +name = "ada_form" +description = "Formatted output of the Ada Reference Manual" +version = "0.1.0-dev" +website = "http://www.ada-auth.org/arm.html" +licenses = "GPL-3.0-only" + +authors = ["Randy Brukardt"] +maintainers = ["Max Reznik "] +maintainers-logins = ["reznikmm"] + +executables = ["ada_form"] +project-files = ["ada_form.gpr"] + +[configuration] +disabled = true