diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java index 991a528514..1455780abe 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java @@ -184,7 +184,8 @@ public class ConfigDefinition { ParseState parseState = new ParseState(state.enumsReader); // Add the variable for the config signature - long crc32 = IoUtil2.signatureHash(state, parseState, tsInputFileFolder, state.inputFiles); + long crc32 = IoUtil2.getCrc32(state.inputFiles); + IoUtil2.signatureHash(state, parseState, tsInputFileFolder, crc32); ExtraUtil.handleFiringOrder(firingEnumFileName, state.variableRegistry, parseState); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/IoUtil2.java b/java_tools/configuration_definition/src/main/java/com/rusefi/IoUtil2.java index d82efce08c..189151e3cd 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/IoUtil2.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/IoUtil2.java @@ -33,7 +33,7 @@ public class IoUtil2 { } } - static long getCrc32(String fileName) throws IOException { + private static long getCrc32(String fileName) throws IOException { File file = new File(fileName); byte[] fileContent = Files.readAllBytes(file.toPath()); for (int i = 0; i < fileContent.length; i++) { @@ -46,7 +46,8 @@ public class IoUtil2 { return c.getValue(); } - static long signatureHash(ReaderState state, ParseState parseState, String tsPath, List inputFileNames) throws IOException { + + static long getCrc32(List inputFileNames) throws IOException { // get CRC32 of given input files long crc32 = 0; for (String fileName : inputFileNames) { @@ -55,6 +56,10 @@ public class IoUtil2 { crc32 ^= c; } SystemOut.println("CRC32 from all input files = " + crc32); + return crc32; + } + + static void signatureHash(ReaderState state, ParseState parseState, String tsPath, long crc32) { // store the CRC32 as a built-in variable // nasty trick - do not insert signature into live data files @@ -62,7 +67,5 @@ public class IoUtil2 { state.variableRegistry.register(ConfigDefinition.SIGNATURE_HASH, "" + crc32); parseState.addDefinition(ConfigDefinition.SIGNATURE_HASH, Long.toString(crc32), Definition.OverwritePolicy.NotAllowed); } - - return crc32; } }