From 899a4610987bde05b8a1ec15fcc2837af1008be4 Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 4 Apr 2017 21:21:07 -0400 Subject: [PATCH] preparing to further git conversion --- java_tools/version2header.jar | Bin 3898 -> 4182 bytes .../src/com/rusefi/Version2Header.java | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/java_tools/version2header.jar b/java_tools/version2header.jar index 48ab55c27c07362efcca920e40aeeb6b28a5ffef..4149701115948cb3dc1474da14ac222e246ec7c6 100644 GIT binary patch literal 4182 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 diff --git a/java_tools/version2header/src/com/rusefi/Version2Header.java b/java_tools/version2header/src/com/rusefi/Version2Header.java index 351ffb27d4..625853d0e8 100644 --- a/java_tools/version2header/src/com/rusefi/Version2Header.java +++ b/java_tools/version2header/src/com/rusefi/Version2Header.java @@ -9,22 +9,30 @@ import java.util.Date; public class Version2Header { private static final String NL = "\n";//System.getProperty("line.separator"); - private static final String COMMAND = "svn info"; + private static final String COMMAND = "svn info "; private static final String VERSION_MARKER = "Last Changed Rev: "; private static final String HEADER_TAG = "VCS_VERSION"; public static void main(String[] args) throws IOException { - if (args.length!=1) { + if (args.length != 1 && args.length != 2) { System.out.println("Version offset value is now a mandatory parameter!"); System.exit(-1); } int versionOffsetValue = Integer.parseInt(args[0]); + String url = args.length == 2 ? args[1] : ""; System.out.println("Hi, it's " + new Date()); + if (url.isEmpty()) { + System.out.println("Looking for local version"); + } else { + System.out.println("Looking for remove version: " + url); + } + String command = COMMAND + url; + System.out.println("Working with " + NL.length() + " line ends, offset " + versionOffsetValue); Process simulatorProcess = null; try { - System.out.println("Executing [" + COMMAND + "]"); - simulatorProcess = Runtime.getRuntime().exec(COMMAND); + System.out.println("Executing [" + command + "]"); + simulatorProcess = Runtime.getRuntime().exec(command); BufferedReader stdout = new BufferedReader(new InputStreamReader(simulatorProcess.getInputStream())); @@ -32,7 +40,7 @@ public class Version2Header { int counter = 0; String line; while ((line = stdout.readLine()) != null) { - System.out.println("from " + COMMAND + ": " + line); + System.out.println("from " + command + ": " + line); counter++; if (line.startsWith(VERSION_MARKER)) {