From 4270b11209e05570fa31a4c52bcae98d35d3f572 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 27 Mar 2017 22:24:52 -0400 Subject: [PATCH] EOL for generated files --- java_tools/ConfigDefinition.jar | Bin 32407 -> 32357 bytes .../src/com/rusefi/ConfigDefinition.java | 16 ++++++------ .../src/com/rusefi/ConfigField.java | 24 ++++++++++-------- .../src/com/rusefi/VariableRegistry.java | 6 +++-- .../com/rusefi/test/ConfigDefinitionTest.java | 6 ++--- 5 files changed, 28 insertions(+), 24 deletions(-) diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index a20c8c8385ec4f595e6e3a8db28532b0f9a59102..7ce6969b9295f69d6e42aed5a325d68ac2ecef2f 100644 GIT binary patch literal 32357 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 M6;lYx`Hye^7kOXIR{#J2 literal 32407 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 Y0RGE0-ygBj0YD { System.out.println("Registering " + var + " as " + value); put(var, value); - cAllDefinitions.append("#define " + var + " " + value + "\r\n"); + cAllDefinitions.append("#define " + var + " " + value + EOL); tryToRegisterAsInteger(var, value); } @@ -59,7 +61,7 @@ public class VariableRegistry extends TreeMap { if (intValues.containsKey(var)) throw new IllegalStateException("Not allowed to redefine: " + var); intValues.put(var, intValue); - javaNumbericDefinitions.append("\tpublic static final int " + var + " = " + intValue + ";" + ConfigDefinition.EOL); + javaNumbericDefinitions.append("\tpublic static final int " + var + " = " + intValue + ";" + EOL); } catch (NumberFormatException e) { System.out.println("Not an integer: " + value); } diff --git a/java_tools/configuration_definition/src/com/rusefi/test/ConfigDefinitionTest.java b/java_tools/configuration_definition/src/com/rusefi/test/ConfigDefinitionTest.java index f33b77e1d9..45f789f8c5 100644 --- a/java_tools/configuration_definition/src/com/rusefi/test/ConfigDefinitionTest.java +++ b/java_tools/configuration_definition/src/com/rusefi/test/ConfigDefinitionTest.java @@ -16,9 +16,9 @@ public class ConfigDefinitionTest { @Test public void testComment() { assertEquals("", ConfigDefinition.packComment("", "\t")); - assertEquals("\t * abc\r\n", ConfigDefinition.packComment("abc", "\t")); - assertEquals("\t * abc\r\n" + - "\t * vbn\r\n", ConfigDefinition.packComment("abc\\nvbn", "\t")); + assertEquals("\t * abc\n", ConfigDefinition.packComment("abc", "\t")); + assertEquals("\t * abc\n" + + "\t * vbn\n", ConfigDefinition.packComment("abc\\nvbn", "\t")); } @Test