mirror of https://github.com/rusefi/rusefi.git
only:Let's admit it's time to move to gradle #3014
This commit is contained in:
rusefillc
parent
e621589a69
commit
b1584f7084
|
|
@ -1,193 +0,0 @@
|
|||
<project default="build">
|
||||
<property name="jar_file_folder" value="../java_console_binary"/>
|
||||
<property name="hw_tests" value="build_hw"/>
|
||||
<property name="jar_file" value="${jar_file_folder}/rusefi_console.jar"/>
|
||||
|
||||
<resources id="libs">
|
||||
<string>lib/mockito-all-1.10.19.jar</string>
|
||||
<string>../java_tools/configuration_definition/lib/snakeyaml.jar</string>
|
||||
<string>lib/log4j-api-2.13.3.jar</string>
|
||||
<string>lib/log4j-core-2.13.3.jar</string>
|
||||
<string>lib/jsr305-2.0.1.jar</string>
|
||||
<string>lib/dfu/dfu_java.jar</string>
|
||||
<string>lib/dfu/IntelHexParser.jar</string>
|
||||
<string>lib/json-simple-1.1.1.jar</string>
|
||||
<string>lib/json-simple-1.1.1.jar</string>
|
||||
<string>lib/jaxb-api.jar</string>
|
||||
<string>lib/httpclient.jar</string>
|
||||
<string>lib/httpmime.jar</string>
|
||||
<string>lib/httpcore.jar</string>
|
||||
<string>lib/jSerialComm.jar</string>
|
||||
<string>lib/jcip-annotations-1.0.jar</string>
|
||||
<string>lib/swing-layout-1.0.jar</string>
|
||||
<string>lib/jep.jar</string>
|
||||
<string>lib/log4j.jar</string>
|
||||
<string>lib/junit.jar</string>
|
||||
<string>lib/SteelSeries-3.9.30.jar</string>
|
||||
<string>lib/annotations.jar</string>
|
||||
<string>lib/miglayout-4.0.jar</string>
|
||||
<string>../java_tools/configuration_definition/lib/antlr-4.12.0-complete.jar</string>
|
||||
<string>lib/javacan-core.jar</string>
|
||||
</resources>
|
||||
<pathconvert property="lib_list" refid="libs" pathsep=":" />
|
||||
|
||||
<target name="clean">
|
||||
<delete dir="build"/>
|
||||
<delete dir="${hw_tests}"/>
|
||||
</target>
|
||||
|
||||
<target name="clean_out_folder">
|
||||
<delete dir="out"/>
|
||||
</target>
|
||||
|
||||
<target name="build" depends="jar, test"/>
|
||||
|
||||
<target name="compile">
|
||||
<fail message="Unsupported Java version detected: [${ant.java.version}]
|
||||
Make sure that the Java version is exactly 11.">
|
||||
<condition>
|
||||
<not>
|
||||
<or>
|
||||
<equals arg1="${ant.java.version}" arg2="11"/>
|
||||
</or>
|
||||
</not>
|
||||
</condition>
|
||||
</fail>
|
||||
<mkdir dir="build/classes"/>
|
||||
<javac debug="yes" destdir="build/classes"
|
||||
classpath="${lib_list}"
|
||||
encoding="iso-8859-1">
|
||||
<src path="autotest/src/main/java"/>
|
||||
<src path="../java_tools/configuration_definition/src/main/java"/>
|
||||
<src path="../java_tools/configuration_definition_base/src/main/java"/>
|
||||
<src path="../java_tools/trigger-image/src/main/java"/>
|
||||
<src path="../java_tools/enum_to_string/src/main/java"/>
|
||||
<src path="io/src/main/java"/>
|
||||
<src path="io/src/test/java"/>
|
||||
<src path="io/src/testFixtures/java"/>
|
||||
<src path="luaformatter/src"/>
|
||||
<src path="models/src/main/java"/>
|
||||
<src path="models/src/test/java"/>
|
||||
<src path="inifile/src/main/java"/>
|
||||
<src path="inifile/src/test/java"/>
|
||||
<src path="core_ui/src/main/java"/>
|
||||
<src path="shared_ui/src/main/java"/>
|
||||
<src path="shared_io/src/main/java"/>
|
||||
<!-- <src path="shared_io/src/test/java"/>-->
|
||||
<src path="logging-api/src/main/java"/>
|
||||
<src path="ui/src/main/java"/>
|
||||
<src path="ui/src/test/java"/>
|
||||
<src path="logging/src/main/java"/>
|
||||
<!-- uncomment if you want to compile under java 11
|
||||
// see https://github.com/rusefi/rusefi/issues/1526
|
||||
please remove the space between '-' and '-add-exports' it should be double-dash
|
||||
<compilerarg line="- -add-exports java.xml/com.sun.org.apache.xerces.internal.parsers=ALL-UNNAMED"/>
|
||||
<compilerarg line="- -add-exports java.xml/com.sun.org.apache.xml.internal.serialize=ALL-UNNAMED"/>
|
||||
-->
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="test" depends="compile, copy_c_sources">
|
||||
<junit fork="yes"
|
||||
maxmemory="512m"
|
||||
printsummary="yes"
|
||||
haltonfailure="yes">
|
||||
|
||||
<jvmarg value="-ea"/>
|
||||
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError"/>
|
||||
<sysproperty key="java.library.path" value="../unit_tests/build"/>
|
||||
<formatter type="brief"/>
|
||||
<classpath
|
||||
path="build/classes:lib/junit.jar:${lib_list}:lib/commons-logging.jar"/>
|
||||
<batchtest todir="build">
|
||||
<!-- at the moment we do NOT have any tests matching this pattern - all hardware tests are not inside 'test' folders -->
|
||||
<fileset dir="autotest/src/main/java" includes="**/test/**/*Test.java"/>
|
||||
<fileset dir="io/src/test/java" includes="**/*Test.java"/>
|
||||
<fileset dir="inifile/src/test/java" includes="**/*Test.java"/>
|
||||
<fileset dir="models/src/test/java" includes="**/*Test.java"/>
|
||||
<fileset dir="ui/src/test/java" includes="**/*Test.java"/>
|
||||
<fileset dir="logging/src/main/java" includes="**/test/**/*Test.java"/>
|
||||
</batchtest>
|
||||
</junit>
|
||||
</target>
|
||||
|
||||
<target name="copy_c_sources">
|
||||
<copy todir="build/classes/c_sources" flatten="true">
|
||||
<fileset dir="../firmware/controllers" includes="**/*.cpp"/>
|
||||
<fileset dir="../firmware/console" includes="**/*.cpp"/>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="jar" depends="compile, copy_c_sources">
|
||||
<mkdir dir="build/jar"/>
|
||||
<delete file="${jar_file}"/>
|
||||
<echo message="Building ${jar_file}"/>
|
||||
|
||||
<copy todir="build/classes">
|
||||
<fileset dir="ui/src/main/resources" includes="**/*.gif"/>
|
||||
<fileset dir="ui/src/main/resources" includes="**/*.png"/>
|
||||
<fileset dir="ui/src/main/resources" includes="**/*.jpg"/>
|
||||
</copy>
|
||||
|
||||
<tstamp>
|
||||
<format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss"/>
|
||||
</tstamp>
|
||||
|
||||
<mkdir dir="${jar_file_folder}"/>
|
||||
<jar destfile="${jar_file}" basedir="build/classes">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="com.rusefi.Launcher"/>
|
||||
<attribute name="Built-Date" value="${TODAY}"/>
|
||||
<attribute name="Signature-Vendor" value="rusEFI LLC"/>
|
||||
</manifest>
|
||||
<zipfileset src="lib/SteelSeries-3.9.30.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/trident-6.2.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/swing-layout-1.0.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/log4j.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/jep.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/httpclient.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/commons-logging.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/javacan-core.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/javacan-core-x86_64.jar" includes="**/*.class **/*.xml **/*.properties **/*.so"/>
|
||||
<zipfileset src="lib/slf4j-api.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/slf4j-simple.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/httpcore.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/httpmime.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/jaxb-api.jar" includes="**/*.class"/>
|
||||
<zipfileset src="../java_tools/configuration_definition/lib/antlr-4.12.0-complete.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/jSerialComm.jar" includes="**/*.class **/*.so **/*.dll **/*.jnilib"/>
|
||||
<zipfileset src="lib/dfu/libusb4java-1.3.0-linux-aarch64.jar" includes="**/*.class **/*.so **/*.dll **/*.jnilib"/>
|
||||
<zipfileset src="lib/dfu/libusb4java-1.3.0-linux-arm.jar" includes="**/*.class **/*.so **/*.dll **/*.jnilib"/>
|
||||
<zipfileset src="lib/dfu/libusb4java-1.3.0-linux-x86.jar" includes="**/*.class **/*.so **/*.dll **/*.jnilib"/>
|
||||
<zipfileset src="lib/dfu/libusb4java-1.3.0-linux-x86-64.jar" includes="**/*.class **/*.so **/*.dll **/*.jnilib"/>
|
||||
<zipfileset src="lib/dfu/libusb4java-1.3.0-darwin-x86-64.jar" includes="**/*.class **/*.so **/*.dll **/*.jnilib"/>
|
||||
<zipfileset src="lib/dfu/usb4java-1.3.0.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/dfu/IntelHexParser.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/dfu/dfu_java.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/annotations.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/miglayout-4.0.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/batik/batik-svggen.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/batik/batik-awt-util.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/batik/batik-util.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/json-simple-1.1.1.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/junit.jar" includes="**/*.class"/>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="run" depends="jar">
|
||||
<java jar="${jar_file}" fork="true"/>
|
||||
</target>
|
||||
|
||||
<target name="simulator_test" depends="jar">
|
||||
<java classpath="${jar_file}" classname="com.rusefi.SimulatorFunctionalTest" failonerror="true" args="start">
|
||||
</java>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="before_IDEA_Build">
|
||||
<copy todir=".">
|
||||
<fileset dir="../firmware/tunerstudio" includes="rusefi.ini"/>
|
||||
</copy>
|
||||
|
||||
</target>
|
||||
</project>
|
||||
|
|
@ -26,10 +26,6 @@ shadowJar {
|
|||
'Main-Class': 'com.rusefi.ConfigDefinition'
|
||||
)
|
||||
}
|
||||
/*
|
||||
to keep only classes from logging
|
||||
and loggin-api as in build.xml
|
||||
*/
|
||||
dependencies {
|
||||
exclude(dependency(global_libs.jsr305))
|
||||
exclude(dependency(global_libs.junit))
|
||||
|
|
|
|||
|
|
@ -22,10 +22,6 @@ shadowJar {
|
|||
)
|
||||
}
|
||||
|
||||
/*
|
||||
to keep only classes from logging
|
||||
and logging-api as in build.xml
|
||||
*/
|
||||
dependencies {
|
||||
exclude(dependency(global_libs.jsr305))
|
||||
exclude(dependency(global_libs.junit))
|
||||
|
|
|
|||
|
|
@ -60,8 +60,6 @@ shadowJar {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// custom task from build.xml
|
||||
tasks.register('launcher_local_install', Copy) {
|
||||
dependsOn tasks.shadowJar
|
||||
from layout.buildDirectory.dir( jarDir + '/' + jarName + '.jar')
|
||||
|
|
|
|||
Loading…
Reference in New Issue