From 0c6975fda16f4f8c44c6fd5760a781b69ce46ab4 Mon Sep 17 00:00:00 2001 From: Iristyle Date: Sat, 20 Apr 2013 20:02:41 -0400 Subject: [PATCH] feat(SemanticMerge): build / release 0.9.17.0 --- SemanticMerge/SemanticMerge.nuspec | 25 ++++++++++++++++++++++ SemanticMerge/logo-semantic-merge.png | Bin 0 -> 1991 bytes SemanticMerge/tools/chocolateyInstall.ps1 | 23 ++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 SemanticMerge/SemanticMerge.nuspec create mode 100644 SemanticMerge/logo-semantic-merge.png create mode 100644 SemanticMerge/tools/chocolateyInstall.ps1 diff --git a/SemanticMerge/SemanticMerge.nuspec b/SemanticMerge/SemanticMerge.nuspec new file mode 100644 index 0000000..314bee3 --- /dev/null +++ b/SemanticMerge/SemanticMerge.nuspec @@ -0,0 +1,25 @@ + + + + SemanticMerge + Semantic Merge + 0.9.17.0 + Plasic SCM + Ethan Brown + Semantic Merge - The ultimate merging machine. A semantic merge tool... that understands your code. + The download url is an unversioned permalink, and hence will always be the latest version, even if the version +of this package is not updated. + +Please see the documentation at http://www.semanticmerge.com/documents/semanticmerge-intro-guide.pdf + + http://www.semanticmerge.com/ + sourcecode merge tool dvcs git + http://www.plasticscm.com/buy.aspx + false + https://github.com/Iristyle/ChocolateyPackages/raw/master/SemanticMerge/logo-semantic-merge.png + + + + + + diff --git a/SemanticMerge/logo-semantic-merge.png b/SemanticMerge/logo-semantic-merge.png new file mode 100644 index 0000000000000000000000000000000000000000..7ec6b0e0c90b9af8510c4abfce7aa06da679fda8 GIT binary patch literal 1991 zcmV;&2RQhNP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv000LzNklvboK4mN9Z3#G9s&V{oWs0cI}rv)d5m0?O;g%b7Ue?N_YPLOYO6MPijxeiL-`FRT?v*7EEudNBEUV8(_m7RV0pkI!RjE6L)iw#H zmO`7M%4+U(JJfyp{Pvb?OQp>uLLVi{GB`MFizdO_eoK~Lm7lH0BQmvQTpf1N{5R#R) zZiLHQT@<{&uykAqD{bi2TpDpd^Id9?NdU=8@Z3*|TTyzV)NaNyav`jg*57e%z#OE( zMxN4(s$DH!Czg>5VI_F09=zNZq`^j>(mZ8Ck8gOTwiZi@L0IV*kLBC?njj4}l9e{B zMkCZw*0`BojD(d=P^Os5vy20VY^6eNcgA2RmK1}qQkkQFWqAqXfFWBcqp3cRGGIwD z2rJcjsgKZhju**Fim%ZKinFCfHY1i4gRoMQ*YS4l0mi`(Y$Gz88m^3b_2a%CuUiai zv*Fz=Rgjf`sO87FdJ@IJ7>wg>?+^5A|mDK8@Rs zCB-1DWV$*&KP@pJgMcZbuMa04D#a)mrG!`*YEgP}r_X~W#UQB!Cvfekmo0;Ug;zaj z(T)4WFFas*UJl~}Kp*-?>m2c{6FkzBRN8E4gi}Dkga^rw2Vh#M++R@eg^U0fIZFOL5s+9@b$CFBrDj7?DVNgcbhI)8 zTu3N=UUK}bYYFxGFUxz(tPI^qy$( zo}ImuqgZM-B$Z~^-~l9*o=Dx^HR6F629`YlNu^59(5FR(i~tuBN6Kf!vc;^tkIrQ#=`>^ z4r9$ud*iSp&!$I*j_{OPuX;6JM~!_@S$E;}EY;kUZR{K~0G)u9D1rDGd{{r=20Qfr zYZK=^wxcc+U2bsjE0qoySCkdQ(ULu!SY%ESg7w1XvT#SzdUg5O6#st*@+(2~O^&^B zXg@aA%n+F(#Pq?5%S+jNiY>i#p_~Y*gaWR7PL+<0C7)_qdb`wkB!a)!6`yaA2bkOs7uDDZqqe|4pB-FFcyr+PQU}fDMG-0FL4Wu3@reS zK$kL8h*d%%)L_J?$j^fK%>r%18{sLT;BPR}Q#3~ry>yq-;BnJgMTZn66hRF}dWv31 ziYxBEOlJx+q$@!{gDpGxGubIx5Ti&xe{SmTpLCA!LzWT>Xt0IbfviG6}Te36RI2!R^j+qT52xzcI%1Zww!ZAxqvl)++{{8Xb Z!9VgOv*5$(Y$5;v002ovPDHLkV1k2EnNa`$ literal 0 HcmV?d00001 diff --git a/SemanticMerge/tools/chocolateyInstall.ps1 b/SemanticMerge/tools/chocolateyInstall.ps1 new file mode 100644 index 0000000..58bfb7b --- /dev/null +++ b/SemanticMerge/tools/chocolateyInstall.ps1 @@ -0,0 +1,23 @@ +$package = 'SemanticMerge' + +try { + $params = @{ + packageName = $package; + fileType = 'exe'; + # BitRock Install Builder + # http://installbuilder.bitrock.com/docs/installbuilder-userguide/ar01s10.html + silentArgs = '--unattendedmodeui none', '--mode unattended'; + url = 'http://www.semanticmerge.com/users/download' + } + + Install-ChocolateyPackage @params + + Write-Host @' +For instructions for use with configuration as a Git merge tool, please see: + +http://rlbisbe.wordpress.com/2013/04/15/semantic-merge-as-the-default-merge-tool-with-git-on-windows/ +'@ +} catch { + Write-ChocolateyFailure $package "$($_.Exception.Message)" + throw +}