From 6ab4426faac1daaa0ab56343754a82f60c1b4912 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Tue, 9 Jul 2013 17:32:26 +0100 Subject: [PATCH] CP-5500: Removed Powershell snapin installer; ship it as a module instead. Signed-off-by: Konstantina Chremmou --- Bitmaps/BannrBmp.bmp | Bin 85894 -> 0 bytes Bitmaps/DlgBmp.bmp | Bin 461814 -> 0 bytes OMakefile | 2 +- mk/Makefile | 61 ++--- mk/csharp.sh | 2 +- mk/installer.sh | 58 ----- mk/patches/wix_src_patch | 242 ------------------- mk/powershell.sh | 14 +- powershell/Initialize-Environment.ps1 | 28 +-- powershell/README.txt.dist | 53 ++-- powershell/XenServerPSModule.psd1 | 84 +++++++ powershell/about_XenServer.help.txt | 6 +- powershell/installer/AppIcon.ico | Bin 33982 -> 0 bytes powershell/installer/XenServerPSSnapIn.bat | 31 --- powershell/installer/XenServerPSSnapIn.psc1 | 38 --- powershell/installer/XenServerPSSnapIn.wxs | 167 ------------- powershell/installer/XenServerPSSnapIn86.bat | 31 --- powershell/src/AssemblyInfo.cs | 6 +- powershell/src/XenServerPSSnapIn.cs | 100 -------- 19 files changed, 158 insertions(+), 765 deletions(-) delete mode 100644 Bitmaps/BannrBmp.bmp delete mode 100644 Bitmaps/DlgBmp.bmp delete mode 100755 mk/installer.sh delete mode 100644 mk/patches/wix_src_patch create mode 100644 powershell/XenServerPSModule.psd1 delete mode 100644 powershell/installer/AppIcon.ico delete mode 100644 powershell/installer/XenServerPSSnapIn.bat delete mode 100644 powershell/installer/XenServerPSSnapIn.psc1 delete mode 100644 powershell/installer/XenServerPSSnapIn.wxs delete mode 100644 powershell/installer/XenServerPSSnapIn86.bat delete mode 100644 powershell/src/XenServerPSSnapIn.cs diff --git a/Bitmaps/BannrBmp.bmp b/Bitmaps/BannrBmp.bmp deleted file mode 100644 index 72f39e6d3cc48d21bf1e1ddee103465d5dc19f76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85894 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 IpFf@aKT+DuV*mgE diff --git a/Bitmaps/DlgBmp.bmp b/Bitmaps/DlgBmp.bmp deleted file mode 100644 index 24d4d6e453fa2e17293eb33604630412321ccfdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 461814 zcmeI5+mmI#$k7cMhv{S6w>~cXuA%@7MDF&T@~| zJ!$PO_tf=Z_efdykM@Ua?`U6H$NPKLI?&dG1b#N-L<-uvY z4o{cuI$Ivv*3rW=el5?AmgmxX2mc2Jpg_I~bR6#pP9Mw=uL*93xF9%j+#BL5!FMEr z6UP~d?;H}r8HmdSr_XkR6VROru0vc9T!FY1-vsxT;3~wYBzQyfd|zPf3<^MjcWRFJ zVfZ-2?;9g=0r5L-5btAfipN!m%VD?y;uXOqh;Km{z9xd7A1`U)O@{(dAY%mk`&!|A8k5qSdM0xigEs`fI6k^KIm-GS#^#_v=?c^wXX;W2>()p-wlpOO z;$C$rFvzkm@ z3Yp_dN|UM#>#U|%UCPi6rzc!l;k03R0)lG=g~KphBRDvo`w_CH2C}9K#$8pM`K=uj@Io`JUj2DRq zLEI~=>0Mmt@1>-6!`arJ1Yvkn2HyWv%Td@EydgL^p8Xld2BCn)@#!Ewzaj4Ir9`^n z@nJY0gF7WNM+pv&=lqX-Zk8tdhSQ;l*FYedRBAX5Wjcp_22yHZ~Wv>{EL6~ zPyfk({J{HP`{56yhI*s&=X9UL;h&y{J!EShrkuq+D*D<(Kj>58AdU#y&D~`QGf$SA% zIKB>uJ7hJ-yX_^2)99;?;N6Em|MoZex|B3tiWG)>b405GM=e*FW^D9l_}X8RcCt zp43Z`!tlYE6kAy#ABJ;AN;-l+Iz6V9|BH+rLV_2k_Dvk$0oLV>k{WJeggW&L&1p2$Lzw+V>igQB$np~ao6634%iA{~;6p0TVl`fyD z$Ky4}3FTk--0x|BHwwcEj_8)2xr{Ap{6$dXRK}s{+4Hsef zn32-pyZc%Edkz7hK+X!(9Iq~g=n|XlEy?ye@ejWL7iBC`+}&g~o5bdKUw)CEy!V-3 zX!4mRjyGe(U;5TJr7^2r^xIUpHEk3r^UbL5C96~tN?M`FA{Gq*wi@wx8MJ+4DrKi zc1l0}Y8a1q5T_DDhT{U_RAOl7IQ=y!B=6dM7>@UCK2?SI|M}7%Xn*tOmoI#+aa4>D z_w-T*Wrga!YmUQamG*j1Bc+CTMet_j{0d`lP@s4P1jogt5OzC7+>(4-qaks;ZT8`& zUojlt>xa<3q}HF1uR{3l)+op6Z}RfDze&kVT4s*-Z9c<7LwaJ5#ElSl^iooW;UWgF ztHRAOIOR5bh_B8Oj~9Q?Awbp&)ExJO`2LR0@!$Exa}~!Wh=2Fxmug>y>GUD;%AGzM z$E!;4p5ym5j*|mUM#|?u_uu9JNAl~x_N!Ko_Yi;Ml^?R!%3u81ciIb)-FtleA?{O@ zBHVB`40kY6T8^Ke62!srtdB4@2L;|)?D<2S+U|#WPAU@b>=c4HRjp8-v#BrCD#Rs@ zSM`Nvj#qv5EXN7uKmW7u?oj?dQD4Z#<2}U5R~ZK5%^yN=-@AMJ)O}tG1MyT|iXeDM zK2wUpDIRYjezrP4!kU@-I_=j<*%!Yw}VA#I0etNMKfl;nI>IF2Zmkc(XEogRwOz00ml(%eMF^#G5&^ z6mDxM9R8Bx+?_XGwIF3UO z1+rJ5;&=eWsXFDA?|;{=FaI~Rj!hya*(n-B*_Z{hOw~(8BQ{{a^Un zpS(V#{!q(t7l=z? z`1vv2pXqpoX78mW55tMz%_{mG$L66x?g}UzABT8-vyVDY{4O=$4{1&WCv%+b*o@~m z(Uv@Mnn2q{;!U%U=73iPg@^mBqtazHpZoa7G?Y^qP60TXDg<#_5ANMP^MrT+!KG^- zgqI?UQX~hwbHk-Dd|-ulk$4Aj#N)Z2V(hPU1$vH$LA>ktdF2P+qdM_wee-$p#Kqlg zeVw>GHKqF87Z*0w;@vF}&4;9SK^PnE1GAcz`yT=z9vz0a$xN2uh{sDm;@E!y3bY&_ zgZS+xx2ZVzOL7l!Dovpvnj&9HRQ~TT{{GfNd|-%&cqzS+GIba(Lh|zh-ehbM z3Y4or#c@Z7cec3P?^DO){iP5Th7Tig0=MQ}eDAMbmYaRli`h0d61PEoGsEzjZ zuRzW5J{a#Dl{;L4N%;=<2gW_3BxZRT{J8I7a2Q*0tG9u5F^DaJ4JI;)G9+G#4B5TPxi#u4DogX?Zbn5 z?iKwEC=!p4#CtErr?_w!hSS(Wr99l?rF1Sz7lwo51s`o}y&wfTj_VLN=Qc-5#brBX z{z!b&AZ{|m(|IYjFdQ5&=qO{W1uM{V+%2~`QYx-Me6PROr>-*85}WDmlud`YC@u_u zcvu+Ta(o4Uyx=2_trws`!||BhX5X}_L0k>SZ4f7ad|-=vd*WLQ@h~sNDGaYTzN%IM zZ!)$B1(DE+r46^aFICO znEap{MO)XXD0j1Q1uEj6`w6O3{2K24+I&VJ?&_t8qLj`J@4|3!yo^(fU6!uELWcNA zZnK`9(oRqbFHq@A3^x?w(&#HUhzEq>;}zl@#NE7<+DPdLUVnI0`fHB;LxHRnXgF?n zRD5!qS|sk@v^jqyuC!~;3~|Hsa1+G6yp)FEPgaj;W&I9gb5Njk1&HHzh_lW2#@wcu ze#MRyR~(f=VzaVSDo5q8TXWbcvqOBuOK~;C9lVswn&9Ag=|># z;yuSpgt#dT*Rz^Kh;v>_LvV1sfK!Yumaf2pJaN?)H}-A%J&q- zw);(s#7z(n_ENy{(hoQGUyK43$J=0hm+tqmUhy+kZqv6^TvVqxcHWQ9PMO0KAF)%M zAU+Jk>4_eRS8lkvR!>%|V%}$L6bh86z`_7=A6q;sw^D4rODgIea1H>P%h~UjC^4-R!p+G4LEC&7egK>uL zw)nor@je)jFHrI8ydU+%kCx}c7EjXbGl;~eF~kR6id~ z!|@% z@%RwpiXq++y!vp7JZBMy8JjFt0h!~qqauc=Oj<4O)O>HX#hpvV?Kk^ah8H%!H8MM8 zO?HX_;)5`p2;Qt>-*0Rj3Y4ILo#TcY70pozu*GM}ZQ3EejGRNeEfBxDd|bk-j6Fhu zVio8(J`Bd)AnrE_OLJ5VO`Bm;#W`C%qG>aeNSq)Jju(5pvGGC_XgEHExX~6@XNwyP zR5rmD&kN!PFGW;{YlgURR4RyrmF*aDZ0t=^LTq`v6bX4ZF#d|wN>b!4l@sSJf+erMP<@m{?(|V0w zb?+33uM^_eh{p>*<=B4i3P>DR=BVse*WPza;kXuzr*Kp@&KA!K;@3~$tK@!;vA?nv zXgOYYZzgwCv}*B@TYlmuVX2NvlHBG*k@&^=rRJz4s7_%#ak5h=5+{g*<7J<5>^^@5 zDvsM*@Ezxk$;-*ow%H3>}L;R8mE<+p~&;J}_hh;0!aXcUx zpTJQGtrj=i;!(Lxug?4VATFk+Xhq_6iJ?w##N%ZjaO}Pa1s2YZ%I=ZJ9F+u)3O@PgA3IQ9+&vRA-`<6{Nm2Ybi;s-1D)@!}!rO*I$~a#Z|m zai@Ntu}GYXRg@}2x3>E@h=b$VA7gB=a0NP!n}hM>=}oQcCm!Mfg@&%Sxb3>+@d6dC z#Bfaz2geIPq|2j8EaHgjb9E+u}1pyuMwNt1qNHCtqUNmZ{Ws3K6_n z*}uowAQUKBfrjH#1mlLGhRK6*%~6@6&@hRkqSz@HPga_vQs0tnn@jXgu%4?!voS#hVmflot@gPTK4Ys%n@ymH34vv>_lCj5<6;L_u265wr z@#N`EuIq=bQSoh0K`X{@3q7x{gTUVj+Tnob7O$Ph8EK+EyX3dWPCH#LaUg>5y*-5nM0YVoMtrdDETEfsfw_)~B^ z=Oc{0L4kK_j;|pYKRjJlE2P#?3&w2)<8wJG0k(LOQgJtkgX1{pP#|vwDvp;GjL+?; zMB3u^+-BRZ*%;#W&#F45U)NUzad15EGmPCqfyHvtU|g#;e0XqLO;bq~j62!l?0E6b za#W1AxE|i{&dsA~%jvtXHE^Ki!$5oDNT|Yi! zY5g1(u0W-)7B|@9t_3PQ#EItMc-BW4n}Y)H$Q(Cz;kON(YR&j~nTi&S$Imqs&bVv$ zX8QD|SB(nis7z&x+aL~()vliz z9Th1OmmHPaOR4OXZWaEPWBX7bZv`5Ty9eXdR4ggO>Ftd3y+3*br&^{W(wpbU%PPY; z+W2F*vn|3IS0NrBj0ZR>j4jSXTysHEg1KzQDF)V zuh|JIp|&{U@xqTcwqJ+>#PQ%@{K3f~7mxdv8>SA%Bd`03aa5cx`bi#)n{Dxy<4;kq zQpj<}HVak2i{l>Uh7ohdmuqy!M^y$2geIN*4TDo3M`K78P2K84KoVH+4QF2 zqMs;7Wwctnvs0=MPpehfTaE2PfwC0PI6hXULP^f{5>C!hA)BQ(RbqniGrBstTOz|5 z*uZJ886T9XY+o?$;HZG(WgTejwnzm$Ic~p6Io26}s6d=(E^~bCWh#;B&E&SYwa~DO z#KG|*&owq(mI5-zEy1`}Zs?uijA_I#A{gg~Vd<@#tfOMF#T$sjS1IdEW4Glg;K*_J z45xGNkM4|HgK^u6{Rt=7_YCKLOxbw2siMsp7nirG8BQ^0eEOR44GhM?@d6Jvwp^3~ZXBPsY}{h1tUJRw zX_<;st)XO#`xK0KjtW5>953ofW3vS+z;S$bQzbkYKRLc=<8k+L!;x#0`?-ex(^TdS z#>di|H=z0Y zrGNv+*I}x7_Heof<8%*aACHd=R7t~et!6y7OvSNayoQG~|#VIht@tF1> z$4ZrOQ^o1tpU@1a4dNHfXv4=V#Z(Dt;MB@g(m3N3j3XW|?pR~Pg(=W;d~lz#HdDpD z{RgJX>Z;}VMg-&FcwvVc+bvE33&-6n4#iBBMD0Igrb=+xc<-pNHz|i_I5#^O2gi#$ z*4S`i3XE|))Eu9|R8caVY0JiKriyk0r{7d8{`yU~2F@^N9KK3nCmP!=Q2~|XYpgij z=1LXC8K>CX+fGZQzd3l zt&=%EX)nGEar!Jl{Bq@Ps)T1aJuZtdOjFSy4vrUhtg+$36fkmpofU@;SGXzWc-m>> zo*Y+972k40zhGRA$88X&HqNTtuvu@T52&zHjqR4EfW+}2bKG?{mfpr0W~$J*mD*QH z*^57usWNYdvxhjL92_t0RAaxTDNu1dfjPc$6^B!_|4d=3q|0!MQ7W3LLJ$YXOFPxr zZ)pmIa{S@`NwvZ&$79+!x6)LZFT<$^6X1 z6d(l_TbAV1D#xQM4vnUYS~;$^|4_nn^~8Cm%H*bsHN#24IO1^}btsUx0tSv3VUD|3 z9L`&*lG;=O$MZhJ*c}vDH^-H+D(<&&x?dczk>R-f$SAvIKGx7 zXW`~}c%_Pise*Vs`(um^7Op_e@oh1%f#q-T`!WwCtOJgsq-^G<0T(&?7a{LIF8R&tRjN(^W$X| zkGpc*lH?SX;}drPdCWL;s2mS9$DiJ~nd5K2^;RKoGqwo@%2Z%tj_YF%AF`%O&2dYy ziu>IWg5#5R041&*pWGY=$ICq1*mXGy=p1(}R$(V(F_Tqvj&ENl=LAX4xy^BKyqxol zotCLUAjj3oDzSID6_n&$hdB<8mwC3a>v9xW9ETJgiei;ScXH0o@wt+m4(9mvmE^04 zPEMx|AZK$N953fQW2a>*5XW)<>m&M#L#jR$dCp*tTgTP*#VTpX9By8clb?;%RH_if z!SOQBHg;W(0y4)PiVhDayFMa8v5Gc!e9atp8;`{V<4>>Y9?oVZs2m5!%Q?*0X|W1; za@<@z&LlaPhi8L4r!gK+!12u~Rtf6l6sC&cxCC)(1q$r|0>_Iz+t_$H3apRg!c^Jh zqQkWmt1!X1FUO@0po-&fqkg=c6OEmgsK9{Z>uCbo(Bg4tjz7M-l$RkMPgtztljH=) zOFY@wb4dzJ$?<`y!ZrapB{@@H1GJvWD#-;Zg~oT z<37I1bd$#uHgjt6I5=M3sm6{=Q^3UW{Sz9cGF)|E{)Xf^9etIQ@wgMm4NX8)hIlp0 z}=paf-*mahzNz00krkz;SR~dL8f)3P6D^R3L!k`^a;)-9VSC zt9CgIJ9Nu)I>qBp`S~h?rhND+TX-VzSB3)q3Ya+lfGJjKF9QO{SJQDk!6g!?SMfgv z_%EQqRx1FGC-+q-Hox4Ueoo{$xB7tMFAoJA6adG4IKC2*cvDEu`zqkL!+VE+1qwic zbPD9k@zd40>7Hfu<)?dn@Fzh5D6jzvY%#|lot>y9C|WwDR-m)xp}rE{>&Eo~Z8FCzi`?NpptSc$VE*{ThXsE;6xdJ&6pkMs zP?<`%jPq5p;`qh6*ZlD({D>8~?y&O5!SM}!-|^Ri0y!$MB^=+zdzKyI@$0LrJ|q_- z4;@O#`TB9(>z3mQ#h#$RxB^phoSc?{wQ_#6Y}fJfT&#=Zql**MI=&!?ZzIQt*2eL&lCMd#JcwRGF^)9V{$@u^Nz>0!oiFt!E- zpg=cqLjfp|u>y}C zbSMA?GFCw6_*z;zDd9PP3Auvu1f_@Wsm>?YSMr)B)u~Qd$@mS%)}R0sn3&_7Meg4U zw9eAQ(2|uT(`!RgovcNU7aa;ffs7U4IBqXldANU4EvEF4$#dE{p1$;Ovr1MHr#h*8 z#i3*c9MAZ;Vrx)~ST%*x|s#V()#6krutH^&20o$K$;-xQ17J}^sIE9`fVhfn|t z87lV4kAx^!CTH2xmLB3$IFUcKmjPgDzG>rb6oMq{YzHXIAw(&nB~}= zA2%?Izu-;l26C?=f6`wJM3)44+zsSpt+3xc9zp>qkcR?-;|j{drmVCBvzRLK!L2}S z>0#j(dFY@ODk>kJeVE6~id{efD8MSfb9{ZN&Lo4#XX*xuvdE{eK9sE$_PfVJC;$cW zP{7P_yG3s9>WsZmVsk9=z&qYH(OSvlWyLO_02E*q2<3Qms*|-=E?fp?X{pXNTI8v# z50hIfT}aM;_jm{epgDsm`j3d^p3_ z&stF%f^4%^m~rHJysX#-6o3M(0uslAQk`oZnB`tYK7w-NEb`f{mE<9LbFBpX-Qyt? zfC70aVB~mAs&nfsa>oY!*v8IbNPeYVyG(P*6OSWrtd%@oR_p=_Kmk?(E644r&NW)( zYZ|n|ay+_fMMrsfA-TB#k^S!R5DGwnJQQd-p3Wk7uOffQraH$ga_vru^;#?LGqZ$C zPM)~7+(Po3Yx2kK7P+yIoI>(EURLY^3P1r?0hQybMIK|VFx^1*fmzz1mD#HgW2}|v zkX*jzO|@41dpmD#D9_of{_|yOFDrHd1)u<{zzD}Y=AH0lzk57{0#G0i1spiu zhvfSwRBJd~^{kasnqJ$iWm~cm!|`=lD+_mR+0JbZ$?d~zLql@*yT?N)00r_;z=h+%4MFBv zE0gx<+q0d60>oiFzEvT)Qw?GsFDrHd1)u<{K*#ZcwW5aPF%3a61&CvXQ1a%NSIOqt=JB#(7f=8SunKr`+{s$e z#vjg=?F=bEOy!bm?VbMjOSrk@!67;O-Qyt?fC70apmBTdsy>8q}HETt!T1lVnOk04sX(9P)HEmnaXgN8x2-R&t z?01icPyh<#p@0|1*O~2{CnO&XvyE-vBxa5zgIA4aujjK@4zL#*A|IyT?N)00r_;KyZALZ0E*=qr63V z9xp3)0R^A{tAG>7w=E>sh9CxB6%?27nql(XMG9zp>qkcR?`4J+yedezMs?JdvxjtB|HP%6+feV^<>ELz6^1a@|8SZR_p=_Kmk^PmgCcg z{D|P_|pa82t&+&DHh?}0B#%#cCU94( zizaMSZKI6xWGH99dpv{!P#_NlRE|5>AP%m4n`U?x7m_O|S3>fwa97-n@;>L82IYCY ztk?w1BZ|jGNIqtipHaz5w;o?m z7%ne0Bp-2Cd{M5|u85o`JAK7qu(01f9zp>qkcR>d$K6rh&$A5-$@v<@h=k`l+?DY% z#4(hswJW|k&ry_9Ly)racv-OvC;$am1x7ip%_Uz)NS@MNnXU{m(kM@ka;1WW{qFG) z3P6E86zDh}5|Xo>`p5kcM8g#mBH_u-L5y@)B5PO1+!bZ?ifXMiHj8SoP?A$yD>7BO zMeNpAP*J&q!IH4~ew@LQ$IFUcKmjPgDj;#(f^x+rpU_>|7^7UEJWbAX z;FWu$Jhm8-{qFG)3P6E86j(gmt$daByDP0xE@}|l+7)X>xn6@|e%MfExetPWI=jn^`s@2nH zQu)weF+}Ayl((hj{FjfXPyh;Kp}^vhATBuWlknVFcg1Lw*Evu7jPgF`nHkEncvrCr zC;$a`1&HH!Ls71klc%U%5oL%I8RhZiD}zeJ?TE_xFCR~#02IhV0Tag!<>WKCD*;A1 zQ@)}a<$ldUeN4jgeT{&q(M1TyV6v%=oKt8qujTy+@XTS-C!Bm<%Vw`kD&k*$U%Xc z<1NZNj?)Kccg6YoHxA_wRCi^>DDR{4(Hr0lM!C|mFI6IX^apuF<@2E2seM0(R~37J z0#Lx9fXs2(UGYJ=5|Z00%Ckp#bc;|Ml`CUdhNb21fw`z)F?{=Y3U=R z>#l?t=R_=-#l^b%N6ICLnj>;WSuFNYB>=JTEdF`>}@Ty`DPyh-T6sS0^qTKGT zgc;@IInN5^qnCLKl*d;hPHM2&P@b^i(+TBm+o$2%$73h}1#(beaj+wC+{q|6qCBFa zJWbBis}eC2lsnNJ^(r}>RqO!@m=tI^u7>1mG0K5*GRKEY9a&CZd5~Rh`ug!43P6Dj z6d;b@ZbEW1$_EwY)eUe|NZzg8CCx!>)>?9&fkowmuKhW^a!-RLGV__in~E(!0VrTn zpy4=+a(AQL(i~*Vd8RC1$q41)nNPFFV*2{=911{z3=~-GSMhkWk{RXJ<{-D6r%T%N zAq_;7W+G07^3f}V`g!I0Eka^s`C!iNu(Uj=h{f4s$>2@J7N7tWFey-RT%f$-xY=D{ zE6QbqMOZ70!J&5U-eircvG*`FUdK`g<{7-H z*a8%Q0wx7Ij#nYMhVr&w-@7>oC^uj4>5}>MKso2JaLG^8*N^8=019NFz+(R{5xiR+ z%I_$Bp8DvOn4G8YAT43AICt%DMpQmY=F?J=Xit7-@TOu5Pyh;;6sS3FLitqXDo%AJ3rx6v#jU!EqJkaz*(xm59FmLC#(K zsZnkn!?L`XB=b3ra^Ju_gEtjhfC5m!qyW!x%_ujc+^2kn>dKW07A@zgR3dV%p3|c| z=u*r9PJPC8KhNiR4!1Sz%KU=%uQcEo~jq1xyN59G@EHwNY-KrM2FuJT1yY?DAlbMWy*U zh2+gTqnxL_=-N-y*N^8=019NFK+ADAly}otMk^8ZsC*RV@hw8GUir{qi9&gLyWG=b zVQH>#oS2@$n~E(!0VrTnfH?j}6OsevwO!tN=bYAgyjasA%4g zEH{^y&x`UfkA(@$J#Cf@-c)P>3P1sq0>tsxD{G}$a~UkrQMrQh*e)Rll*iiTfgTGR zm^%*GQcQEx*N^8=019NFz+&$faePfE_h{T78Y~l`eAx3z?Lq;KLL+r7A%QtNV9PBq z&)`kP7N7tWFey-T94M!dyjg7r|ADE4|BQNqOsk)BOAv3?VBl?vz?`vJM8}XR|7rUA z@f-?3feaK_+$V@PONq*><{+&Sk&0Lh-JanUES15sQBiq%k0oJX&e|*|k0>N>mYL=m zys6j%6o3LI1uBlO2jzi7Zo>?g>Mo%ana^|{%S3^>!Dcai{df)qpg;x+v>e|Il$(3^ zl?&mVQBI{SeFcj^xl+d>?3B(|={|@NiQZQ>H?9lgu}l@1Gd9bB<{7-H*a8%Q0wx7| zj&C~3_1h<$X&#L7c{~<2Fn78rjD0h0oY-HPLBQEnb`yD2D7@3D9m zm~$vs19P9kL?tk1Z5GqlkLOST3S^)_#qo8Z{LbMn%|z^$5|vNYB@|alD`VBXp+8N8|30u+D( zCIw`UhoD^R-B%j-*NO75>hcsGinYMPtAemsW)P#^;Z7Wb-pmEn3#Dq=~CaTp;#{+ZoJQlLc;~jG=%@vgMfw__98N8|30u+D(CIuGv-uThI zH-;Q{iOS{MC%op|%BAH_MJ(Q#Pk)ca5SZ6f5|zHM%OEy4ef@Y2 z1)x9%3N#$|Lpjy4h+Bj_QSO-eWZL(s^K;PisW%D*RF@k9^T-18p60{*D0;`-R+yNY z<{7-H*a8%Q0wx7Ij#nt>JQm(yX;H3UB;*j4`=Q(=^XX-mJJ+#{dn_@5c~5iW?Lvfd zBh9O8hIG@McUq1b-`w=|<2e+70vRZ<*r|M#ZpEXVFD-v?=ay2ExI@-Tv(zr3+AeP! zJ}pHoUUqphkA+QsI@0_gJpY-3<{7-H*a8%Q0wx6(JFma8^Loc|Q&e8t<(^|$oQqgw oyS$ymV$Xce>amytbHy}IkpGOaSw>@X)7OvZPyh;Kpupn)17|TG<^TWy diff --git a/OMakefile b/OMakefile index 25e1aff..c0bb285 100644 --- a/OMakefile +++ b/OMakefile @@ -32,7 +32,7 @@ USE_OCAMLFIND = true SUPPORT_CS = csharp/src/*.cs -POWERSHELL_TMP=$(BINDINGS_TMP)/XenServerPSSnapIn +POWERSHELL_TMP=$(BINDINGS_TMP)/XenServerPowerShell POWERSHELL_GEN=$(BINDINGS_TMP)/powershell_autogen CSHARP_GEN=$(BINDINGS_TMP)/csharp_gen CSHARP_SRC_TMP=$(BINDINGS_TMP)/XenServer.NET-src/XenServer.NET diff --git a/mk/Makefile b/mk/Makefile index ad1db71..e4f0d0e 100644 --- a/mk/Makefile +++ b/mk/Makefile @@ -41,8 +41,6 @@ REPONAME=xen-api-sdk REPO=$(call git_loc,$(REPONAME)) BINDINGS_TMP=$(MY_OBJ_DIR)/tmp PS_TAR_TMP=$(BINDINGS_TMP)/powershell_tar -INSTALLER_TMP=$(BINDINGS_TMP)/installer_tar -WIX_TMP=$(BINDINGS_TMP)/wix_src AUTOMATION_DLL_V2=$(CARBON_DISTFILES)/powershell-v2/System.Management.Automation.dll CSHARP_SRC_TMP=$(BINDINGS_TMP)/XenServer.NET-src/XenServer.NET CSHARP_BIN_TMP=$(BINDINGS_TMP)/XenServer.NET-bin/XenServer.NET @@ -51,13 +49,8 @@ CSHARP_XMLRPC_TMP=$(BINDINGS_TMP)/csharp_xmlrpc XMLRPC_DLL=CookComputing.XmlRpcV2.dll XMLRPCLICENSE = $(CARBON_DISTFILES)/csharp/XML-RPC.NET/LICENSE -INSTALLER_DEFAULT_GUID=3285AFCC-B1FA-4D78-8F94-AF1F4C2C8027 -INSTALLER_DEFAULT_VERSION=1\.0\.0 - PRODUCT_GUID := $(shell uuidgen | tr a-z A-Z) -PATCHES=$(REPO)/mk/patches - OMAKE=DATAMODEL_DIR=$(PROJECT_OUTPUTDIR)/api/datamodel omake # sources @@ -75,7 +68,7 @@ SDK_ZIP=XenServer-SDK-$(PRODUCT_VERSION).zip SDK_ZIP_LN=XenServer-SDK.zip SDK_FOLDER=$(MY_OUTPUT_DIR)/XenServer-SDK SDK_NET_FOLDER=$(SDK_FOLDER)/XenServer.NET -SDK_PS_FOLDER=$(SDK_FOLDER)/XenServerPSSnapIn +SDK_PS_FOLDER=$(SDK_FOLDER)/XenServerPowerShell SDK_PY_FOLDER=$(SDK_FOLDER)/XenServerPython SDK_PY_FOLDER_SAMPLES=$(SDK_PY_FOLDER)/samples @@ -117,56 +110,38 @@ csharp-bin: $(MY_OBJ_DIR)/$(XMLRPC_DLL) $(MY_OBJ_DIR)/XenServer.dll $(INSTALL) $^ $(CSHARP_BIN_TMP) mkdir -p $(SDK_NET_FOLDER)/bin && cp -r $(CSHARP_BIN_TMP)/* $(SDK_NET_FOLDER)/bin -$(MY_OBJ_DIR)/powershell.tar.gz: $(MY_OBJ_DIR)/XenServer.dll $(MY_OBJ_DIR)/$(XMLRPC_DLL) $(REPO)/mk/sign.bat +$(MY_OBJ_DIR)/powershell.tar.gz: $(MY_OBJ_DIR)/XenServer.dll \ + $(AUTOMATION_DLL_V2) $(MY_OBJ_DIR)/$(XMLRPC_DLL) \ + $(REPO)/mk/sign.bat $(REPO)/mk/sign-ps.bat \ + $(REPO)/powershell/*.ps1 \ + $(REPO)/powershell/*.ps1xml $(REPO)/powershell/samples/*.ps1 mkdir -p $(PS_TAR_TMP) - cp -r $(BINDINGS_TMP)/XenServerPSSnapIn $(PS_TAR_TMP) + cp -r $(BINDINGS_TMP)/XenServerPowerShell $(PS_TAR_TMP) cp $^ $(PS_TAR_TMP) - cp $(AUTOMATION_DLL_V2) $(PS_TAR_TMP) tar -C $(PS_TAR_TMP) -zcf $@ . -$(MY_OBJ_DIR)/XenServerPSSnapIn.dll: $(MY_OBJ_DIR)/powershell.tar.gz $(REPO)/mk/powershell.sh +$(MY_OBJ_DIR)/XenServerPowerShell.dll: $(MY_OBJ_DIR)/powershell.tar.gz $(REPO)/mk/powershell.sh ifeq ($(SKIP_WINDOWS_BUILD), yes) touch $@ else $(call win-build,$<,$@,$(REPO)/mk/powershell.sh) endif -$(WIX_TMP)/src/ui/wixui: - mkdir -p $(WIX_TMP) - unzip -q -o $(CARBON_DISTFILES)/windows-build/wix-2.0.5805.0-sources.zip -d $(WIX_TMP) - cd $(WIX_TMP)/src/ui/wixui && patch -p1 --binary < $(PATCHES)/wix_src_patch - -$(MY_OBJ_DIR)/installer.tar.gz: $(WIX_TMP)/src/ui/wixui $(MY_OBJ_DIR)/XenServerPSSnapIn.dll \ - $(MY_OBJ_DIR)/XenServer.dll $(MY_OBJ_DIR)/$(XMLRPC_DLL) \ - $(REPO)/mk/sign.bat $(REPO)/mk/sign-ps.bat $(REPO)/powershell/*.ps1 \ - $(REPO)/powershell/*.ps1xml $(REPO)/powershell/samples/*.ps1 - mkdir -p $(INSTALLER_TMP) - unzip -q -o $(CARBON_DISTFILES)/windows-build/wix-2.0.5805.0-binaries.zip -d $(INSTALLER_TMP) - rm $(INSTALLER_TMP)/Bitmaps/{bannrbmp,dlgbmp}.bmp - cp -r $(REPO)/powershell/installer/* $(INSTALLER_TMP) - cp $(REPO)/Bitmaps/* $(INSTALLER_TMP)/Bitmaps - cp -r $^ $(INSTALLER_TMP) - cp $(SDK_PS_FOLDER)/src/*.txt $(INSTALLER_TMP) - $(INSTALL) $(XMLRPCLICENSE) $(INSTALLER_TMP)/LICENSE.CookComputing.XmlRpcV2 - chmod -R a=rwx $(INSTALLER_TMP) - sed -e 's/$(INSTALLER_DEFAULT_GUID)/$(PRODUCT_GUID)/g' \ - -e 's/$(INSTALLER_DEFAULT_VERSION)/$(PRODUCT_VERSION)/g' \ - $(REPO)/powershell/installer/XenServerPSSnapIn.wxs > $(INSTALLER_TMP)/XenServerPSSnapIn.wxs - tar -C $(INSTALLER_TMP) -zcf $@ . - -$(MY_OBJ_DIR)/XenServerPSSnapIn.msi: $(MY_OBJ_DIR)/installer.tar.gz $(REPO)/mk/installer.sh -ifeq ($(SKIP_WINDOWS_BUILD), yes) - touch $@ -else - $(call win-build,$<,$@,$(REPO)/mk/installer.sh) -endif +.PHONY: powershell-module +powershell-module: $(MY_OBJ_DIR)/XenServerPowerShell.dll + mkdir -p $(SDK_PS_FOLDER)/XenServerPSModule + cp $(MY_OBJ_DIR)/{*.dll,*.ps1,*.ps1xml} $(SDK_PS_FOLDER)/XenServerPSModule + sed -e 's/@PRODUCT_VERSION@/$(PRODUCT_VERSION)/g' \ + -e 's/@PRODUCT_GUID@/$(PRODUCT_GUID)/g' \ + $(REPO)/powershell/XenServerPSModule.psd1 > $(SDK_PS_FOLDER)/XenServerPSModule/XenServerPSModule.psd1 + cp $(SDK_PS_FOLDER)/src/*.txt $(SDK_PS_FOLDER)/XenServerPSModule + $(INSTALL) $(XMLRPCLICENSE) $(SDK_PS_FOLDER)/XenServerPSModule/LICENSE.CookComputing.XmlRpcV2 .PHONY: bins -bins: omake-phase $(MY_OBJ_DIR)/XenServerPSSnapIn.msi csharp-bin +bins: omake-phase powershell-module csharp-bin mkdir -p $(MY_OUTPUT_DIR) cp $(BINDINGS_TMP)/XenCenterBindings.zip $(MY_OUTPUT_DIR)/XenCenterBindings-$(BUILD_NUMBER).zip cp $(MY_OBJ_DIR)/FriendlyErrorNames.Designer.cs $(SDK_NET_FOLDER)/src - cp $(MY_OBJ_DIR)/XenServerPSSnapIn.msi $(SDK_PS_FOLDER)/XenServerPSSnapIn-$(PRODUCT_VERSION).msi .PHONY: python-module python-module: diff --git a/mk/csharp.sh b/mk/csharp.sh index b88bfe8..d5c3f46 100755 --- a/mk/csharp.sh +++ b/mk/csharp.sh @@ -50,4 +50,4 @@ then remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign.bat XenServer.dll 'XenServer.NET'" fi -EXTRA_FILES="XenServer.dll FriendlyErrorNames.Designer.cs" +EXTRA_FILES="FriendlyErrorNames.Designer.cs" diff --git a/mk/installer.sh b/mk/installer.sh deleted file mode 100755 index e0df2c4..0000000 --- a/mk/installer.sh +++ /dev/null @@ -1,58 +0,0 @@ -# -# Copyright (c) Citrix Systems, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1) Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2) Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials -# provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. -# - -set -e - -# see http://www.interact-sw.co.uk/iangblog/2005/09/12/cmdspawnerror -SYSPATHS="${ROOT}/WINDOWS/:${ROOT}/WINDOWS/System32:${ROOT}/WINDOWS/System32/wbem" - -if [ "$SKIP_SIGNING" != "yes" ] -then - remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign-ps.bat Initialize-Environment.ps1" - remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign-ps.bat XenServer.format.ps1xml" - remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign-ps.bat XenServer.types.ps1xml" -fi - -remote_cmd_passwd2 "cd ${TMPDIR} && mkdir -p obj" -remote_cmd_passwd2 "cd ${TMPDIR} && ${TMPDIR}/candle.exe -out obj/ wixui/installdir/WixUI_InstallDir.wxs wixui/BrowseDlg.wxs wixui/CancelDlg.wxs wixui/Common.wxs wixui/CustomizeDlg.wxs wixui/DiskCostDlg.wxs wixui/ErrorDlg.wxs wixui/ErrorProgressText.wxs wixui/ExitDialog.wxs wixui/FatalError.wxs wixui/FilesInUse.wxs wixui/InstallDirDlg.wxs wixui/LicenseAgreementDlg.wxs wixui/MaintenanceTypeDlg.wxs wixui/MaintenanceWelcomeDlg.wxs wixui/MsiRMFilesInUse.wxs wixui/OutOfDiskDlg.wxs wixui/OutOfRbDiskDlg.wxs wixui/PrepareDlg.wxs wixui/ProgressDlg.wxs wixui/ResumeDlg.wxs wixui/SetupTypeDlg.wxs wixui/UserExit.wxs wixui/VerifyReadyDlg.wxs wixui/WaitForCostingDlg.wxs wixui/WelcomeDlg.wxs wixui/WelcomeEulaDlg.wxs" - -remote_cmd_passwd2 "cd ${TMPDIR} && mkdir -p lib" -remote_cmd_passwd2 "cd ${TMPDIR} && ${TMPDIR}/lit.exe -out lib/WixUI_InstallDir.wixlib obj/WixUI_InstallDir.wixobj obj/BrowseDlg.wixobj obj/CancelDlg.wixobj obj/Common.wixobj obj/CustomizeDlg.wixobj obj/DiskCostDlg.wixobj obj/ErrorDlg.wixobj obj/ErrorProgressText.wixobj obj/ExitDialog.wixobj obj/FatalError.wixobj obj/FilesInUse.wixobj obj/InstallDirDlg.wixobj obj/LicenseAgreementDlg.wixobj obj/MaintenanceTypeDlg.wixobj obj/MaintenanceWelcomeDlg.wixobj obj/MsiRMFilesInUse.wixobj obj/OutOfDiskDlg.wixobj obj/OutOfRbDiskDlg.wixobj obj/PrepareDlg.wixobj obj/ProgressDlg.wixobj obj/ResumeDlg.wixobj obj/SetupTypeDlg.wixobj obj/UserExit.wixobj obj/VerifyReadyDlg.wixobj obj/WaitForCostingDlg.wixobj obj/WelcomeDlg.wixobj obj/WelcomeEulaDlg.wixobj" - -remote_cmd_passwd2 "cd ${TMPDIR} && mkdir -p obj" -remote_cmd_passwd2 "cd ${TMPDIR} && ${TMPDIR}/candle.exe -out obj/ XenServerPSSnapIn.wxs" -remote_cmd_passwd2 "cd ${TMPDIR} && mkdir -p out" -remote_cmd_passwd2 "cd ${TMPDIR} && ${TMPDIR}/light.exe -out XenServerPSSnapIn.msi obj/XenServerPSSnapIn.wixobj lib/WixUI_InstallDir.wixlib -loc wixui/wixui_en-us.wxl" - -if [ "$SKIP_SIGNING" != "yes" ] -then - remote_cmd_passwd2 "cd ${TMPDIR} && chmod u+rwx XenServerPSSnapIn.msi" - remote_cmd_passwd2 "cd ${TMPDIR} && ${CMD_EXEC} sign.bat XenServerPSSnapIn.msi 'Citrix XenServer PowerShell SnapIn'" -fi diff --git a/mk/patches/wix_src_patch b/mk/patches/wix_src_patch deleted file mode 100644 index 0bda370..0000000 --- a/mk/patches/wix_src_patch +++ /dev/null @@ -1,242 +0,0 @@ -# -# Copyright (c) Citrix Systems, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1) Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2) Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials -# provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -# OF THE POSSIBILITY OF SUCH DAMAGE. -# -diff -ru wixui/CustomizeDlg.wxs wixui/CustomizeDlg.wxs ---- wixui/CustomizeDlg.wxs 2007-09-13 20:45:46.000000000 +0100 -+++ wixui/CustomizeDlg.wxs 2008-08-11 10:20:29.288469800 +0100 -@@ -4,26 +4,18 @@ - - - -- -- 1 -- Installed -- Installed -- - - 1 - - -- -- 1 -- -- - - WixUI_InstallMode = "Change" -- WixUI_InstallMode = "InstallCustom" -+ NOT WixUI_InstallMode = "Change" - NOT Installed AND WixUI_Mode = "FeatureTree" - - -- 1 -+ WixUI_InstallMode = "Change" -+ NOT WixUI_InstallMode = "Change" - - - -@@ -42,15 +34,6 @@ - - - -- -- -- -- Installed -- -- -- -- Installed -- - - - -Only in wixui/: CustomizeDlg.wxs.rej -diff -ru wixui/InstallDirDlg.wxs wixui/InstallDirDlg.wxs ---- wixui/InstallDirDlg.wxs 2007-09-13 20:45:46.000000000 +0100 -+++ wixui/InstallDirDlg.wxs 2008-08-11 10:11:59.766323000 +0100 -@@ -2,6 +2,7 @@ - - - -+ - - - -@@ -27,6 +28,13 @@ - 1 - 1 - -+ -+ -+ -+ -+ -+ -+ - - - -Only in wixui/: InstallDirDlg.wxs.rej -diff -ru wixui/ProgressDlg.wxs wixui/ProgressDlg.wxs ---- wixui/ProgressDlg.wxs 2007-09-13 20:45:46.000000000 +0100 -+++ wixui/ProgressDlg.wxs 2008-08-11 10:11:59.766323000 +0100 -@@ -46,7 +46,7 @@ - - - -- -+ - - - -Only in wixui/: ProgressDlg.wxs.rej -diff -ru wixui/VerifyReadyDlg.wxs wixui/VerifyReadyDlg.wxs ---- wixui/VerifyReadyDlg.wxs 2007-09-13 20:45:46.000000000 +0100 -+++ wixui/VerifyReadyDlg.wxs 2008-08-11 10:11:59.781948200 +0100 -@@ -1,11 +1,13 @@ - - - -+ - - -