From 9194aae4695412ef8c248c959a08e6638dbb28e4 Mon Sep 17 00:00:00 2001 From: Mikkel Gravgaard Date: Fri, 7 Nov 2014 08:23:24 +0100 Subject: [PATCH 1/5] compiles! --- .../com/stanfy/dyci/DyciRecompileAndInjectAction.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Support/AppCode/Dyci/src/com/stanfy/dyci/DyciRecompileAndInjectAction.java b/Support/AppCode/Dyci/src/com/stanfy/dyci/DyciRecompileAndInjectAction.java index 0f7de45..e67e838 100644 --- a/Support/AppCode/Dyci/src/com/stanfy/dyci/DyciRecompileAndInjectAction.java +++ b/Support/AppCode/Dyci/src/com/stanfy/dyci/DyciRecompileAndInjectAction.java @@ -54,22 +54,23 @@ public void actionPerformed(final AnActionEvent actionEvent) { } - private String xcodePath(java.io.FileReader fileReader){ + private String xcodePath(final AnActionEvent actionEvent,java.io.FileReader fileReader){ String xpathExpression = "/application/component[@name='XcodeSettings']/option[@name='selectedXcode']/@value"; + String result = null; XPathFactory xpathFactory = XPathFactory.newInstance(); XPath xpath = xpathFactory.newXPath(); try{ XPathExpression expr = xpath.compile(xpathExpression); InputSource inputSource = new InputSource(fileReader); - String result = expr.evaluate(inputSource); - return result; + result = expr.evaluate(inputSource); } catch(Exception e){ LOG.error("Exception getting Xcode path: " + e.getMessage()); this.showMessageBubble(actionEvent, MessageType.ERROR, "Failed to run injection script"); } + return result; } private void injectFile(final AnActionEvent actionEvent, final String path) { @@ -97,7 +98,7 @@ private void injectFile(final AnActionEvent actionEvent, final String path) { String[] commands; try { FileReader appcodeOptions = new FileReader(appcodeOptionsFilename); - String xcodePath = xcodePath(appcodeOptions); + String xcodePath = xcodePath(actionEvent, appcodeOptions); commands = new String[] {dyciScriptLocation, path, xcodePath}; } catch(IOException e) { // If the file cannot be found, it might not be a problem (user has appcode 2 or maybe the setting wasn't saved) From 9746ed2d009048c0be05575e568a7111dd65bf94 Mon Sep 17 00:00:00 2001 From: Mikkel Gravgaard Date: Mon, 10 Nov 2014 09:55:51 +0100 Subject: [PATCH 2/5] updated IntelliJ project settings --- Support/AppCode/Dyci/Dyci.iml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Support/AppCode/Dyci/Dyci.iml b/Support/AppCode/Dyci/Dyci.iml index b2f3591..c3f96cb 100644 --- a/Support/AppCode/Dyci/Dyci.iml +++ b/Support/AppCode/Dyci/Dyci.iml @@ -6,8 +6,21 @@ - + + + + + + + + + + + + + + From f3e014ef5e926d0a4fc1065dde7974c4f6ca0bbd Mon Sep 17 00:00:00 2001 From: Mikkel Gravgaard Date: Mon, 10 Nov 2014 09:56:27 +0100 Subject: [PATCH 3/5] updated plugin changelog --- Support/AppCode/Dyci/META-INF/plugin.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Support/AppCode/Dyci/META-INF/plugin.xml b/Support/AppCode/Dyci/META-INF/plugin.xml index 3c84f87..43498cb 100644 --- a/Support/AppCode/Dyci/META-INF/plugin.xml +++ b/Support/AppCode/Dyci/META-INF/plugin.xml @@ -1,7 +1,7 @@ com.stanfy.dyci DYCI - Dynamic code injection Tool - 1.1 + 1.2 YourCompany @@ -15,6 +15,9 @@ From 928cffeb28ef8565fd25e5803c58d3a882d06644 Mon Sep 17 00:00:00 2001 From: Mikkel Gravgaard Date: Mon, 10 Nov 2014 10:13:59 +0100 Subject: [PATCH 4/5] removed weird dependency --- Support/AppCode/Dyci/Dyci.iml | 1 - 1 file changed, 1 deletion(-) diff --git a/Support/AppCode/Dyci/Dyci.iml b/Support/AppCode/Dyci/Dyci.iml index c3f96cb..17858cf 100644 --- a/Support/AppCode/Dyci/Dyci.iml +++ b/Support/AppCode/Dyci/Dyci.iml @@ -18,7 +18,6 @@ - From 66cff3eaa0564b32e49bf31b5262156310ceb41d Mon Sep 17 00:00:00 2001 From: Paul Taykalo Date: Mon, 10 Nov 2014 22:32:46 +0200 Subject: [PATCH 5/5] correct compilation flags and 1.6 byte code generation --- Support/AppCode/Dyci/Dyci.iml | 14 +------------- Support/AppCode/Dyci/Dyci.jar | Bin 4179 -> 4945 bytes 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Support/AppCode/Dyci/Dyci.iml b/Support/AppCode/Dyci/Dyci.iml index 17858cf..7f56c56 100644 --- a/Support/AppCode/Dyci/Dyci.iml +++ b/Support/AppCode/Dyci/Dyci.iml @@ -6,20 +6,8 @@ - + - - - - - - - - - - - - diff --git a/Support/AppCode/Dyci/Dyci.jar b/Support/AppCode/Dyci/Dyci.jar index 5a1da92ecb83f67ae8687ed96f6f65d3a41fd521..bde954828833461f35b1fee2cf8e4342b78086ff 100644 GIT binary patch delta 4363 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 delta 3591 zcmYk9Wmpr8*T(65m;*+aG>q;L1VM7NwB(3MJ4#|OI+PsUASFGJl9rl)G)#K5NGXT{ zg8Dwbet7=peE8kh`Eb77*LB~seDik!Mi4?G5FXjTd(XgFJsl84M5p#IpR@mEJ?~#G zg8!cxg!t-6OL7FO8Po56*No+3gE>^|0R5AWnQR{YmdedL>#dnQ`cGCW$aS>ItLN8s zBu`G?D@qkeM{(H&IcN|Q_h^g|&eH3cfGr<9pcd=7(<5fu;}iJ|D_#!*!MnCJWm>k`qFcci8IL_rI@2H6vQ8LkULpHX22$ZBc&a!8eUUYIg45l zo1GYk57~Ay=URfCpgd5Gw=pYKjuf7O=+}7rSpC)L>iC$SAF$(HYDfGRz#3SqgBTu4 z_IbD))bqFxSH9UxvB5BSa~26S-$?D%gXB`NzQ-FUK(H;`gI()PwL!L@>q( z(InEdw5VxFtC&ELWogCh8?MOwshF%3rmDJXlhKXbtXX{#r(sl_tfzH~2M@Fe`vvVS zN1o{=t2fjeQ7F?!NDyf*R6{9zBCQu@A=``8>bPlB7MwB-uqGFgDP4}cozf>+qaLDu zaxtvX=n6>2pmxZ)+mlo6ie58uSIQNP0sNYZpBB(II_818OuuR>cPTqByD1AkwWH1o z8|;H)7U!E?=e3@&Eb4dY)Use*`G}?z9RK0sX=$Hy?B=Ahwr6zof0szb*j}(`f=WSp zMkej2Xg3`%YPMPGO2s>cHG1U^+0-5QwGH=)itGd@x(Na$l}NADRt(p$vCtj|7f&Hh zBV~`ac&V-(qZg$+b0>MiKYeQr9W0x(k7v@nkH+k5At75ire5t{%LG}H5jv9wfiT-t zkrq{V2v++V;b<$lCrF&3I@3ZoAB9xxTK&#{p(nbrmvhnf&91k%yDnKYgM2Orotz}} zNY{j{u;=OArP-b|bm|P^`K)oI*J@s7&R0;osmhHYtELZ8hOz9Ze`@|BN(+QAev6J0 z3)VnH#0ow|NkNkXW`kGI8>sai-mAWk)U{FnSaD}ZpK?qeXlyeXOsA36KSqL35vZM) z1xyd*j#{52?OVmZ!OVejxly94h1z?EDhn`|lbF-)ut`6r;0HKw7(nV`ooBsfG0Mab{=A2>Z=UF2VY3(yKC6Y3#u_Aq+$r z<6%b?xN$oAzVkW9792kykY0Db#0burpVv8O+?QQrv#m+RU%QP7vUzK0dTWaM^^Xd} zlI;@K)_h^;T@8@UDNHlIzCO=0DbVfaNf;J;RDPPUuZd|mUM>$oE?{{GqKkB86uIBK z(De_95ob@znU6Gm@c>(O-db(V?}1r}gZ)KLnwq6eZ%O*I+V2Z;^glWay}l;>bW{CB ziw=px7tR7CQWVm&&9m0#r>(;T3Ure{dM;#eMlNpDO5ayeh|dHq5;MmSjDLb>s^HX% ze{WxWDXHW`zNIBV)~(36rzdq`Z9eYHgKo{L#&D*$Y^ih*<93rVUY1vgx+~IOHJkRR zGaUF=^l$K0$@A*7q~|cWo}(@qXSTr0hjjSHwF#1DnJ?0~25XHpVpV@8dM0Lafr$_4 zaUMia{-xZdO?v4`1-~~9>JIZ~>7ge1LLH}G`E@4?n6U~Z!2jaA{oGn`K&Tdf_idcU z#U$%%PsgDyp?;!v(WO)H}7Cou!JntWv<7xsD64tu~Sk<~lnN0Ive2pl(a7mG^m8&+n zrh|F6g@z-~DkYMb)&nuYxiy05NswfN-h|Pe;z4Hm5eYvEvaW2Ek%oSt&}D0-X-#md zQ)Nrz>CLmB+f!9a8;tvD8YdS&u z>^b0GRsClVPFaHw-khXYRAWIlX;|}V;k^_~UvnfhG`?ObFs-RV3F|TK;%9fbY+Z*~^rnF1#%U8(L~QUoC4T|9}SMHA^n*d1^sY5go5*L<+{bn{$aZ zlgQB+N*-Zc3>8)=m@alepc!sl)p*j(I)sBpOR2XFIcGk8 zl)rP}squXOJM$2?DST&}RX%yev_9dZADa3dW#WM9Bv<`CV-e@a?)kRBVz-f&pe+sn zn&dH>4sW$giQLb0T;ekk!h6Re$%hkm#K#HnMH6`;vV$|K%Zm&b`3E$XPVoaAkXk9% zu0&THmi=46Y`xN50Rr1^siiF`xJomZ3?l&6@NQ?FxB3vzIB!T|d>;ix$q`VKD*Gip z^@1ZWGn$!2A+(XdZAxoOC#$^ZpkhtjK%F7bczW^SC(Sz&V*4S$ZMS;UnF+cL1q4-& zl6tRDO{+xg4AG$3AqX7E_F!)l$&)Rs=U}y{gU~Alv&%;vzSVZ1nb@g}M{{YJ1W4v^ zSJKLl@D~i!oD2DeZj5HljS3dhiwX5|RNu*dNDvks`J=CsM(~9ItvoloQj}S=7CJl7&*zxVF5>1GYe1@Ntbc@`4ZtB5a9vos`EeuU)6&7yVWITS4U+jbTocfE+|K8&EgBh$=Zc+8%}bGXK^~f z+et~-$&j-xKoX4XMO|W$bwN6-(fsMaiLw`yOIkYIFPY*xDMClcOzh6r##@;&>JJ$m zpsWMyOZu6<&<)KB2sPKaerHn4&~Sg`xmdOL<&NU`!2{y6sj7;)v5AGT>bqLu6yxc7 zJ-j_OHi-c}I&jEIm z6psVjM9Vi`7KTHM@2J=|>jyuB?{Yy56qvuQnT^zP429Q%oJ-Fq5A;%*$;_N4K%$+b zLVyr9SQU2z*EmF3q_NCTXKcAV$Vh-e^Vc0C2q{?%uN_o^0uK*PkB9eP43+pdhGzH! zc#$}td2wJk&K~|yDMA-TN6uL$`?57uAWA|%BA1VS?P@MWKG50T{0Gj@ps=w>k(1{~ z+UUp6eK%ow0*PE+{@vyzr?bH>lhVOOAQ&Dk?~6HX9=~I)E#I@s{9R#63(W;fVefs2 zwqx^72Dq%1=0V;);Y6#=y0#G1vw>3TG2{!lZ1L_;S-<$4;()b)vOZ!}8asPaTn9I)}4vads-Qn4levA}a zX|2;+RuVLr;D2+V{QLSf#3~$Ql9tKhh|Oh&92k;b_ZliZ{Z+o3;UG>Gsrnuf=zNeX zmrz_OD9s!Tqk5PC$ibR+X*_}k#<%*aF_kb?*nn|QnkRBzyjb4e4*gYTW}PCs8WQX6 z&-PB))aF-o!d-o*8@R`)0e(~NJzFI4iJRnoWI^&Yj^`Q)|5SVQ%lN~+3UghdmE`uq z+u1pwd&B*d#@4&vTi9(CgjP`qJx(-?rJG7wb+92_wYF9*KCU!zhLbgsO0M#=rtY`l zXI7Jp$@k|A6OFL!zSvmae9bzOn9Pc@`3A?8umFYqyiDLI9w6;YL=4qENlWB(36wJD z*!^Iw-!kzPzepkU)AoVuE0yEa($19Bc1ZgsMusG;67K4(V)5F5Gtz|e^KWCfSC1~a zZ}sP$Q;A71v&y4v7u)!2(c+S)M7ZgWhEh*kixV(#LkRyZe~`p+x_3+Vjj~#g*5+{1 z>%?0ZljDwN>jB5N$><(=N{-y0q%~KBf4q=>^J#XU01vO2