Success Build TortoiseMerge release version and modify install script

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

diff --git a/ext/build/xml.vcproj b/ext/build/xml.vcproj
index f6c32c0..03b050b 100644 (file)
--- a/ext/build/xml.vcproj
+++ b/ext/build/xml.vcproj
@@ -90,7 +90,7 @@
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory=".\LibR"\r
+                       IntermediateDirectory="..\..\obj\xml\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
@@ -116,7 +116,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="&quot;..\apr-util\xml\expat&quot;;."\r
+                               AdditionalIncludeDirectories="&quot;..\apr-util\xml\expat\lib&quot;;."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
@@ -141,7 +141,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="LibR\xml.lib"\r
+                               OutputFile="$(OutDir)/xml.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r

diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index 10f3eb5..ae7a548 100644 (file)
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -79,8 +79,16 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SshAskPass", "SshAskPass\SshAskPass.vcproj", "{E8C01071-3B47-4A3F-9168-AA58A4635638}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseMerge", "TortoiseMerge\TortoiseMerge.vcproj", "{8ABB4F84-891A-4748-8507-F5494842173E}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60} = {4472028D-4ACF-474E-AA95-9B7E12B50F60}\r
+               {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9} = {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}\r
+               {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE} = {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "..\ext\build\xml.vcproj", "{AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {4472028D-4ACF-474E-AA95-9B7E12B50F60} = {4472028D-4ACF-474E-AA95-9B7E12B50F60}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "..\ext\build\libapr.vcproj", "{4472028D-4ACF-474E-AA95-9B7E12B50F60}"\r
 EndProject\r

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 797fa9e..4dd380a 100644 (file)
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -211,8 +211,8 @@ out everything for now, leaving these enabled as they are would make the install
           <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\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
+             <File Id="F__libapr" ShortName="LIBAPR.DLL" Name="libapr_tsvn.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\libapr_tsvn.dll" KeyPath="yes" />\r
+             <File Id="F__libaprutil" ShortName="LIBAPRUT.DLL" Name="libaprutil_tsvn.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\libaprutil_tsvn.dll" />\r
           </Component>\r
 \r
 <!--             <Component Id="C__sasl" Guid="$(var.GuidSASL)" Win64="$(var.Win64YesNo)">\r
@@ -226,7 +226,7 @@ out everything for now, leaving these enabled as they are would make the install
            </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\svnbin\intl3_tsvn.dll" KeyPath="yes" />\r
+              <File Id="F__intl" Name="intl3_tsvn.dll" DiskId="1" Source="..\..\ext\libintl\libintl3-$(var.PlatformPathExtension)\bin\intl3_tsvn.dll" KeyPath="yes" />\r
             </Component>\r
             \r
             <?if $(var.IncludeCrashReportDll) = 1 ?>\r
@@ -318,7 +318,7 @@ out everything for now, leaving these enabled as they are would make the install
                        </Component>\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="..\..\ext\svnbin\TortoiseMerge.exe" KeyPath="yes" />\r
+              <File Id="F__TortoiseMerge" ShortName="TMERGE.EXE" Name="TortoiseMerge.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseMerge.exe" KeyPath="yes" />\r
             </Component>\r
 \r
             <Component Id="C__TortoiseMergeShortcuts" Guid="$(var.GuidTortoiseMergeShortcuts)" Win64="$(var.Win64YesNo)">\r

diff --git a/src/TortoiseMerge/TortoiseMerge.vcproj b/src/TortoiseMerge/TortoiseMerge.vcproj
index 4372f49..6754576 100644 (file)
--- a/src/TortoiseMerge/TortoiseMerge.vcproj
+++ b/src/TortoiseMerge/TortoiseMerge.vcproj
@@ -158,7 +158,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../ext/Subversion\release_win32\libsvn_diff-nonet.lib ../../ext/Subversion\release_win32\libsvn_subr-nonet.lib ../../ext/Subversion\release_win32\libsvn_client-nonet.lib ../../ext/apr\release_win32\libapr_tsvn.lib ../../ext/apr-util\release_win32\libaprutil_tsvn.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib ../../ext/Subversion\release_win32\libsvn_wc-nonet.lib ../../ext/Subversion\release_win32\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\release_win32\xml.lib"\r
+                               AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../bin\release\bin\libapr_tsvn.lib ../../bin\release\bin\libaprutil_tsvn.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib ../../bin\release\bin\xml.lib libcpmt.lib"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -1872,6 +1872,30 @@
                                                UsePrecompiledHeader="0"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="release_static|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="debug_static|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\libsvn_diff\infblock.c"\r
@@ -2172,6 +2196,30 @@
                                                UsePrecompiledHeader="0"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="release_static|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="debug_static|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\libsvn_diff\md5.c"\r
@@ -2248,6 +2296,38 @@
                        <File\r
                                RelativePath=".\libsvn_diff\pool.c"\r
                                >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="release_static|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="debug_static|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath=".\libsvn_diff\sha1.c"\r