Add TGit.exe gitdll.dll and some library to install script

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index c5a8f8a..200d942 100644 (file)
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -30,22 +30,26 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixSetup", "TortoiseGitSetu
        ProjectSection(ProjectDependencies) = postProject\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214} = {50797F06-39C5-4802-8E2B-7B7A4EF03214}\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37} = {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}\r
+               {AD0E960B-5DE9-4AC3-8AE0-8ED0FB5F1396} = {AD0E960B-5DE9-4AC3-8AE0-8ED0FB5F1396}\r
                {62507C2F-9290-4342-910F-BFC44DF99B01} = {62507C2F-9290-4342-910F-BFC44DF99B01}\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA} = {E873DD32-5A31-4DE1-8341-A56A2A5489EA}\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328} = {13BC1836-2726-45C4-9249-5BA2BBBF8328}\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475} = {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}\r
+               {E3E30E51-C5AD-407B-AB43-985E4111474A} = {E3E30E51-C5AD-407B-AB43-985E4111474A}\r
                {A5498556-CE09-4095-8335-08FC8370552D} = {A5498556-CE09-4095-8335-08FC8370552D}\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC} = {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}\r
                {E8C01071-3B47-4A3F-9168-AA58A4635638} = {E8C01071-3B47-4A3F-9168-AA58A4635638}\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D} = {72EFB681-1397-4193-BBF9-CA05AC52B75D}\r
                {8ABB4F84-891A-4748-8507-F5494842173E} = {8ABB4F84-891A-4748-8507-F5494842173E}\r
                {4472028D-4ACF-474E-AA95-9B7E12B50F60} = {4472028D-4ACF-474E-AA95-9B7E12B50F60}\r
+               {5C6B6A95-2053-4593-9617-C4F176736D5A} = {5C6B6A95-2053-4593-9617-C4F176736D5A}\r
                {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9} = {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB} = {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}\r
                {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE} = {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20} = {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296} = {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}\r
+               {4F0A55DE-DAFD-4A0B-A03D-2C14CB77E08F} = {4F0A55DE-DAFD-4A0B-A03D-2C14CB77E08F}\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B} = {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF} = {4BE529FB-C2F2-49F7-A897-054B955564CF}\r
        EndProjectSection\r

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index ff78bde..245dbf5 100644 (file)
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -242,7 +242,11 @@ out everything for now, leaving these enabled as they are would make the install
 \r
             <Component Id="C__wingit" Guid="$(var.GuidGitLib)" Win64="$(var.Win64YesNo)">\r
               <File Id="F__wingit" ShortName="IGIT.EXE" Name="igit.exe" DiskId="1" Source="..\..\ext\gitexe\igit.exe" KeyPath="yes" />\r
-                         <File Id="F__libiconv2" ShortName="LIBICONV.DLL" Name="libiconv2.dll" DiskId="1" Source="..\..\ext\gitexe\libiconv2.dll" />\r
+                               <File Id="F__libiconv2" ShortName="LIBICONV.DLL" Name="libiconv2.dll" DiskId="1" Source="..\..\ext\gitexe\libiconv2.dll" />\r
+              <File Id="F__tgit" ShortName="TGIT.EXE"  Name="tgit.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\tgit.exe" />\r
+              <File Id="F__gitdll" ShortName="GITDLL.DLL"  Name="gitdll.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\gitdll.dll" />\r
+              <File Id="F__zlib" ShortName="ZLIB1.DLL" Name="zlib1.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\zlib1.dll" />\r
+              <File Id="F__curl" ShortName="libcurl.DLL" Name="libcurl.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\libcurl.dll" />\r
             </Component>\r
             \r
             <Component Id="C__TortoiseSVN" Guid="$(var.GuidTortoiseSVN)" Win64="$(var.Win64YesNo)">\r