From 523f13485fd6414b92aa8d16b27d2862b4baf2d2 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 20 Feb 2017 21:36:25 -0500 Subject: [PATCH] trying to resolve end lines issue --- java_tools/version2header.jar | Bin 3694 -> 3778 bytes .../src/com/rusefi/Version2Header.java | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java_tools/version2header.jar b/java_tools/version2header.jar index f242f05b6b8f28c98149ada686399cd8ecb0bd29..3342bc953b9a060684efaeacab92c16a525684e5 100644 GIT binary patch literal 3778 zcmeH~c{J2}AIE=WFm|$zD0{{dL!xlw8S4yY#ujEU*`|bHY$+77+%O3@%917S)mUzk zLAW!dF4whXN%mWo>?CVEJg%PZIrZQ3-{bo`-*dj-bKdXI_w)Jv^FA*W;s_HP0I&jp z7sbjH_-cUxCcw9ne-0;+PGXS9ema+m@cBSHuD?`_J<>cMXzq`Lk&GgJo3=J%; zl+6sy5>(mgDm;d(ky|mM0mg*<$Ux7h{_@@>eg(E1C0{`jutGRZ^0st2uuT$Swu>Y;_3n00tGKfjw$jQSIz!qq z3Z0az_3)Wtv)UTL4lQS_hGtLbOmNiWYPZ;L;HZ>`;zrH9`s64_&?8OBzr;IMO*D(n z(|J{^Y}G%rCF0N1Lt%*u)Z>vbah_Ubys`cTJtpi;ZZt?BHqQM*w1f+s25vM^gF-B$ zWu$UO^!nJWG-23LU3nK|6O~B9(4$^WNr-SOP({eb!B%t^n7C~jr^U&>ALZP%t<7t) z1(PjdSxJkO_z73-Q-6W**U(J}w)J2;x&ns`PLJ7%2tVF+#CI?r6oP%L;*!9DK?Het zSlTKyED5&wV+Z{=KL+1bqfC0TulV~1aRzGK;;OhMobu^eLC>>xXP+(xky2R7tSYi$ zumxrRw1Q0Qx@bUn;9+$J8C`Mu2zvv#Z%N#iJA3l=(b^4E1|nEVX?PlLM;GPKpLI=> z!$$fgEy(_Bo$5usUe7C3;(0cT<*J2dRw5-A+{!nES=1Q9UkLJgKAz7@CO*h07Y(>S z>g}s8Fh8a<_EWShPD-56jZ>x+T4&Jg!1IsSfC*t}Ll5CM^RwEQnKr1iD8qAatFk^- z7R*X>cX_K7aB8{~xTm3~sZre4*Q3btv<$Nsa%(B&#ztzC^CTGLy#_hzNf?yGF6J&d zh3Ui|Z>1zDLvDLRzG&TrLoG zTOIhWIn@S+>tal=qR9^HWHH-2LyidLiN**hWH zoIjz|)*k;3hqD*=%XUU@Hy2fjsOCZoK(__-$zog;2w`*9cKDCIxN= z4A60g7%zoC#0m+P^=TD8$;0uhy0=NkMw_ zjH=@#`KpG>(rVV}ro84ii^0uNjzCB_U;0vq=#b|$-Vv@zO74oPoeFxeK^*Y=*~xJ1 z?rX4j%{$NKowJDvea6|;kPXZ=luXI#grc&Tkmwo$HX>Dh*g?g~V!4KWe3Kw|)Cqjq z;T1+tCvT|63o;|wXrX1_VTiJK7aF;R4E@Y+>W=RJfs@?!K>v-RG^9m7rSM^XSv&|l z;$WU9LRlzA;;o5-0-v8Qtn?O?g+M$DM&}g=9q!Tlx0%}n;B3cAq+(LVFT?80Q=gcU zeL~q%J;uY@;)^iU5}HGqTV$Uk-y$x1*mf$D##z&{<)%jU^_%l&u$ST()!5K@Pg{qV zGhzdLC6h_vuN`T+lEg0Q59bQYv{(l8)2g+vLb`c~IA&^*UT&PUY-(qzkjZ?)T5@W8 zxKeJZj4C4Sr#a6zfgQ=)o4*XQtV6ks$0{>FC-8#BdUtNMvdA1eR#2~1bX#$hhoRG2 z@~DcD8}xV4$SD%79c*yD5hjyApM1~ow{^QKk0P#2uXdZ~c|+btR%o3)7yBnaqt;mE zJ0Wi+=t}OLOvG$$0@7OlBMu?qT^}fMYcO3(vkl%fx@EUgXaN;N4U4H!m-!e)RJIuo zvf?lT4kO?&0uCeKFarJ$BY=UC|H$`QX&*6ofLXo0(-$1tC#M7Jx7lgm3IO>x6~4B9 zMN%llL4|Mg%zlNv$KUK8_vz;Qjy=BFUwe+t-Q%9)3+)^jza4f5*8H2&4F52Gi+=vw W_y43Ah1y$=qSqHJ;ajYT28V67U*38(@ zz?!H;FeJpH_?lG&4L9|6TVl0dyCQOZitQYtGm10kL^)L9DL%6d^|0`T?eX?w3XxG1 zls`?|LTIPI*jP6o)Q;=dUSji8KdFnUftd&)))@oW z9|^{0z-NvI-KLkM6@)PK0?86~l|Azu`_%%#R{ij2KgP+b*2U9Z`RfS2KM~%(6!PD$ z9RRsMo>AjO0VWd!02-`gll~lNL-wXz^YlO)kx5s`-byZRBnlfMpaPrrKuyR@I`XveE{B&rl91so5)^iJ(Ds7zK#f6kl~xtG z$X>J+nkkxEE;1Tf8MAEw*hk8=h%%u(!l#Ojp;tvlsc;?vqW}vgp4abJ5@fEd}f7lr|g(hc2UnaRPZh80fsedyAFeDBvP$`wLs*NAQwwxKogY$gXExDZP zMCCCPH6E$ph51O@5lDIT9oq+4%iX;kTSn0)0odmIKle1~o5GFWnZ^`c4);!2LF3;) zcCXnfPY^0wsGX-Hmi6vaZHe{K1LD`qz&$jSm6t~%xuE+8=(68A>s77s6F5y*rm9uW z(XltU?fmHKn`X@;h|X#Dmf;nslngcPRb(cQHRdJNAU611TV22dZ07>8{(-=~E1h&w z#4tLFv-*~H^SZ<0@D45|t+OUce4xES)wy^I9|Us^Ivr_F3_`Sa-HapoHdir!3QCeA zRG#;DC=E{H{#T9Iq%c7u`Fz{VJ6zkDXT(*}XL3JUdYmPmalaR8$(;D%o!CU-tf4^P z(!DotqgQnB$uzX-va1b_GFp@D6?K7O5;a8Ne9wji-=Lk>Qn_xQm}`!>Bht6AnRh%i z15!g?G>^7{Z0p^@RwADeqxz^Rugfg4J7MBV=tbU$%23OeZXs&FobNdk@5GT;IW=nN zJfz^rSel|!MDCP)ccImf&I*MV;$il&ROk#3a(G;~zWkbw4m`>&$8iLgZ{J!}pPb<( zb5e5m^x!LI$!dI-*FRuH$;9X?V#2coloUO;6mj#stUaj$LsXuN8?lKwYnGrWkn*H@ z@O1F~42HPIo0_0Zp{}142eaCx<+mgLY0%xV=98{~S}d`je2uh5W+uK>T#;gYXnRqX zY#!`B=KURojUEP`+coBc8;pi2lEsmTi!hg3rpEExvd_m1PF@u8#1hzoGdqzj8#h#( zX4#>{hXY|1#+ydtl+_&B*{xd9Z}gwtpwa4kvwC?aNF!B?^`2?@0qRTo&Up2bB`tY= z|1|_z!ywDl3j+syp89nU`JrVxaZTYqAV-&C-!vuj=*x-)z9W+`M_Hkt$7>$e<(Zjy znT3|ZJE%(Bwb?z6x^wK(DhS zu(HpO@V#D#O*o#AKE)?j7ARqFY)!z>hZrtmZd_B=acY&qNwguSl|*oVAVij;a6B_Y z`PZ&ox1&NjFYJ=8=3IFi?JIoZQBSWdkrPpIaZKm?q9#qEfZ7#EYFoNp$r9WGq;tV@ z?pr4pu?4P-ofL>Nw-p|H-2m40!A`n({Yd{+%Rthu`ES?oVgstlqN#2oa#UqL2ZpPy zy&q4;hB0E9RI{86X-JK-0Y)!nK406J;7{qsiFjl(L$mJ>(vEn@ zn@&3$%ofIls7jR=8OvdXaHTuj;Gn^mL>v6wZ(B!kqGhB&3We{6Fh(^moGBbXgW_aR z%c(6walfPtuM03?J|5}qYDobmjg~x@>1!DUk;ya3Q+TcKvL$M{+bp-45+3#HcLoyHx1OQyDCycdsKX~u!57kO8VgLXD diff --git a/java_tools/version2header/src/com/rusefi/Version2Header.java b/java_tools/version2header/src/com/rusefi/Version2Header.java index be77e725ad..54f01006a9 100644 --- a/java_tools/version2header/src/com/rusefi/Version2Header.java +++ b/java_tools/version2header/src/com/rusefi/Version2Header.java @@ -7,6 +7,8 @@ import java.util.Date; * Andrey Belomutskiy (c) 2014 */ public class Version2Header { + private static final String NL = System.getProperty("line.separator"); + private static final String COMMAND = "svn info"; private static final String VERSION_MARKER = "Last Changed Rev: "; private static final String HEADER_TAG = "VCS_VERSION"; @@ -20,8 +22,6 @@ public class Version2Header { BufferedReader stdout = new BufferedReader(new InputStreamReader(simulatorProcess.getInputStream())); - BufferedReader stderr = - new BufferedReader(new InputStreamReader(simulatorProcess.getErrorStream())); int counter = 0; String line; @@ -52,11 +52,11 @@ public class Version2Header { private static void writeFile(int version) throws IOException { BufferedWriter bw = new BufferedWriter(new FileWriter("svnversion.h")); - bw.write("// This file was generated by Version2Header\r\n"); - bw.write("// " + new Date() + "\r\n"); - bw.write("#ifndef " + HEADER_TAG + "\r\n"); - bw.write("#define " + HEADER_TAG + " \"" + version + "\"\r\n"); - bw.write("#endif\r\n"); + bw.write("// This file was generated by Version2Header" + NL); + bw.write("// " + new Date() + NL); + bw.write("#ifndef " + HEADER_TAG + NL); + bw.write("#define " + HEADER_TAG + " \"" + version + "\"" + NL); + bw.write("#endif" + NL); bw.close(); } }