diff --git a/firmware/svnversion.h b/firmware/svnversion.h index bf9ff41eed..7ab988a8db 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Tue Feb 21 23:07:26 EST 2017 +// Wed Feb 22 21:39:58 EST 2017 #ifndef VCS_VERSION -#define VCS_VERSION "2963" +#define VCS_VERSION "12972" #endif diff --git a/firmware/update_version.bat b/firmware/update_version.bat index 2dd3705dab..f3549d2f4b 100644 --- a/firmware/update_version.bat +++ b/firmware/update_version.bat @@ -1,3 +1,3 @@ rem Let's regemerate 'svnversion.h' rem TODO: handle std err - for example, in case svn needs upgrade -java -jar ../java_tools/version2header.jar \ No newline at end of file +java -jar ../java_tools/version2header.jar 10000 \ No newline at end of file diff --git a/java_tools/version2header.jar b/java_tools/version2header.jar index 88078849f9..48ab55c27c 100644 Binary files a/java_tools/version2header.jar and b/java_tools/version2header.jar differ diff --git a/java_tools/version2header/src/com/rusefi/Version2Header.java b/java_tools/version2header/src/com/rusefi/Version2Header.java index 80f3209da0..20fe25508e 100644 --- a/java_tools/version2header/src/com/rusefi/Version2Header.java +++ b/java_tools/version2header/src/com/rusefi/Version2Header.java @@ -14,8 +14,13 @@ public class Version2Header { private static final String HEADER_TAG = "VCS_VERSION"; public static void main(String[] args) throws IOException { + if (args.length!=1) { + System.out.println("Version offset value is now a mandatory parameter!"); + System.exit(-1); + } + int versionOffsetValue = Integer.parseInt(args[0]); System.out.println("Hi, it's " + new Date()); - System.out.println("Working with " + NL.length() + " line ends"); + System.out.println("Working with " + NL.length() + " line ends, offset " + versionOffsetValue); Process simulatorProcess = null; try { System.out.println("Executing [" + COMMAND + "]"); @@ -34,7 +39,7 @@ public class Version2Header { String ver = line.substring(VERSION_MARKER.length()); System.out.println("Version [" + ver + "]"); int version = Integer.parseInt(ver); - writeFile(version); + writeFile(versionOffsetValue + version); } } System.out.println("Got " + counter + " lines of stdout");