2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-25 08:17:11 -07:00

Updated for latest RIFE2 core.

Some build changes.
Run Github workflow on macOS.
This commit is contained in:
Geert Bevin 2023-10-01 09:29:15 -04:00
parent a6aadf8e60
commit 2a5437de0c
5 changed files with 34 additions and 7 deletions

View file

@ -110,3 +110,29 @@ jobs:
-Dtest.postgres=true -Dtest.mysql=true -Dtest.mariadb=true -Dtest.oracle=true -Dtest.oracle-free=true -Dtest.postgres=true -Dtest.mysql=true -Dtest.mariadb=true -Dtest.oracle=true -Dtest.oracle-free=true
-DtestsBadgeUrl=https://rife2.com/tests-badge/update/com.uwyn.rife2/bld -DtestsBadgeUrl=https://rife2.com/tests-badge/update/com.uwyn.rife2/bld
-DtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }} -DtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}
build-bld-project-macos:
runs-on: macos-latest
strategy:
matrix:
java-version: [ 17, 20 ]
steps:
- name: Checkout source repository
uses: actions/checkout@v4
with:
clean: true
submodules: 'true'
fetch-depth: 0
- name: Set up JDK ${{ matrix.java-version }}
uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: ${{ matrix.java-version }}
check-latest: true
- name: Run tests
run: >-
./bld clean download compile test

2
core

@ -1 +1 @@
Subproject commit e6872e1c927662eb5156700c6d81b483b75e383b Subproject commit 0ad243b95e76bb506e625822a0f7ef9d03733f71

View file

@ -56,7 +56,8 @@ public class BldBuild extends AbstractRife2Build {
.mainSourceDirectories(antlr4Operation.outputDirectory(), core_src_main_java_directory) .mainSourceDirectories(antlr4Operation.outputDirectory(), core_src_main_java_directory)
.testSourceDirectories(core_src_test_java_directory) .testSourceDirectories(core_src_test_java_directory)
.compileOptions() .compileOptions()
.debuggingInfo(JavacOptions.DebuggingInfo.ALL); .debuggingInfo(JavacOptions.DebuggingInfo.ALL)
.addAll(List.of("-encoding", "UTF-8"));
jarOperation() jarOperation()
.sourceDirectories(core_src_main_resources_directory) .sourceDirectories(core_src_main_resources_directory)

View file

@ -78,7 +78,7 @@ public class JavacOptions extends ArrayList<String> {
*/ */
public JavacOptions encoding(String name) { public JavacOptions encoding(String name) {
add("-encoding"); add("-encoding");
add("name"); add(name);
return this; return this;
} }

View file

@ -100,7 +100,7 @@ public class JavadocOptions extends ArrayList<String> {
*/ */
public JavadocOptions doclet(String className) { public JavadocOptions doclet(String className) {
add("-doclet"); add("-doclet");
add("className"); add(className);
return this; return this;
} }
@ -112,7 +112,7 @@ public class JavadocOptions extends ArrayList<String> {
*/ */
public JavadocOptions docletPath(String path) { public JavadocOptions docletPath(String path) {
add("-docletpath"); add("-docletpath");
add("path"); add(path);
return this; return this;
} }
@ -135,7 +135,7 @@ public class JavadocOptions extends ArrayList<String> {
*/ */
public JavadocOptions encoding(String name) { public JavadocOptions encoding(String name) {
add("-encoding"); add("-encoding");
add("name"); add(name);
return this; return this;
} }
@ -213,7 +213,7 @@ public class JavadocOptions extends ArrayList<String> {
*/ */
public JavadocOptions locale(String name) { public JavadocOptions locale(String name) {
add("-locale"); add("-locale");
add("name"); add(name);
return this; return this;
} }