From 364cb30db017333ab61b976ac3d74acc1e723ece Mon Sep 17 00:00:00 2001 From: bancika Date: Wed, 2 Dec 2020 17:27:49 +0100 Subject: [PATCH] windows - include JRE with the installation --- .../src/org/diylc/presenter/update.xml | 4 +++ diylc/diylc-library/lib/diylc-core.jar | Bin 338132 -> 338210 bytes diylc/diylc-swing/diylc.exe | Bin 82432 -> 84992 bytes diylc/diylc-swing/install.iss | 2 +- diylc/diylc-swing/launch4j.xml | 34 ++++++++++++++++++ diylc/diylc-swing/lib/diylc-core.jar | Bin 338132 -> 338210 bytes diylc/diylc-swing/library/main.jar | Bin 718491 -> 718491 bytes .../src/org/diylc/DIYLCStarter.java | 14 +++++++- 8 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 diylc/diylc-swing/launch4j.xml diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index 3b1a8dab..7f79307d 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -3250,6 +3250,10 @@ 2020-11-19 00:00:00.000 CET + + NEW_FEATURE + Windows: bundle Java JRE with the installation to avoid Java version issues + NEW_FEATURE macOS: added quick action toolbar that was already available for other platforms diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 39a1b73208924186026903db2474e988c1ee45ce..e67474b46cfd5bdb8f4ce4d882d9a9a4fd95befd 100644 GIT binary patch delta 6814 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 delta 6767 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 aWr!#x=`Y5~B{6a97OK5jd79W-hW`b!S9h}j diff --git a/diylc/diylc-swing/diylc.exe b/diylc/diylc-swing/diylc.exe index bf62f3006fa7e5f20d4b55e9fd3c8be6433b4de6..a05ea6b21479ab269b70b1125ea243083fb20688 100644 GIT binary patch delta 22030 zcmdUXdw5jUx%ZwhK){5Fnqbf;LenMe`{hl_eFg2x8%C@R=JO?r&NiBT!}e!sQWB%w#2@BH)q z@$o!6Ywxw*^{)56-gO!Lb^ZMt``53#=FR60KA@?8r!-f;OB@M9wK=Hx22cGnFOE%| z|8s|ypyl*`=9Fjfj=`vPJG9(SLYF#b_P@-bt#dqc?UlwDy=0Y+rc<-@XW{4=U*xu4(<*wRj;T;2x=uY`N;+W8wD z&pO8^IPVTkbS_EQG9&bB=a}oOW@uWV(^a>!ySv-|^iEBSmE-N8({l;>c@LYjJWhMo zjL?_PF&P;Ejg9PWZNOlfSpa~98KKGjuQyHrptjv<&j*@=d0nI-tod`aVE#FPrC7-+ zi*qzH*W)x7dJ=&-3Bx$iZbznT+SY8m1)B9m+uVS%(tdZ@9a`Y1D_{Xj?Kh`%w*X*o z>uR=HGqcSkkG&FIC2+0rO|yQLbv5yjDl1ul{b-(<>aphm%$`QrtBKxBw;#^~-qRiS zHLN5xiB=kk1#Ql)q{?)9>H$L!$?Jysv?_+V&*2o8vro24DltzMIIM_ptXUMMzPiFUPP~PY*pYaMD$UDWvuA z1WlXrI;vfDrc=|V>sQ&GgF~$Yha0wY2vpk*Sq}qXRIADnOxr7H6wxU|SW&vjl;) z?b#SKFc-vFf|fwHKF&%eK=jnG94%ao!HA$ykedrEx&dLraE1X>ZF>s&c?*hCGHl2| zS7FmzZYEJgp??QSoe!jlb^BUKZ_aty8 zf)J-2F+?i{_8qpS2$6Q{nOiw7G&0;utLNKMJq`ROHl|Y$Iw*z>H^Uh1lefWDM6YIj zh?OR~!AsIWO}wisFa=+>cK{&S9_##jk4M{=BtiaUIv12f{gGUbKrgQbdNc%XL__Ra z{5kJ!4(@8jO9bdN^Q*Hjl^z_37mx#K0lQ{Dj#vt+N6uJ>_u31!Fag(-pP*B8 zGCQVei*vNHDg0}r$v|hI(Y&3eta}WhMj2ydVVs&X(A9xrAvv z0&sgEz}mKYk4F4x4DPZiTXZ)U(*IyC9e1FQgcpHtd?FR@%Z96DcpCc?BUaUEpj&|8T+`nw}(V*D5@JcwZvtnn(vJ zpkICpXjo;=);p;-5BB}Fv%_2_0L(^YEiVnHW@ zSKz-;t7axeVT6k2cvjjgpoj5h7-Rtg*G^$mKbWjOS~?hKKoMgZM{k@eprmkyX|_jv zI}h(m>6sYLT50K_rsOLGbtJgA_fCvqr3v!d6EWS_Ed|?FGX0%FHXmPcXK`A2!ZUv> z$+BZGgSbjIi#n&sPU<Q zFq(Ft|3-Xjky%B)is;hi;~q4V>roLN1j)f9($?d{dvx0o$cn0HMJWkQeh;tPKER*D z=8+b&Gj0Ls6e=Dv-2F!ca45{mPa;3GLfYz2Fxya#4Y!514Y|&!r^97*3nLJ+{%^?LFDp4XcNhCkj8F z?6EH)9dL(;XprXpEFJf+w`m4!GZBeL^jD-~AuJ4ooShHX@i^nC>+7^u*GGx#>yE z48c5&|A*+bjj_sX@iqre>Qx{t@*7ZvVbM;y3ItucA*c9TGHE&|^{F7B@pS+;y+Izx zIGDAE16T=9ACBHueqzI01c0wwvzbkiU?b7~3bGT{9xOTcllvbiY{A4HJxNH2!;Ybq zVWN}K`)bnH_7nj=jsqN001P@Y{-IIEO~E|FNC4Yw1Gw!2Nie&}Irf!28TP}XGEu~? zq4q=g0m3Nmt-MVX6pPB!@xZ1$@QHDaF7k zgOFTTPhw?CGHBGN^-(W|vRYv{G{;D-QTC!(UD> z3PSLC5&%|y7X$lvV1vcQe#JT2>4~sY^g1aX!K7hd!0I8U$J-&khOzN>vhxv}e@Ww? z-PMr87Su9v0l)S>HZCTk|1bsK1EpgXNDsAqiB@4!;IN+DqdT!ydHtOzL}6%+T%^m_nHaYwlGDd4cT5`Ina;70s=`nXzuBBU9hCf+sqyeFwt2Q1l*J3 zH;so7Zh{b~N-;Bpne^gINEid$2WWd8z}h0ThK40^F*-ely%zO?qS!+eq*_Ft=cKjB zEIfy>6)Zetu0e`!eq{Q(A|hY<@a#*}LsKa+LC;S?LFYx2Re0{~i>~#}maofNbKY!s z?QZ5=0(|$@wvY2R6W^Lv0ebeO;B2E+gbkp$8z_Q#t>oydA42f^$1xQ4OlskWI20zE zM)2l`dPgB4r&>4-yn_xCTJ>tYN7n$30opHoXs2vhgqEhK*^A433n*^lJcwpgL|GABs=fJ_Mw(-NpPX^7)I_6S%vqBkJ#49-r0W%=6a zvep{rkTR@bIYK>Hc^#D7*H9$_jOFXVjIn;NYxmdY8k-rgJwEh8+AyPcB*(=gZ5JIe zlKw<&A*?`5{pn_57iH`_k4bJeLXbY4yp18VFg^R=t%6zeK==VxK^68+R0TTCeR>kS z;Y)qMgbs7xBO|cH9Ah4_e3Q;+wOWN;W_w`^3YdZq_EFfv`O5q>) zC2;KXTQn`Sbzqu7rTY>O3_!ra0Is?x7=!aVC{83fW`4VWqUNeAN3Auxo$-7hUsd&P zyu(x*1pSbi-37E!L3#`MvGUp}!%t8fI0+VpfQ1u!;)GUn-^v8@1VW)v=YsVBb=I3^ zzHQ~%py3ybiMHf4zN~z^wt4u}+EX2N#m$;_-h4M$;2B=~X@|FYZ!E$5sB>QeyrxS> z<^lh#ZBFRi=g|8dAV!zvtRuxJ%M9xs-$&^&%o)*bqI!Ve6sISTvMYLEBJI-d3Bgg@5|1&X`u2NaHM zIi~T?BE$mu`)FvpA)c1huIWfHkY~}jp1vPe5?h8psO_ge=6d=wAnwlVunOC)HIPkG zaN#5eG(wSfLmJ3<9Lo+(%4>H$N%Mygt&-DRAKb>!zNVwLJHdDk)HFcCn*9!XNUq3Z zv---`WZ)ZvF1VfBgRSk4 z6gd*q$*3~(?AT{mOsOc1jRtsP6B;zR`M6q6uZX7mA4W7iJ{C-roQ_=swDqB!p+gfs z8yi|Qbhwd^E;2oqxz|>a>J)Oe7!CE>|ALPG)#=>@`T%g4Uch(}=>kd-U#>v!+Wo0a zzX`nRJAkA8s{u?0{3}`|u-NBAfIhR=#hiTRV#FP5S`3c26s#ijPHnmh zL@w3sTg0j;hghAhn9VNGB7%4(ifA2$4k&|pVGzdf(FSlvt`??dG_LsM_;YfKG-82N zqP^rF@iqtv!mEw87ki^fz7R?Ka@Z8OZ{QjNk_qnNP7^0W4D0JcdQXAC49;Yu9o2{> z!Qg&wJ77-`St_Ui2LIYmG$2^}rU=u_7fA9Kf-*+VE5&w(VNT(K%!DJHi%)?FahneT zom|8;3mvExSB)GpCAgs(01-jqLWKAY93IpMSsmQ`1{)_)6$N5kZX%0~x}S>SvD@Su zfz7E-*KT9e4IFCSrW?rQ)VhP3KfFO;sHo^e+!ag zQ&1_4N-Xczw*L+@AXiv{Ro?(w=Fw|Er98m-4VcprG9i*^t^p!pKX;KYf%m6)8*h8mb-;1XcbeuwV6bd7;6KC zG0l_}sUABF9n`kFF=U{IQx0a~aULO-A>;?XQwkz4@+>-1;LzVOzOc(bqrHdHZ$LKq zkya?sOz#5RWKZN&KXAyz=4rrVxOHwQ-amzmYp%dI^b-i^6y?B(QzoH)!3JzNHwQQD zz`mFnr~>)Yy$twI+&DLl#;`ir+f1v$3Ivl}Fi=mXb3G~2e55^qCZ5pH%j_4yp;Ua4 zU_gf7tLarBur7$9+mhwZiuz0aMixs$Gek;!BSwxD15(X}Oqo|mlN9Zju)Uq_n>T`- zz80Vy^W#z2k)d*f8=eA0FtCnf2l*a%M6RIVt3sWMYiolc*nm_TAt;>e{{O z1`Y(bq`-t*27^L&u){e-Eo5kIhKjJt=m8HxkQXC?iySxB9u{3` z(=!0k+5bPlpu_h}+aW5d@fr{!EebY4R1nQN@NBo=KtJmfvw0?we@HA;f@=;TbAtl_ zmClJ6hF?|*S<@TAv-HOML#``tG{&;J6S=rp&2E*8StP!FRc+4lacbl=1gkZW zl8bHFH?n$SneJ5zjpl;X-ianDLVJ%^13jY*bw%au%Y+&3PZ1+>?JR9ciK3UAw=gMi zDm*KFOi9pC%6J*AvE#CdQs`CFde!foY`jQ%u@k6NDL4isktoKiGIE=(J>M**H%%tli^n&bu~9NWGOEp1dTt9u9d7N#HQ^ewWkrVVmG6DtW2 z1Yw9h1h_)fg~6pOV4_y8@H(*AkK-UA_OE}RBm&OG`rHn@vDuQ{i(7to%{0>IFrc|F>jbvA%p=&pgH_6XJDg!8GVM@7 zS->GJ?!I0u57H;a(_d~hzU>DRu^H_i30L-|8WGeWev8u>vA#+|#Kz9iu3`hzQKyh> z5U3a-!`zz=2A87+aUzlFK{c9?AG_)vhV9mK9t2)F4}Oj&1kVGmy18_~MUIGQ0x!(k z-zCn#VgtD7{o~Ocu@#%XiDpL@57z|x^@M_StUZeXsK`w990-tJE$gefjK_8bpx_2g z2cekYF2M?=fi<@MUKorFf4>1qxT1JU9@#Qw4kj`@2c>DdW| zLDP-y#q4#@g0=0NsDr}P^Og@AJ6jt1MXx^stW(O?eB`Yr_ShyoDt(OQkTl82Y!2JJY`TSObg>_$*_{~3C z`P#~uVYIcD2> zrdq-LFg84kLFd7|a1I%OR>qO?*@uuGhJ!?si)CZ}+ukXNb!$vzW z<5CcLhoaB26W5xv-;QPw6r+c)lD&BoMp&ucgbwkOhu%Xa9QmznpG?;ftK%f}vV3wu z{Oi9k>ghmhh%om6m6?w{FK3Ed!(kpwv`@O-R8~%p$|`vx7^fh6y7)J}q>84kS2&MSxbjc&J|cwnIWE(WMOXZqeaFi_p!fPG&n znp0`LpmK~GRIZ`O#=8-G$P^Vm7u9R`Q|fZ#88+1L9F?d7*Pn;Ox>9LfomK!O8`Q%u z*SXq)W+xV3f{V5%Wqim-#hC?RKPX(=PBs`4gPT{eH_ZitUJGauy&nxLM7?VtO>)A{DT`D8;ogeFQ8_L^z!9 z0X({0nx;q``hkqL=j-DG4#c)G&laJn=x%_?BOzKVNVVTbcJ6I%`%h%e5hvx3+}Ya+ zTg^_uU4%86(>Ak6%CsG=BM#fp0h7nw{St`dTyWV*}dMA_ z_BOBGPim#%BG5EpgIguit7UY;7^lFjJ&;`fDSop8WNX0yNftV}8w9|pUx{jdDmu6; z3_jzrimvl61cB1p0|6MA_C?QyGWTL6M&P$U`|qAzURU71F@S#$(GA z4&VbsZC{&%g*fHO9aZ|qYS_UIpi(v3Phw1ecpKmf^dxcgQ)0jPM7 z{(mJKt~zdCqmJnU68}cRvCFWN*c*ZCtZiZTVTu&q-i!V+3wRB^R3HL9Ns-GzsLcG; z$_FTi`Y`|4jR@zlK>+Vd$fH0MtD$G=NQZ6!ph$-h`CcIS7sTFk4ui?3wtYMfg1EdF z_Z^yh&m@<5Px_~D2T4QhZ^dq~I@~#Lit{}~!$IHKmq5*BppZvI7LmuO%e;mUV? zbM3cI9JdWRw8Nn<0#yQ$ex(7mxHC0vCd`3V2XYaG!d$oN{lj8|6udW#UQ(vV`@D<6 z0L@*GZi%GoZW0Wq9ya~GC)^dLepo;^e)h!GfYIR>;} z`$(E~A^M_DjBi&epePeBB?&YN8GVYjSa$D77bO_A?W^UMM?Ml{Gk<%ZXm%r_Il|Pz zye%R=6v|y11hT%z(hUanhoRi0Z5U{i2h?X@L>&-l2v&_k#SoEe_r7hsSY?0lA$XKL z(X#D#Kj{-J)FwthbdFG54MJv|7oxr0xOZwlk8Xwv<*q;>$lOZwbovhTj$aD!-5PhG z6;|PPj;m6D8?k+4=54VGw_xR7myG^a-j>?^t7QP~j877K=@}7W43vaWjwBwQVQBWh zVdhpN=r5?1K@$Lbf;^J_VEzudxrKK~hQ4b5?LRU6WRJZW{i$u#iy#*Go7C_;=}- zJcQ+n6hz=_2B+O*z`hC_AALzcK0wJgEhPb*c~@ioWxqcZ1k{lLAt`1lGKSEMR}02` z=wSbva4#bvP_YZ43sOZIJRNz0w7!i#*h@{QFke9B#C*?5)ET@TT zZn%KZ#Sw|eOEMrSoSHojGEwsv)}Xu{C59|mQdWV>NL=9}!a1c8E<}U?b>~uL=N=x6 zI624ASuz1kodBEAQZqK56I6SBSF1f-SW3BN#lgvQ%E%xT1R!v;}DE+|5#ld>PW zX?7~`Al|j;_ra$kQ&1&rFAvpl3;0jYfdGl3QhKhIQ5`KX!FXJF9+F6kZspL(BH<1q zm45hg?8(Gd!`gZ_Rj?Mx4?l$)w=$1>1TBsBP; zy%+7@ori)z&Hkn}9?Y2=Ug$piA|)(yQOJJ?U{p$K{|TU|;$CNDi=R1}2-m1(EPe>{ zfRdRj@N2|%fTjRcUS%cq_R|8?*L!*FmjJVZl!0WsY4ppLUJ@Ji zSgI+@CPGo+QnYv#&}iqan(I3TSU5w)c`ES z{zx?G{j*wwRgMEVOT^g0JuJuxZIr$h0~F6Q!TvZej>RAcT*$#7WZ9mH*4i$d5WDI& zYLw$9wBuJR891CIs3D-P5hM8?BS|#fU*lWK2W*M~iECAFt^EPC5}gE$$RH@XxS{_B zatLlJi_mZ9N5!i#mJ*Rv|ebx#MEe9&~ZNH5UO(Qf)L>N=g5F!C&mnQzP zw*yX^YZL<+)lz;KWV{$;JamT;#(lEMQiViJMVF)WuO5%P8%YfXVw{acsK)2aAq>N5 z9|K^VsvqJ#R*DEi?~c3$l}OuzPH3@R27FU!9pWDaSnkg}#&tNXtAYBBBQp9R{S=*$ zlXLXgTquQskqT-2kSb>YW-Q$dsMs`Q1yHxT28rdgoX23^K-?j6qS81Vx6_nxF}gjZ z&xqB4>1%GW0PrecULOJHP_%s#U~z(P$9vmbD#ubk#R#YPK>&{L?4l$%!>%qK33v~4 zzYzivp%ui6Y4&(BAi)OE;Z3uzeUA~!=kia|d_P2P4@4@r7g{~4z@u&eE1!r{awjN3 zH~p}1SzHU~S}85#`t3l5Skxejx{fmpqp{p zfa7JHEo0>gq##PO*{|QS6w=g!h=L?6@L3PdmPBRP-VievY2qe&lUQ8BZ|qI) z!lh(bLrSUHPvIMoC3p{u6((c#BdCPAj*G|TD;v{kE1Wl+o+gpG(P1x${VG8x4oHE*?3F0RHYE0qp*Ua?MzMK3!xD%=8blvO zkI5tlY>1u0U?7vRh7%4HaxI!bC42U678ZyRkR2&V@L|Y3!$NpwuoVfs=6`87aB_I$Ph!6n&3+53gIF ziBn_)NlWHxbs$Bd$XuT?hYc69i?DaXD5Z-v$0T4D>AGSYEH47^gcetAD|m?OqV77# zx{=vBRUdOw^0ah$;|`)TC`UmV$}523;{8yh2|dEH*O3~4xl#5Ea6~EdqMgx~u@M{F zty-GI?lH!qUe>eaQ%F)FFnoifuY=&&+uX}=dK$QgELRrvXsE(of-Vw9+_IVM5%ZG$ z5UNYfO_`KTFeo%isX+}NqouE`)`DIn_4MP z3exPc?*ImTe}Y5ZZOw>M^5-)A$=d6%FMx@)_(?SPY&*thXtwm+CRLCPIlziU?x*Tmv-OTp}Z1V_f!6uAmH=-T^CMu4Scq$ZV1&kH^0Dpy@VAqgyDYsC0sO4Y$A;UB6 z`#u~&Ku0_zi?5jkf=@mY^+FqWLau5P#p>$OJJb%*X)&V}I}gyi@R`O*j8XCYp#sAx zE76YuBsv4FB8L*gF%-@Oi2Mx}lDI#_$q_xxxik=V*8U7fJEN7s^YCL^}JVh0`XGw!(DgezzQ&%u5K=vmtC<`)*T z*e6WDbSl@p27a;8$S)(h#g2@2TFimT%q0Jr~w z3TQx#-xd%Fj5z#16TfSeA7-YC|BON2J-P%L4o#L7p@~!7t|dTVwgmHbkdDIsp|YvF z5(YR!?rGOgzV!{<*TJutc-%G3wfmB`jqzKL`4K-&?M%<*xF0z!NA2E3#}hbJ*VcaR zUm1F0+Q?zqi*vNv@tS@`H+~Am59>$H;2q9w*`elX>C=uBptY-8&k|Y0kY58awVB1dbvR|{8yd$Wr?{LiHwPH@spN3 zTjb7Jd(GLWUAys{j*erWpge8<**tN~9&`}hSbgj>Rv!DSc>h$q+k;y8Www6xm3iz~ zNr$=jE90{XC(HwnT#nNP@6kyh@40<}Be=r@)14u18pdrwl-(oO&zgs(eG0VO74O zN~eO~uf9{{w=wdZs_0VXX;mIkWrr#g6@v5X`#n|as?1bnt}5rLGDnpQRXJIe(?w}? zkIYsT#i|^o%EhW&uF5J^&Qj%gRTikyt;%v$W~kDm%2lcyr^-bv4d`;R;%uHOvsGE8 z%GIhIr^*~v7N~N$Drc!OSCzUdSEjQ8~J%s=TOXxuz{xc*nvS z)3m%*Wx9K5WpT;GK_iPtxvNW_^WW}BzaEM9=+U_RF}k?2LLdD|QJJp3doYYHsjd!9 znlti##)Kk`D?u&<Ro3^5OR#^py zuW|FcSo9Qs*(X#q=eGXt6*bEyhPKYRd_-P#b!GL$L89mUlA20i_0kge$l{5Ew8?Yw zXU)28Fz)-#dEi!%bZ=30MOnqNiGxZjt5+21cNeWJQsZW3x%J9Q_lly5N8MFL)q0J) zsJOVKc+B9?@Oc>%GUv|B(lRS5b$4l{ucA0ho3^}U=|gV(wjKPHU~EMv5l*jMQKH>C zPP=)mHnJv^Jva5v8OtgvtHF$9jXl-->>_>Xa`g`C=KCu2vK1w6oJ!VA9CT+)mcjwO3zN2=2Ug*HwABJ9?n|4(kt*@p8 zG6AKTBWrl_nFYDT=H4)*w5*~yPIzWk=!JP1gYTZ7H+}BxyxbY{L(zFx8`DdQs-TC7 zgXWh!>?^6!LDtA(_w1?en^2A%Im&&|5G{XgOO5PJVA5OY)$LRb?xDE8HXR;#jb~MJsCfXO%V!0ugEywo+YEq?fo? z`0yWlN$Z(WQKJ`Czy^xS(N_GZyJS^ajb1Y*H0MXdjcG*{)FXu9zIB`!r&@`YfGSLDB$kuk_9D2)k~LWLS9p4og4CzLzQu;@_z)QG~Fx8D%>ljZ4B0AP0=d1 z(NpzcU&Ql@^yOMnRaHqv@xn@e+*4HTE)^CqMjNCpDAC<3i=>@R5gsu~yWw`tE&h#= zg(T>X;$k=U#JRhz!?Y-%*+rm4)Zu$BDl~0IMQJ7MZdx4BO_3Crz!GTk%0&UUK!+>% zs@!nv%4+wDlA4;LWhEB@hiZRx`)kz+KXW|0FeyKEm_u{oe_C6g!h~P`t3zD|>dyD6 z8+D~at3%zUOMBraqt1hCvOD_JZ9-jksA%C;#yYfYWGkL9p7_7F@%{mxcGlsDI0X;> zA02Hxo>_Q`@vOqL9?$Rayn*LEJT{*5cv5h4J`>M)Jh^xl;;F*p$Fl{G`Zq=k3(q1v#dxal#Q&}C^Zpdxx8T`{XFs0z@SMieg(oQ;IPqlTnT2N&p5^HdLtBNH zr|@jTvlCAvV{_p>dgzx=di}?Rn2@n6jNI3NDz4yJ=b?-RG(6=0Sl~*n) zDxY1lqO$r?xR&m#$y@c>)F0pK2-V$(g~5G`20W2a<djiT;DA}(bC03`}4wP8_ zXw4{5h<>3{MX4FR2+$pn)5Xe80i-PXp8(7I0^}@7HF_~zDoCh;JCTHSC=*d`L79Xy zjFO}uL5cl;%|?ks7XD9*ew@>3xCiV{MTwg`ew@{6(@}E2WHCx^fUH7!4a$0yB`9~G zEY-AIv}U|4Lq#h}BsE$GN)&x$BUxM5m-4EMD3<^``T!7tMt&fZ@b}ao`kwmM@2R&h zuEzph4bXLQLr;Ao2Is$C5le#7zo$O)d+Nu3XFbNB{+$h)w&;86mw!+Fs_&^^_Z{_M zL37i5$^Socwh5N-1zdwKTs~jw@7GI-C}%mlRW-!6~6lpuo~Ze@%izk zG%UK*;Tx7s{^h?dsOXDeJHF|y@qfR=cVC3B;A?EW5#?!o*Yx>bg#UBmmOkJ0_@-yX z|8?PemiF4qORG;B$V)WunDJw>(KrUr=-kTcWn+rV9xY!wre|E>@)zDYdOUGTXq>I$y|;Jnj33XMCQ^zLG?bSu5kf_ttS#5|s);w< m^dR!4=jPt-xYTtE)&$<{vEzvBW=(s2+3k*hO27gp{C@zks2YI) delta 19491 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 XY)58a-(8cGiN3pDe|5Iw`$_)|RYwN5 diff --git a/diylc/diylc-swing/install.iss b/diylc/diylc-swing/install.iss index fd64bc66..4e73ab1b 100644 --- a/diylc/diylc-swing/install.iss +++ b/diylc/diylc-swing/install.iss @@ -13,7 +13,6 @@ AlwaysShowDirOnReadyPage=yes [Files] Source: "diylc.exe"; DestDir: "{app}" -Source: "diylc.l4j.ini"; DestDir: "{app}" Source: "icons\diylc_file.ico"; DestDir: "{app}" Source: "build\jar\diylc.jar"; DestDir: "{app}" Source: "build\jar\lib\*"; DestDir: "{app}\lib" @@ -21,6 +20,7 @@ Source: "build\jar\library\*"; DestDir: "{app}\library" Source: "themes\*"; DestDir: "{app}\themes" Source: "lang\*"; DestDir: "{app}\lang" Source: "fonts\*"; DestDir: "{app}\fonts" +Source: "jre\win\jre1.8.0_211\*"; DestDir: "{app}\jre"; Flags: ignoreversion recursesubdirs Source: "innosetup\donate.bmp"; DestDir: "{tmp}"; Flags: dontcopy nocompression [Registry] diff --git a/diylc/diylc-swing/launch4j.xml b/diylc/diylc-swing/launch4j.xml new file mode 100644 index 00000000..7f3980f4 --- /dev/null +++ b/diylc/diylc-swing/launch4j.xml @@ -0,0 +1,34 @@ + + + true + gui + diylc.jar + C:\Users\bancika\git\diy-layout-creator\diylc\diylc-swing\diylc.exe + + + . + normal + http://java.com/download + + false + false + + C:\Users\bancika\git\diy-layout-creator\diylc\diylc-swing\icons\diylc.ico + + org.diylc.DIYLCStarter + lib + + + jre + false + false + 1.8.0 + + preferJre + 32/64 + 512 + 1024 + -Dorg.diylc.scriptRun=true + -Dfile.encoding=UTF-8 + + \ No newline at end of file diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 39a1b73208924186026903db2474e988c1ee45ce..e67474b46cfd5bdb8f4ce4d882d9a9a4fd95befd 100644 GIT binary patch delta 6814 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 delta 6767 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 aWr!#x=`Y5~B{6a97OK5jd79W-hW`b!S9h}j diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index de1ab583b60bebbed2fccba6b70c3165544060fa..bccf77f1d1d640049334dde7c1faf1fc512a5986 100644 GIT binary patch delta 6959 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 OxO9u(pt*NF8TTKop<;3X delta 6959 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