X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FTortoiseGitSetup%2FTortoiseSVN.wxs;h=dca357b1f61c73bc00db260f4b17b2d4da44a43c;hp=fbde2bf2ea31bfb0ee90a277bac7f06b4562127d;hb=e91989d08580f982178d221c47ec02d3adc2953a;hpb=4a66919f2cca793ad96cfbbdbd940381723e0177

diff --git a/src/TortoiseGitSetup/TortoiseSVN.wxs b/src/TortoiseGitSetup/TortoiseSVN.wxs
index fbde2bf..dca357b 100644
--- a/src/TortoiseGitSetup/TortoiseSVN.wxs
+++ b/src/TortoiseGitSetup/TortoiseSVN.wxs
@@ -4,18 +4,18 @@
 	<Product
 	UpgradeCode="$(var.UpgradeGuid)"
 	Name="$(var.ProductName) $(var.VersionNumberUserVisible) $(var.PlatformUserVisible)"
-	Id="????????-????-????-????-????????????"
+	Id="*"
 	Version="$(var.VersionNumberInternal)"
-	Manufacturer="TortoiseSVN"
+	Manufacturer="TortoiseGit"
 	Language="1033">
 		<Package
-		Id="????????-????-????-????-????????????"
+		Id="*"
 		Keywords="$(var.PackageKeywords)"
 		Description="$(var.PackageDescription)"
 		Comments="$(var.PackageComments)"
 		Manufacturer="$(var.PackageManufacturer)"
 		InstallerVersion="300"
-		Platforms="$(var.PackagePlatforms)"
+		Platform="$(var.PackagePlatforms)"
 		Languages="1033"
 		Compressed="yes"
 		SummaryCodepage="1252"/>
@@ -26,19 +26,21 @@
 
 			<!-- flag is set if the install will trigger an upgrade of an existing install -->
 			<UpgradeVersion Property="PREVIOUSVERSIONSINSTALLED" Maximum="$(var.VersionNumberInternal)" IncludeMaximum="no" />
-		</Upgrade>
+    </Upgrade>
 
 		<Media Id="1" Cabinet="TSVN.cab" EmbedCab="yes" CompressionLevel="high" />
 
-		<Icon Id="TSVNIcon" src="..\Resources\Tortoise.ico" />
+		<Icon Id="TSVNIcon" SourceFile="..\Resources\Tortoise.ico" />
 
+		<Property Id="SSHRadio">Plink</Property>
+			  
 		<!-- Launch Condition related properties ................................................................................. -->
 		<Property Id="VERSIONIE">
 			<RegistrySearch Id="RegSearchIeVersion" Root="HKLM" Key="SOFTWARE\Microsoft\Internet Explorer" Name="Version" Type="raw" Win64="$(var.Win64YesNo)"/>
 		</Property>
 		<Condition Message="[ProductName] needs at least Internet Explorer 5">NOT ((VERSIONIE&lt;&lt;"1") OR (VERSIONIE&lt;&lt;"2") OR (VERSIONIE&lt;&lt;"3") OR (VERSIONIE&lt;&lt;"4"))</Condition>
 
-		<?if $(env.Platform) = "win32" ?>
+		<?if $(var.Platform) = "win32" ?>
 		<Property Id="GDIPLUSINSTALLED">
 			<DirectorySearch Id="WND" Path="[SystemFolder]">
 				<FileSearch LongName="GDIPlus.dll" />
@@ -61,16 +63,19 @@
 		</Property>
 		<CustomAction Id="Set_ShowChangelog" Property="ShowChangelog" Value="Yes" Return="check" />
 		<CustomAction Id="ShowChangelogAction" Property="TEXTEDITOR" ExeCommand="[INSTALLDIR]changelog.txt" Return="asyncNoWait" />
-		<CustomAction Id="ShowDonatePage" BinaryKey="CustomActionsDLL" DllEntry="OpenDonatePage" />
-		<CustomAction Id="KillCache" BinaryKey="CustomActionsDLL" DllEntry="TerminateCache" />
-		<Binary Id="CustomActionsDLL" src="..\..\bin\$(var.ReleasePath)\bin\CustomActions.dll" />
+	
+    <CustomAction Id="ShowDonatePage" BinaryKey="CustomActionsDLL" DllEntry="OpenDonatePage" />
+		
+
+    <CustomAction Id="KillCache" BinaryKey="CustomActionsDLL" DllEntry="TerminateCache" />
+		<Binary Id="CustomActionsDLL" SourceFile="..\..\bin\$(var.ReleasePath)\bin\CustomActions.dll" />
 
 		<!-- Unsafe-check properties and custom actions .......................................................................... -->
 		<Property Id="VSDUIANDADVERTISED">This advertised application will not be installed because it might be unsafe. Contact your administrator to change the installation user interface option of the package to basic.</Property>
 		<CustomAction Id="ERRCA_UIANDADVERTISED" Error="[VSDUIANDADVERTISED]" />
 
 		<!-- Figure out where a previous installation was, if any ................................................................ -->
-		<?if $(env.Platform) = "x64" ?>
+		<?if $(var.Platform) = "x64" ?>
 		<CustomAction Id="DefaultTargetDir" Property="INSTALLDIR" Value="[ProgramFiles64Folder]$(var.ProductName)" Execute="immediate" />
 		<Property Id="INSTALLDIR">
 			<RegistrySearch Id="PreviousInstallLocationRegistrySearch" Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Type="raw" Win64="$(var.Win64YesNo)"/>
@@ -81,13 +86,19 @@
 			<RegistrySearch Id="PreviousInstallLocationRegistrySearch" Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Type="raw" Win64="$(var.Win64YesNo)"/>
 		</Property>
 		<?endif ?>
-
+    
+	
+    <?include FeaturesFragment.wxi?>
+    <?include StructureFragment.wxi?>
+    <?include UIFragment.wxi?>
+    
+    <!--
 		<FragmentRef Id="StructureFragment"/>
 
 		<FragmentRef Id="FeaturesFragment" />
 
 		<FragmentRef Id="UIFragment" />
-
+    -->
 		<!-- Execute Sequencing ................................................................................................. -->
 		<AdminExecuteSequence />
 		<InstallExecuteSequence>
@@ -95,8 +106,11 @@
 			<AppSearch Sequence="1"></AppSearch>
 			<LaunchConditions After="AppSearch" />
 			<Custom Action="DefaultTargetDir" After="LaunchConditions">INSTALLDIR=""</Custom>
-			<RemoveExistingProducts After="FindRelatedProducts"><![CDATA[PREVIOUSVERSIONSINSTALLED OR (NOT NEWERVERSIONDETECTED AND OKTODOWNGRADE = 1)]]></RemoveExistingProducts>
-			<Custom Action="KillCache" After="RemoveExistingProducts">Installed</Custom>
+      
+			<RemoveExistingProducts After="InstallFinalize"><![CDATA[PREVIOUSVERSIONSINSTALLED OR (NOT NEWERVERSIONDETECTED AND OKTODOWNGRADE = 1)]]></RemoveExistingProducts>
+          
+      <Custom Action="KillCache" After="RemoveExistingProducts">Installed</Custom>
+      
 			<ScheduleReboot After="RegisterProduct" />
 		</InstallExecuteSequence>