Add TortoiseMerge Install

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 55bc337..d0271dd 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -62,10 +62,19 @@ int CGit::Run(CString cmd, CString* output)
 \r
        \r
        CloseHandle(pi.hThread);\r
+\r
+       WaitForSingleObject(pi.hProcess, INFINITE);\r
+       DWORD exitcode =0;\r
+\r
+       if(!GetExitCodeProcess(pi.hProcess,&exitcode))\r
+       {\r
+               return GIT_ERROR_GET_EXIT_CODE;\r
+       }\r
+\r
        CloseHandle(pi.hProcess);\r
 \r
        CloseHandle(hRead);\r
-       return GIT_SUCCESS;\r
+       return exitcode;\r
 }\r
 \r
 CString CGit::GetUserName(void)\r

diff --git a/src/Git/Git.h b/src/Git/Git.h
index f1f0d09..57652c3 100644 (file)
--- a/src/Git/Git.h
+++ b/src/Git/Git.h
@@ -6,7 +6,8 @@ enum
 {\r
        GIT_SUCCESS=0,\r
        GIT_ERROR_OPEN_PIP,\r
-       GIT_ERROR_CREATE_PROCESS\r
+       GIT_ERROR_CREATE_PROCESS,\r
+       GIT_ERROR_GET_EXIT_CODE\r
 };\r
 class CGit\r
 {\r

diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index ce2770a..97342d5 100644 (file)
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -30,8 +30,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixSetup", "TortoiseGitSetu
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TSVNCache", "TGitCache\TSVNCache.vcproj", "{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseMerge", "TortoiseMerge\TortoiseMerge.vcproj", "{8ABB4F84-891A-4748-8507-F5494842173E}"\r
-EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                debug_static|Mixed Platforms = debug_static|Mixed Platforms\r
@@ -248,26 +246,6 @@ Global
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.ActiveCfg = Release|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.Build.0 = Release|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x86.ActiveCfg = Release|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Mixed Platforms.ActiveCfg = debug_static|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Mixed Platforms.Build.0 = debug_static|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Win32.ActiveCfg = debug_static|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Win32.Build.0 = debug_static|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|x86.ActiveCfg = debug_static|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Win32.Build.0 = Debug|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|x86.ActiveCfg = Debug|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Mixed Platforms.ActiveCfg = release_static|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Mixed Platforms.Build.0 = release_static|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Win32.ActiveCfg = release_static|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Win32.Build.0 = release_static|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|x86.ActiveCfg = release_static|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Mixed Platforms.Build.0 = Release|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Win32.ActiveCfg = Release|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Win32.Build.0 = Release|Win32\r
-               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|x86.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/src/TortoiseGitSetup/FeaturesFragment.wxi b/src/TortoiseGitSetup/FeaturesFragment.wxi
index 22faf07..2d992d5 100644 (file)
--- a/src/TortoiseGitSetup/FeaturesFragment.wxi
+++ b/src/TortoiseGitSetup/FeaturesFragment.wxi
@@ -3,16 +3,17 @@
                <Feature Id="DefaultFeature" Level="1" ConfigurableDirectory="INSTALLDIR" Title="TortoiseGit" Absent="disallow"\r
                TypicalDefault="install" Description="The TortoiseGit package and dependencies." Display="expand" InstallDefault="local" >\r
                        <ComponentRef Id="C__infofiles" />\r
-<!--                   <ComponentRef Id="C__apr" />\r
-                       <ComponentRef Id="C__sasl" />\r
-                       <ComponentRef Id="C__gettext" />\r
--->\r
+                       <ComponentRef Id="C__apr" />\r
+<!--                   <ComponentRef Id="C__sasl" />\r
+-->                    <ComponentRef Id="C__gettext" />\r
+\r
                        <ComponentRef Id="C__help_en" />\r
                        <ComponentRef Id="C__TortoiseSVN" />\r
                        <ComponentRef Id="C__TortoiseSVNShortcuts" />\r
-<!--                   <ComponentRef Id="C__TortoiseMerge" />\r
+                       <ComponentRef Id="C__TortoiseMerge" />\r
                        <ComponentRef Id="C__TortoiseMergeShortcuts" />\r
-                       <ComponentRef Id="C__TortoiseBlame" />\r
+<!--                   \r
+      <ComponentRef Id="C__TortoiseBlame" />\r
                        <ComponentRef Id="C__TortoiseIDiff" />\r
                        <ComponentRef Id="C__TortoiseIDiffShortcuts" />\r
 -->\r

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 3c8f5ad..b7194de 100644 (file)
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -194,12 +194,12 @@
             <Environment Id="E__ASPDOTNETHACK" Action="create" Name="SVN_ASP_DOT_NET_HACK" Value="1" Permanent="yes" System="yes" />\r
           </Component>\r
           <Directory Id="D__Bin" ShortName="BIN" Name="bin" >\r
-<!--            \r
-            <Component Id="C__apr" Guid="$(var.GuidAPR)" Win64="$(var.Win64YesNo)">\r
-              <File Id="F__libapr" ShortName="LIBAPR.DLL" Name="libapr_tsvn.dll" DiskId="1" Source="..\..\ext\apr\release_$(var.PlatformPathExtension)\libapr_tsvn.dll" KeyPath="yes" />\r
-              <File Id="F__libaprutil" ShortName="LIBAPRUT.DLL" Name="libaprutil_tsvn.dll" DiskId="1" Source="..\..\ext\apr-util\release_$(var.PlatformPathExtension)\libaprutil_tsvn.dll" />\r
-           </Component>\r
---> \r
+           \r
+          <Component Id="C__apr" Guid="$(var.GuidAPR)" Win64="$(var.Win64YesNo)">\r
+             <File Id="F__libapr" ShortName="LIBAPR.DLL" Name="libapr_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\libapr_tsvn.dll" KeyPath="yes" />\r
+             <File Id="F__libaprutil" ShortName="LIBAPRUT.DLL" Name="libaprutil_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\libaprutil_tsvn.dll" />\r
+          </Component>\r
+\r
 <!--             <Component Id="C__sasl" Guid="$(var.GuidSASL)" Win64="$(var.Win64YesNo)">\r
              <File Id="F__libsasl" ShortName="LIBSASL.DLL" Name="libsasl.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\libsasl.dll" KeyPath="yes" />\r
               <File Id="F__saslANONYMOUS" ShortName="saslANON.DLL" Name="saslANONYMOUS.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslANONYMOUS.dll" />\r
@@ -210,10 +210,10 @@
               <File Id="F__saslPLAIN" ShortName="saslPLAI.DLL" Name="saslPLAIN.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslPLAIN.dll" />\r
            </Component>\r
 --> \r
-<!--            <Component Id="C__gettext" Guid="$(var.GuidGettext)" Win64="$(var.Win64YesNo)">\r
-              <File Id="F__intl" ShortName="INTL3_TS.DLL" Name="intl3_tsvn.dll" DiskId="1" Source="..\..\ext\libintl\libintl3-$(var.PlatformPathExtension)\bin\intl3_tsvn.dll" KeyPath="yes" />\r
+            <Component Id="C__gettext" Guid="$(var.GuidGettext)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__intl" ShortName="INTL3_TS.DLL" Name="intl3_tsvn.dll" DiskId="1" Source="..\..\ext\svnbin\intl3_tsvn.dll" KeyPath="yes" />\r
             </Component>\r
--->\r
+            \r
             <?if $(var.IncludeCrashReportDll) = 1 ?>\r
             <Component Id="C__crash" Guid="$(var.GuidCrashRpt)" Win64="$(var.Win64YesNo)">\r
               <File Id="F__crashrpt" ShortName="CRASHRPT.DLL" Name="CrashRpt.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\CrashRpt.dll" KeyPath="yes" />\r
@@ -283,12 +283,12 @@
               <Shortcut Id="S__RTFM" Directory="D_TortoisePrgMenu" ShortName="TSVN" Name="TortoiseGit" Advertise="no"\r
               Target="[INSTALLDIR]bin\TortoiseProc.exe" Description="TortoiseGit" Arguments="/command:rtfm" Show="normal" />\r
 -->\r
-              <Shortcut Id="S__TortoiseProc" Directory="D_TortoisePrgMenu" Name="Help" Advertise="no"\r
+            <Shortcut Id="S__TortoiseProc" Directory="D_TortoisePrgMenu" Name="Help" Advertise="no"\r
               Target="[INSTALLDIR]bin\TortoiseProc.exe" Description="Documentation about TortoiseGit" Arguments="/command:help" Show="normal" />\r
             </Component>\r
-<!--\r
+\r
             <Component Id="C__TortoiseMerge" Guid="$(var.GuidTortoiseMerge)" Win64="$(var.Win64YesNo)">\r
-              <File Id="F__TortoiseMerge" ShortName="TMERGE.EXE" Name="TortoiseMerge.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseMerge.exe" KeyPath="yes" />\r
+              <File Id="F__TortoiseMerge" ShortName="TMERGE.EXE" Name="TortoiseMerge.exe" DiskId="1" Source="..\..\ext\svnbin\TortoiseMerge.exe" KeyPath="yes" />\r
             </Component>\r
 \r
             <Component Id="C__TortoiseMergeShortcuts" Guid="$(var.GuidTortoiseMergeShortcuts)" Win64="$(var.Win64YesNo)">\r
@@ -296,7 +296,7 @@
               <Shortcut Id="S__TortoiseMerge" Directory="D_TortoisePrgMenu" ShortName="TMERGE" Name="TortoiseMerge" Advertise="no"\r
               Target="[INSTALLDIR]bin\TortoiseMerge.exe" Description="View Diff's, Merge Diff's, Resolve Conflicted Files and Apply Patches" Show="normal" />\r
             </Component>\r
--->\r
+\r
             <Component Id="C__Sounds" Guid="$(var.GuidSounds)" Win64="$(var.Win64YesNo)">\r
               <File Id="F__sounderror" ShortName="TERROR.WAV" Name="TortoiseSVN_error.wav" DiskId="1" Source="..\Resources\TortoiseSVN_error.wav" KeyPath="yes" />\r
               <File Id="F__soundwarning" ShortName="TWARN.WAV" Name="TortoiseSVN_Warning.wav" DiskId="1" Source="..\Resources\TortoiseSVN_Warning.wav" />\r

diff --git a/src/TortoiseGitSetup/UIFragment.wxi b/src/TortoiseGitSetup/UIFragment.wxi
index ab2b745..b6f7775 100644 (file)
--- a/src/TortoiseGitSetup/UIFragment.wxi
+++ b/src/TortoiseGitSetup/UIFragment.wxi
@@ -149,6 +149,37 @@
         <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />\r
       </Dialog>\r
 \r
+      <Dialog Id="MSysGitLocation" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">\r
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]">\r
+          <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>\r
+        </Control>\r
+        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]">\r
+          <Publish Event="SetTargetPath" Value="TARGETDIR">1</Publish>\r
+          <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>\r
+        </Control>\r
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[ButtonText_Cancel]">\r
+          <Publish Event="SpawnDialog" Value="CancelPopup">1</Publish>\r
+        </Control>\r
+\r
+        <Control Id="Text" Type="Text" X="25" Y="80" Width="320" Height="10" TabSkip="no">\r
+          <Text>&amp;Input MsysGit install path or click browse.</Text>\r
+        </Control>\r
+        <Control Id="PathEdit" Type="PathEdit" X="25" Y="93" Width="320" Height="18" Property="MSYSGITDIR" />\r
+        <Control Id="Browse" Type="PushButton" X="289" Y="119" Width="56" Height="17" Text="[ButtonText_Browse]">\r
+          <Publish Event="SpawnDialog" Value="AdminBrowseDlg">1</Publish>\r
+        </Control>\r
+\r
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />\r
+        <Control Id="Title" Type="Text" X="155" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" RightAligned="yes">\r
+          <Text>[DlgTitleFont]Network Location</Text>\r
+        </Control>\r
+        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />\r
+        <Control Id="DialogDescription" Type="Text" X="75" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" RightAligned="yes">\r
+          <Text>Please specify a network location for the server image of [ProductName] product</Text>\r
+        </Control>\r
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />\r
+      </Dialog>\r
+\r
       <Dialog Id="AdminWelcomeDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">\r
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="[ButtonText_Back]" />\r
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]">\r
@@ -427,7 +458,7 @@
         </Control>\r
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]">\r
           <Publish Event="SpawnWaitDialog" Value="WaitForCostingPopup">CostingComplete = 1</Publish>\r
-          <Publish Event="NewDialog" Value="CustomizeDlg">"Yes"</Publish>\r
+          <Publish Event="NewDialog" Value="MSysGitLocation">"Yes"</Publish>\r
           <Publish Property="InstallMode" Value="Custom">1</Publish>\r
           <Condition Action="disable"><![CDATA[IAgree <> "Yes"]]></Condition>\r
           <Condition Action="enable">IAgree = "Yes"</Condition>\r

diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi
index 665602c..5772d1c 100644 (file)
--- a/src/TortoiseGitSetup/VersionNumberInclude.wxi
+++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi
@@ -2,6 +2,6 @@
 <Include Id="VersionNumberInclude">\r
        <?define MajorVersion="0" ?>\r
        <?define MinorVersion="1" ?>\r
-       <?define MicroVersion="0" ?>\r
+       <?define MicroVersion="1" ?>\r
        <?define BuildVersion="0" ?>\r
 </Include>\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
index 90b134b..ee3cfa3 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
+++ b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:repocreate /path:&quot;D:\test2&quot;"\r
+                               CommandArguments="/command:commit /path:&quot;D:\test2&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r