mirror of https://github.com/FOME-Tech/fome-fw.git
Feature 3014 migrating to gradle (#3079)
* feat: restructured autotest for migrating to gradle * feat: restructured enum_to_string for migrating to gradle * feat: restructured configuration_definition for migrating to gradle; fix: corrected build.xml * feat: restructured logging for migrating to gradle; fix: corrected build.xml's * feat: restructured romraider for migrating to gradle; fix: corrected build.xml's * feat: restructured autotest for migrating to gradle * feat: restructured enum_to_string for migrating to gradle * feat: restructured configuration_definition for migrating to gradle; fix: corrected build.xml * feat: restructured logging for migrating to gradle; fix: corrected build.xml's * feat: restructured romraider for migrating to gradle; fix: corrected build.xml's * feat: restructured autotest for migrating to gradle * feat: restructured enum_to_string for migrating to gradle * feat: restructured configuration_definition for migrating to gradle; fix: corrected build.xml * feat: restructured logging for migrating to gradle; fix: corrected build.xml's * feat: restructured romraider for migrating to gradle; fix: corrected build.xml's * feat: restructured enum_to_string for migrating to gradle * fix: corrected main build.xml * fix: corrected main build.xml for romraider * fix: corrected main build.xml for romraider * feat: restructured autotest for migrating to gradle * feat: restructured enum_to_string for migrating to gradle * feat: restructured configuration_definition for migrating to gradle; fix: corrected build.xml * feat: restructured logging for migrating to gradle; fix: corrected build.xml's * feat: restructured romraider for migrating to gradle; fix: corrected build.xml's * feat: restructured enum_to_string for migrating to gradle * fix: corrected main build.xml * fix: corrected main build.xml for romraider * fix: corrected main build.xml for romraider * feat: restructured enum_to_string for migrating to gradle * feat: restructured configuration_definition for migrating to gradle; fix: corrected build.xml * upd: get changes from master; fix: rebasing conflicts * feat: restructured logging for migrating to gradle; fix: corrected build.xml's * upd: up-to-master; fix: conflicts in build.xml's * feat: restructured logging for migrating to gradle; fix: corrected build.xml's * fix: conflicts from master * feat: restructured shared_ui module for gradle; fix: main build.xml * feat: restructured tools module; fix: main build.xml according to new structure * feat: restructured modules in java_tools with build.xml; fix: corrected paths in build.xml's and .iml's according to the new structure; corrected path in gen_ptrace_enums.bat
This commit is contained in:
Lenar Khannanov
GitHub
parent
a3291d5fee
commit
2347858d70
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# this tool might have enough flexibility to generate both C# and java class depending on specified "top line" and "stringClassName" parameters?
|
||||
#
|
||||
java -jar ../java_console_binary/rusefi_console.jar ptrace_enums development/perf_trace.h ../java_console/models/src/com/rusefi/tracing/EnumNames.java "package com.rusefi.tracing;" "public static final String"
|
||||
java -jar ../java_console_binary/rusefi_console.jar ptrace_enums development/perf_trace.h ../java_console/models/src/main/java/com/rusefi/tracing/EnumNames.java "package com.rusefi.tracing;" "public static final String"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,13 @@
|
|||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="JavadocReference" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="REPORT_INACCESSIBLE" value="false" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
|
||||
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
|
||||
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="SameParameterValue" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
<inspection_tool class="WeakerAccess" enabled="false" level="WARNING" enabled_by_default="false">
|
||||
<option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="true" />
|
||||
<option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="true" />
|
||||
<option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
|
||||
</inspection_tool>
|
||||
</profile>
|
||||
</component>
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
destdir="autoupdate_build/classes"
|
||||
classpath="lib/annotations.jar"
|
||||
>
|
||||
<src path="autoupdate/src"/>
|
||||
<src path="autoupdate/src/main/java"/>
|
||||
<src path="shared_io/src/main/java"/>
|
||||
</javac>
|
||||
</target>
|
||||
|
|
@ -46,10 +46,10 @@
|
|||
<mkdir dir="build/classes"/>
|
||||
<javac debug="yes" destdir="build/classes"
|
||||
classpath="${lib_list}">
|
||||
<src path="autotest/src"/>
|
||||
<src path="autotest/src/main/java"/>
|
||||
<src path="autoupdate/src/main/java"/>
|
||||
<src path="../java_tools/configuration_definition/src"/>
|
||||
<src path="../java_tools/enum_to_string/src"/>
|
||||
<src path="../java_tools/configuration_definition/src/main/java"/>
|
||||
<src path="../java_tools/enum_to_string/src/main/java"/>
|
||||
<src path="../java_tools/proxy_server/src/main/java"/>
|
||||
<src path="../java_tools/proxy_server/src/test/java"/>
|
||||
<src path="io/src/main/java"/>
|
||||
|
|
@ -58,16 +58,16 @@
|
|||
<src path="models/src/test/java"/>
|
||||
<src path="inifile/src/main/java"/>
|
||||
<src path="inifile/src/test/java"/>
|
||||
<src path="shared_ui/src"/>
|
||||
<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="romraider/src"/>
|
||||
<src path="logging/src"/>
|
||||
<src path="romraider/src/main/java"/>
|
||||
<src path="logging/src/main/java"/>
|
||||
<!-- not really used at the moment but let's compile for the sake of Eclipse users -->
|
||||
<src path="tools/src"/>
|
||||
<src path="tools/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
|
||||
|
|
@ -90,14 +90,14 @@
|
|||
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" includes="**/test/**/*Test.java"/>
|
||||
<fileset dir="autoupdate/src" includes="**/test/**/*Test.java"/>
|
||||
<fileset dir="autotest/src/main/java" includes="**/test/**/*Test.java"/>
|
||||
<fileset dir="autoupdate/src/main/java" includes="**/test/**/*Test.java"/>
|
||||
<fileset dir="io/src/test/java" includes="**/test/**/*Test.java"/>
|
||||
<fileset dir="inifile/src/test/java" includes="**/test/**/*Test.java"/>
|
||||
<fileset dir="models/src/test/java" includes="**/test/**/*Test.java"/>
|
||||
<fileset dir="ui/src/test/java" includes="**/*Test.java"/>
|
||||
<fileset dir="romraider/src" includes="**/test/**/*Test.java"/>
|
||||
<fileset dir="logging/src" includes="**/test/**/*Test.java"/>
|
||||
<fileset dir="romraider/src/main/java" includes="**/test/**/*Test.java"/>
|
||||
<fileset dir="logging/src/main/java" includes="**/test/**/*Test.java"/>
|
||||
</batchtest>
|
||||
</junit>
|
||||
</target>
|
||||
|
|
@ -201,8 +201,8 @@
|
|||
<classpath
|
||||
path="build/classes:lib/junit.jar:${lib_list}:lib/commons-logging.jar"/>
|
||||
<batchtest todir="${hw_tests}">
|
||||
<fileset dir="autotest/src" includes="**/common/*.java"/>
|
||||
<fileset dir="autotest/src" includes="**/f4discovery/*.java"/>
|
||||
<fileset dir="autotest/src/main/java" includes="**/common/*.java"/>
|
||||
<fileset dir="autotest/src/main/java" includes="**/f4discovery/*.java"/>
|
||||
</batchtest>
|
||||
<formatter type="plain" usefile="false" /> <!-- to screen -->
|
||||
</junit>
|
||||
|
|
@ -222,8 +222,8 @@
|
|||
<classpath
|
||||
path="build/classes:lib/junit.jar:${lib_list}:lib/commons-logging.jar"/>
|
||||
<batchtest todir="${hw_tests}">
|
||||
<fileset dir="autotest/src" includes="**/common/*.java"/>
|
||||
<fileset dir="autotest/src" includes="**/proteus/*.java"/>
|
||||
<fileset dir="autotest/src/main/java" includes="**/common/*.java"/>
|
||||
<fileset dir="autotest/src/main/java" includes="**/proteus/*.java"/>
|
||||
</batchtest>
|
||||
<formatter type="plain" usefile="false" /> <!-- to screen -->
|
||||
</junit>
|
||||
|
|
|
|||
|
|
@ -14,5 +14,6 @@
|
|||
<orderEntry type="library" exported="" name="annotations" level="project" />
|
||||
<orderEntry type="module" module-name="shared_io" exported="" />
|
||||
<orderEntry type="module" module-name="logging-api" />
|
||||
<orderEntry type="module" module-name="proxy_server" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ public final class Version {
|
|||
// public static final String LOGGER_DEFS_URL = "http://www.romraider.com/forum/topic1642.html";
|
||||
public static final String CARS_DEFS_URL = "http://www.romraider.com/forum/topic5792.html";
|
||||
public static final String RELEASE_NOTES = "release_notes.txt";
|
||||
public static final ImageIcon ABOUT_ICON = new ImageIcon(Version.class.getClass().getResource("/graphics/romraider-ico-large.gif"));
|
||||
public static final ImageIcon ABOUT_ICON = new ImageIcon(Version.class.getClass().getResource( "/graphics/romraider-ico-large.gif" ));
|
||||
public static final int MIN_LOG_DEF_VERSION = 155;
|
||||
|
||||
private Version() {
|
||||
|
|
@ -104,7 +104,7 @@ public class ECUEditor {
|
|||
private CloseImageWorker closeImageWorker;
|
||||
private SetUserLevelWorker setUserLevelWorker;
|
||||
private LaunchLoggerWorker launchLoggerWorker;
|
||||
private final ImageIcon editorIcon = new ImageIcon(getClass().getResource("/graphics/romraider-ico.gif"), "RomRaider ECU Editor");
|
||||
private final ImageIcon editorIcon = new ImageIcon(getClass().getResource( "/graphics/romraider-ico.gif" ), "RomRaider ECU Editor");
|
||||
|
||||
WindowListener wListenr = new WindowAdapter() {
|
||||
@Override
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue