andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.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-10-15 20:16:39 -04:00
parent 7499836715
commit bccd2cbaa4
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java_console/build.xml
View File

@ -59,20 +59,6 @@
<target name="build" depends="jar, test"/> <target name="build" depends="jar, test"/>
<target name="autoupdate_jar" depends="autoupdate_compile">
<tstamp>
<format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
<jar destfile="rusefi_autoupdate.jar" basedir="autoupdate_build/classes">
<manifest>
<attribute name="Main-Class" value="com.rusefi.autoupdate.Autoupdate"/>
<attribute name="Built-Date" value="${TODAY}"/>
<attribute name="Signature-Vendor" value="rusEFI LLC"/>
</manifest>
</jar>
</target>
<target name="compile"> <target name="compile">
<fail message="Unsupported Java version: ${ant.java.version}. <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"> Make sure that the Java version is 1.8 NOT greater see https://github.com/rusefi/rusefi/issues/3128">
@ -88,7 +74,6 @@
<javac debug="yes" destdir="build/classes" <javac debug="yes" destdir="build/classes"
classpath="${lib_list}"> classpath="${lib_list}">
<src path="autotest/src/main/java"/> <src path="autotest/src/main/java"/>
<src path="autoupdate/src/main/java"/>
<src path="../java_tools/configuration_definition/src/main/java"/> <src path="../java_tools/configuration_definition/src/main/java"/>
<src path="../java_tools/configuration_definition/build/generated-src/antlr/main"/> <src path="../java_tools/configuration_definition/build/generated-src/antlr/main"/>
<src path="../java_tools/enum_to_string/src/main/java"/> <src path="../java_tools/enum_to_string/src/main/java"/>
@ -157,7 +142,7 @@
</copy> </copy>
</target> </target>
<target name="jar" depends="compile, native_header, copy_c_sources, autoupdate_jar"> <target name="jar" depends="compile, native_header, copy_c_sources">
<mkdir dir="build/jar"/> <mkdir dir="build/jar"/>
<delete file="${jar_file}"/> <delete file="${jar_file}"/>
<echo message="Building ${jar_file}"/> <echo message="Building ${jar_file}"/>

11
java_console/ui/build.gradle
View File

@ -1,5 +1,6 @@
plugins { plugins {
id 'java' id 'java'
id 'com.github.johnrengelman.shadow' version '6.1.0'
} }
dependencies { dependencies {
@ -18,6 +19,10 @@ dependencies {
testImplementation testFixtures(project(':ecu_io')) testImplementation testFixtures(project(':ecu_io'))
} }
//compileJava { shadowJar {
// dependsOn(':config_definition:generateGrammarSource') manifest {
//} attributes(
'Main-Class': 'com.rusefi.Launcher'
)
}
}