parent
3528befe13
commit
fb60c2f1c7
|
@ -1,7 +1,7 @@
|
|||
<component name="libraryTable">
|
||||
<library name="antlr">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/../java_tools/configuration_definition/lib/antlr-4.5-complete.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/../java_tools/configuration_definition/lib/antlr-4.9.3-complete.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<property name="hw_tests" value="build_hw"/>
|
||||
<property name="jar_file" value="${jar_file_folder}/rusefi_console.jar"/>
|
||||
<property name="server_jar_file" value="${jar_file_folder}/rusefi_server.jar"/>
|
||||
<property name="lib_list" value="lib/mockito-all-1.10.19.jar:../java_tools/configuration_definition/lib/snakeyaml.jar:lib/log4j-api-2.13.3.jar:lib/log4j-core-2.13.3.jar:lib/jsr305-2.0.1.jar:lib/dfu/dfu_java.jar:lib/dfu/IntelHexParser.jar:lib/json-simple-1.1.1.jar:lib/server/javax.json.jar:lib/server/cactoos.jar:lib/server/takes.jar:lib/json-simple-1.1.1.jar:lib/jaxb-api.jar:lib/httpclient.jar:lib/httpmime.jar:lib/httpcore.jar:lib/jSerialComm.jar:lib/jcip-annotations-1.0.jar:lib/swing-layout-1.0.jar:lib/jep.jar:lib/log4j.jar:lib/junit.jar:lib/SteelSeries-3.9.30.jar:lib/annotations.jar:lib/miglayout-4.0.jar:lib/surfaceplotter-2.0.1.jar:../java_tools/configuration_definition/lib/antlr-4.5-complete.jar"/>
|
||||
<property name="lib_list" value="lib/mockito-all-1.10.19.jar:../java_tools/configuration_definition/lib/snakeyaml.jar:lib/log4j-api-2.13.3.jar:lib/log4j-core-2.13.3.jar:lib/jsr305-2.0.1.jar:lib/dfu/dfu_java.jar:lib/dfu/IntelHexParser.jar:lib/json-simple-1.1.1.jar:lib/server/javax.json.jar:lib/server/cactoos.jar:lib/server/takes.jar:lib/json-simple-1.1.1.jar:lib/jaxb-api.jar:lib/httpclient.jar:lib/httpmime.jar:lib/httpcore.jar:lib/jSerialComm.jar:lib/jcip-annotations-1.0.jar:lib/swing-layout-1.0.jar:lib/jep.jar:lib/log4j.jar:lib/junit.jar:lib/SteelSeries-3.9.30.jar:lib/annotations.jar:lib/miglayout-4.0.jar:lib/surfaceplotter-2.0.1.jar:../java_tools/configuration_definition/lib/antlr-4.9.3-complete.jar"/>
|
||||
|
||||
<target name="clean">
|
||||
<delete dir="build"/>
|
||||
|
@ -173,7 +173,7 @@
|
|||
<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.5-complete.jar" includes="**/*.class"/>
|
||||
<zipfileset src="../java_tools/configuration_definition/lib/antlr-4.9.3-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"/>
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
<target name="antlr">
|
||||
<echo message="Invoking grammar generator..."/>
|
||||
<java jar="lib/antlr-4.5-complete.jar" args="-o src/main/java/com/rusefi/generated RusefiConfigGrammar.g4" fork="true" failonerror="true" />
|
||||
<java jar="lib/antlr-4.9.3-complete.jar" args="-o src/main/java/com/rusefi/generated RusefiConfigGrammar.g4" fork="true" failonerror="true" />
|
||||
</target>
|
||||
|
||||
<target name="compile" depends="antlr">
|
||||
|
@ -31,7 +31,7 @@
|
|||
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.5-complete.jar">
|
||||
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="${console_path}/autoupdate/src/main/java"/>
|
||||
<src path="${console_path}/inifile/src/main/java"/>
|
||||
|
@ -50,7 +50,7 @@
|
|||
<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.5-complete.jar"/>
|
||||
<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="../enum_to_string/src/main/java" includes="**/test/**/*Test.java"/>
|
||||
|
@ -67,7 +67,7 @@
|
|||
</manifest>
|
||||
<zipfileset dir="build/classes" includes="**/*.class"/>
|
||||
<zipfileset src="lib/snakeyaml.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/antlr-4.5-complete.jar" includes="**/*.class"/>
|
||||
<zipfileset src="lib/antlr-4.9.3-complete.jar" includes="**/*.class"/>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/out" />
|
||||
|
@ -13,16 +14,8 @@
|
|||
<orderEntry type="module" module-name="inifile" />
|
||||
<orderEntry type="module" module-name="shared_io" />
|
||||
<orderEntry type="module" module-name="models" />
|
||||
<orderEntry type="module-library">
|
||||
<library>
|
||||
<CLASSES>
|
||||
<root url="jar://$MODULE_DIR$/lib/antlr-4.5-complete.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</orderEntry>
|
||||
<orderEntry type="module" module-name="enum_to_string" />
|
||||
<orderEntry type="module" module-name="logging-api" />
|
||||
<orderEntry type="library" name="antlr" level="project" />
|
||||
</component>
|
||||
</module>
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue