rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ant should go, gradle is the unified way #4371

This commit is contained in:
rusefillc 2022-07-28 15:04:52 -04:00
parent b1a532055d
commit a95c1faa6d
4 changed files with 4 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build-rusEFI-console.yaml vendored
View File

@ -23,8 +23,8 @@ jobs:
run: sudo apt-get install sshpass
- name: Generate Java (Antlr)
working-directory: ./java_tools/configuration_definition
run: ant antlr
working-directory: ./android
run: ./gradlew :config_definition:generateGrammarSource
- name: Print GCC version
working-directory: .

4
.github/workflows/hardware-ci.yaml vendored
View File

@ -74,8 +74,8 @@ jobs:
run: openocd -f "interface/stlink.cfg" -f "target/stm32f4x.cfg" -c init -c targets -c "reset halt" -c "flash erase_sector 0 0 11" -c "flash write_image "deliver/rusefi.bin" 0x08000000" -c "reset run" -c "shutdown"
- name: Generate Java (Antlr)
working-directory: ./java_tools/configuration_definition
run: ant antlr
working-directory: ./android
run: ./gradlew :config_definition:generateGrammarSource
# This both compiles and runs HW CI tests
- name: Run Hardware CI

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

77
java_tools/configuration_definition/build.xml
View File

@ -1,77 +0,0 @@
<project default="jar">
<property name="javac.source" value="1.8"/>
<property name="javac.target" value="1.8"/>
<property name="console_path" value="../../java_console"/>
<target name="clean">
<delete dir="build"/>
</target>
<target name="antlr">
<echo message="Invoking grammar generator..."/>
<java jar="lib/antlr-4.9.3-complete.jar" args="-o build/generated-src/antlr/main src/main/antlr/RusefiConfigGrammar.g4" fork="true" failonerror="true" />
</target>
<target name="compile" depends="antlr">
<fail message="Unsupported Java version: ${ant.java.version}.
Make sure that the Java version is 1.8 NOT greater see https://github.com/rusefi/rusefi/issues/3128">
<condition>
<not>
<or>
<equals arg1="${ant.java.version}" arg2="1.8"/>
</or>
</not>
</condition>
</fail>
<mkdir dir="build/classes"/>
<javac
source="${javac.source}"
debug="true"
target="${javac.target}"
destdir="build/classes"
classpath="${console_path}/lib/jsr305-2.0.1.jar:lib/junit.jar:../../java_console/lib/annotations.jar:lib/snakeyaml.jar:lib/antlr-4.9.3-complete.jar">
<src path="src/main/java"/>
<src path="src/test/java"/>
<src path="build/generated-src/antlr/main"/>
<src path="${console_path}/autoupdate/src/main/java"/>
<src path="${console_path}/inifile/src/main/java"/>
<src path="${console_path}/logging/src/main/java"/>
<src path="${console_path}/logging-api/src/main/java"/>
<src path="${console_path}/models/src/main/java"/>
<src path="${console_path}/shared_io/src/main/java"/>
<src path="../enum_to_string/src/main/java"/>
</javac>
<junit fork="no"
maxmemory="512m"
printsummary="yes"
haltonfailure="yes">
<jvmarg value="-ea"/>
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError"/>
<formatter type="brief"/>
<classpath path="build/classes:lib/junit.jar:lib/annotations.jar:lib/snakeyaml.jar:lib/antlr-4.9.3-complete.jar"/>
<batchtest todir="build">
<fileset dir="src/main/java" includes="**/test/**/*Test.java"/>
<fileset dir="src/test/java" includes="**/*Test.java"/>
<fileset dir="../enum_to_string/src/main/java" includes="**/test/**/*Test.java"/>
</batchtest>
</junit>
</target>
<target name="jar" depends="compile">
<mkdir dir="build/jar"/>
<jar destfile="../ConfigDefinition.jar" basedir="build/classes">
<manifest>
<attribute name="Main-Class" value="com.rusefi.ConfigDefinition"/>
</manifest>
<zipfileset dir="build/classes" includes="**/*.class"/>
<zipfileset src="lib/snakeyaml.jar" includes="**/*.class"/>
<zipfileset src="lib/antlr-4.9.3-complete.jar" includes="**/*.class"/>
</jar>
</target>
</project>