Skip to content

Commit 61ca09e

Browse files
authored
Prep 4.10 (#3599)
* Tweak doc * Swift was referring to hardcoded version * Start version update script. * add files to update * clean up setup * clean up setup * clean up setup * don't need file * don't need file * Fixes #3600. add instructions and associated code necessary to build the xpath lexers. * clean up version nums * php8 * php8 * php8 * php8 * php8 * php8 * php8 * php8 * tweak doc * ok, i give up. php won't bump up too v8 * tweak doc * version number bumped to 4.10 in runtime. * Change the doc for releasing and update to use latest ST 4.3.2 * fix dart version to 4.10.0 * cmd files Cannot use export bash command. * try fixing php ci again * working on deploy Signed-off-by: Terence Parr <[email protected]> * php8 always install. * set js to 4.10.0 not 4.10 * turn off apt update for php circleci * try w/o cimg/php * try setting branch * ok i give up * tweak * update docs for release. * php8 circleci * use 3.5.3 antlr * use 3.5.3-SNAPSHOT antlr
1 parent 4de285f commit 61ca09e

Some content is hidden

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

54 files changed

+982
-562
lines changed

.circleci/scripts/install-linux-php.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@
22

33
set -euo pipefail
44

5-
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
6-
sudo apt-get update -qq
7-
5+
sudo apt install software-properties-common
6+
sudo add-apt-repository ppa:ondrej/php
87
sudo apt update
98

10-
sudo apt install php-all-dev
9+
sudo apt install wget php8.0-cli php8.0-zip unzip
10+
wget -O composer-setup.php https://getcomposer.org/installer
11+
sudo php composer-setup.php --install-dir=/usr/local/bin --filename=composer
12+
13+
sudo apt install php8.0
14+
sudo apt install php8.0-mbstring
15+
sudo apt install php8.0-xml
1116
php -v
1217

13-
sudo apt install composer
1418

1519
git clone https://github.com/antlr/antlr-php-runtime.git runtime/PHP
1620
composer install -d runtime/PHP
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
dotnet build runtime/CSharp/src/Antlr4.csproj -c Release
22
dotnet pack runtime/CSharp/src/Antlr4.csproj -c Release
33
cd runtime-testsuite
4-
export MAVEN_OPTS="-Xmx8g"
54
mvn -Dparallel=classes -DthreadCount=2 -Dtest=csharp.** test
65
cd ..
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
C:\ProgramData\chocolatey\bin\choco.exe -y install dart-sdk
22

33
cd runtime-testsuite
4-
export MAVEN_OPTS="-Xmx8g"
54
mvn -Dtest=dart.** test -Dantlr-dart-dart="C:\tools\dart-sdk\bin\dart.exe" -Dantlr-dart-pub="C:\tools\dart-sdk\bin\pub.bat" -Dantlr-dart-dart2native="C:\tools\dart-sdk\bin\dart2native.bat"
65
cd ..
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
cd runtime-testsuite
2-
export MAVEN_OPTS="-Xmx8g"
32
mvn -Dparallel=classes -DthreadCount=2 -Dtest=go.** test
43
cd ..
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
cd runtime-testsuite
2-
export MAVEN_OPTS="-Xmx8g"
32
mvn -Dparallel=classes -DthreadCount=2 -Dtest=java.** test
43
cd ..
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
cd runtime-testsuite
2-
export MAVEN_OPTS="-Xmx8g"
32
mvn -Dparallel=classes -DthreadCount=2 -Dtest=javascript.** test
43
cd ..
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
REM C:\ProgramData\chocolatey\bin\choco.exe install php -y --package-parameters='"/DontAddToPath"'
22

3-
git clone https://github.com/antlr/antlr-php-runtime/tree/dev
3+
git clone https://github.com/antlr/antlr-php-runtime.git
44
move antlr-php-runtime runtime\PHP
55

66
cd runtime-testsuite
7-
export MAVEN_OPTS="-Xmx8g"
87
mvn -Dparallel=classes -DthreadCount=2 -Dtest=php.** test -Dantlr-php-php="C:\tools\php81\php.exe"
98
cd ..
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
cd runtime-testsuite
2-
export MAVEN_OPTS="-Xmx8g"
32
mvn -Dparallel=classes -DthreadCount=2 -Dantlr-python2-python="C:\Python27\python.exe" -Dtest=python2.** test
43
cd ..
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
cd runtime-testsuite
2-
export MAVEN_OPTS="-Xmx8g"
32
mvn -Dparallel=classes -DthreadCount=2 -Dantlr-python3-python="C:\Python310\python.exe" -Dtest=python3.** test
43
cd ..

CONTRIBUTING.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,22 @@
22

33
1. [Fork](https://help.github.com/articles/fork-a-repo) the [antlr/antlr4 repo](https://github.com/antlr/antlr4), which will give you both key branches, `master` and `dev`
44
2. Make sure to `git checkout dev` in your fork so that you are working from the latest development branch
5-
2. Install and configure [EditorConfig](http://editorconfig.org/) so your text editor or IDE uses the ANTLR 4 coding style
6-
3. [Build ANTLR 4](doc/building-antlr.md)
7-
4. [Run the ANTLR project unit tests](doc/antlr-project-testing.md)
8-
5. Create a [pull request](https://help.github.com/articles/using-pull-requests/) with your changes and make sure you're comparing the `dev` branch in your fork to the `dev` branch from the `antlr/antlr4` repo:
5+
3. Create and work from a branch from `dev` such as `git checkout -b
6+
your-branch-name`
7+
4. Install and configure [EditorConfig](http://editorconfig.org/) so your text editor or IDE uses the ANTLR 4 coding style
8+
5. [Build ANTLR 4](doc/building-antlr.md)
9+
6. [Run the ANTLR project unit tests](doc/antlr-project-testing.md)
10+
7. Create a [pull request](https://help.github.com/articles/using-pull-requests/) with your changes and make sure you're comparing the `dev` branch in your fork to the `dev` branch from the `antlr/antlr4` repo:
911

1012
<img src="doc/images/PR-on-dev.png" width="600">
1113

12-
**Note:** You must sign the `contributors.txt` certificate of origin with your pull request if you've not done so before.
14+
**Note:** Each commit requires a "signature", which is simple as using `-s` (not
15+
`-S`) to the git commit command:
16+
17+
```
18+
git commit -s -m 'This is my commit message'
19+
```
20+
21+
Github's pull request process enforces the sig and gives instructions on how to
22+
fix any commits that lack the sig. See [Github DCO app](https://github.com/apps/dco)
23+
for more info.

0 commit comments

Comments
 (0)