From ac0d84818cea397b82adbc6208c777056ebf5df7 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 22 Feb 2017 21:40:43 -0500 Subject: [PATCH] version offset for a better transition from SD to GH --- firmware/svnversion.h | 4 ++-- firmware/update_version.bat | 2 +- java_tools/version2header.jar | Bin 3740 -> 3898 bytes .../src/com/rusefi/Version2Header.java | 9 +++++++-- 4 files changed, 10 insertions(+), 5 deletions(-) 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 88078849f9a4ca21bf27b0d11317aa061978fea9..48ab55c27c07362efcca920e40aeeb6b28a5ffef 100644 GIT binary patch literal 3898 zcmeH~c{J4PAIB$InjuTgD2l>FLxvf~R&>WQ_H8iv4XTN8Neo6(=rS~e#8|S0EMpC2 zDSK&1B_b8BWqy`p-+n?QamVfI-p;8%?m53deZJ>;zR&lZ_xpK1&-b7Ad080m<^%x% zdjNosMK~kCKMDxo1eoesqvZ|FFbW$j0D#3`(mjA>wp9G=GAn>Bk7f@rdwi3cqRk93 zdREqOQ;g{?1TRxj5VI1pPCInjz=aXw>sIaq^CJ~+7Bj&oyrc+T-)Pc9Mo=j`MuEx*PcTLHaT~jpo1y9HaxoqPynM|xe z6i6CmS$o@it|PDQh1}x4*885K$lijT&$z9>+3f{jI-j~Tl zXV-7SuNUvNT!wLQ0{|`T-*)7CA&%%xb|rZr4TuCMqBq>}5`j#Q3Tg5pujR~NLZ=9=2B;8zBHYUfDfU7_w(*8 zaUV0f!)ZqKW1^1B0!c_~lV0j8frE&ln#bhnpa_);W3}vI`MS0a#7pWqp`4Xqk zEO0$`qLVcs=Z4%012ohcKg^qBB>TsP&imH(_G{-Q8`Q*0b&n*YvVM7{x{7=E@gySP z{xIc*GqLH>Fy14?*;F}Zt_p7#-_q2Gr<*HVS;B{TAg70AWNo6N2uAZs5shlvbz&8| z;SJ5{PzQchc z#tLF153fxnYK@9t@ASM$nN@bslJ22TLN!vGHXqC}?&z6A^KrTz*dV>a8MJ#f=x)Ij zYN5<+6!fU@I)W}Zitvc4ezSB;Kc+ZOZbEbe^kJ{GX?NJ$;+#k?RfW|E-@x*Fl<=I14r&8_act8UJ@vnRX$e zu{4JDT=?2!&84Kdr()-OjIqE%gU98+lt^4X7hDw6k3TxE4-0&2tnC=2Y@@7{^6F7r zkVDYwy@p+fp~vORpIBg!Jq7NGn&YJ(B#r8FV17ofmcUDM1pv~C{C8*c{>s_t(Y7YZi599b-N;c8eLw#^;ibg7~Q#y54j&dgPZ z&8i`Awqzqc67lh7dE?p`MO$ul7iwa~i zPYN6$?$byPt%V+z^w<=B(p;mm9^S^7i0a%t<%N%V#(>F)DVnDy!d?732bw#0_3E6H zsSQw+F0gHc+=E_UrPZmn4UUN@Uv^(%#WG(9T(1;Hg$!z1#isSu*Mht%-!So(J$>b~ zF|=7>M^IaGiTxg)O^)rH*@=&x_}Gb$o%q;^kDd7VSMjln1H79J8$V$*HiEEA5HO40 zdVj;Puf(=({V}s`8McZMEXSU|S^q(B7RK8<{FtNuwEubd@9gDQs`|NOi>toYR=c0s u%Pq$@%Gx&mI4HNRj9}=l?~Fg9uD|>Kzih_E<~;y_oBdGOXJ_r*`uYRlMy-bc literal 3740 zcmWIWW@h1HVBlb2n7%F4ivbC6GO#fCx`sIFdiuHP|2xIN5CB!m!7vS|)NAF@Yc)XS zeLyS%#Bim)j((nQuE8OCzHYv~hTMk?1l+zK_}kuNrLsiHYxh+hy`yJC&wc4?oHb>4 z$&3BwP0g==-#adCaI|yD4C{?Y=2+d0U|;25za-vZk4Jde@oRF9m1;UBvrd2edj6WN z-#MGvVej*L64l-s>(AVH<-gpO217~v#U9I@>!RaYmu1v99-dmD!p8cF8Rl9BuxpY0 z1@smJLvntuK5iAulOAx|x-M!3P*@@~8^KQj3Z+^Ye^6QWH~B zi}aFn5{rvl!y?N?Tt)tA&0J#b+n#!ep?LwXBZrCsQ z)x7)qe?MtA?41$3L4L344(344S}v`N+Kc1AlzT}8C@c(@XkN6_`=CJIX^Clt+na=U zxLdfV+|hOpH|Uztv*X3imX;PnR!<48YY8!q48n^%PtKT<*mZJR#wDY7lM}TI9%$`g zm6QxNT9!ITWOBO79etx}hhxoL+a4-%@_Sdf99zsa>%)vDHygdjoEPU$`naTLd5Vqh zV@b*LT=$EG=1u>=)tYJMP1N(Xezq?F>l+}>H3#u83q;RT|VQt*wgqvZe)T+!u)ZilS3?j4Qv%Db>hU8BP+cZX+hqvn)ZUEe?KbEtQCnW=gB ziIn+czQeEjCfm4u~F=D8g%&95i_G@RsqH2p`+gn6Q8#kKYwk!%y?yglnm7q?0FqFuWlXXSbZ zH67ooF+WS~Ui`ys(fbdggOVF=^Q~OPE3EDH$y)UOV|LNIFBB8|BlKD$W-33=2y-gF zvtw#ur}KR8%o|GAEVme4(LHr{{+6|wfzG1OT~$|AUFtjVSEC@jKvpDGW!=9=4H}sj zR|-vBSyQ)rQq!}@i+_%6Fc!J=YjWFSRgSg3ulvl7`Q`CAa$aCuo=kqTt`X`2*wh@#J(`Bm4)jlS>JSV7b{iJ!`b0#f1mE`GR$iCHRbNYHNlfhF^`3K7JEnDV@dKlpdG|vob;kJ4-&!JIOI6HN4=m zi~RD*XEwa8FVPB_q^7fc#k|X2-vbPbej2L1*wv=W&a!*g(S?61&sU~O^|xpC2Yo6r zy}iyjgM)M0l@}JWx$4HRM4s^Ls0Qpbid}a4_z}5jmv_A_F#4}-@>2JxrR%mdkNRD# zFK&50KkaT_v48FH3dz<#ndbsmoVt7K%JHCShc|ZG<@|n`{Q7W}$zukIJk`}qTT|{o z+xYr~-HVOp6KZ!Kw{wY)R(n^Ub^FBTt}3_Mt9_OmiUsydZCTvBz~sz72ho&Q?dKOK z$xU@G{_u14rWNzrUEUXonMP_v>U`!|ZSrRQ*`!J_?LXQlPbf#sF!&exrHrwzK2~h? z;m;gAXOqtcB#UJ~-;l?5(BtXBWjfdRO@Hetz3Z&xZRPyswb3th(}MH+6}x-W#r~by ze=+O2S$O5L81-cxA%CMX<2JlvGJCt4FC_lJvzx7#tyw>^Ves1wXjyrxcmQAwxvaPux`}2XRXN4pu88ltWf4*W_uFi>V7v>9J zboY3tyTl}_y|ZCQQ_@o>7Ulx(Uu&|8@O`2LNmkV6+$Y`H@$BM%ueJ$dD! zm(a)+8CcX-Y~7*A*zuWt7Z`_?;lMQhzDuWaCrzHG#nSJ!^&$-)X@cm}71JrYY0FaK~Kqg2BydMM8h`nZmX 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");