OSDN Git Service

Update Version Number
[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitSetup / TortoiseSVN.wxs
index 9d2c3f6..dca357b 100644 (file)
@@ -6,7 +6,7 @@
        Name="$(var.ProductName) $(var.VersionNumberUserVisible) $(var.PlatformUserVisible)"\r
        Id="*"\r
        Version="$(var.VersionNumberInternal)"\r
-       Manufacturer="TortoiseSVN"\r
+       Manufacturer="TortoiseGit"\r
        Language="1033">\r
                <Package\r
                Id="*"\r
 \r
                        <!-- flag is set if the install will trigger an upgrade of an existing install -->\r
                        <UpgradeVersion Property="PREVIOUSVERSIONSINSTALLED" Maximum="$(var.VersionNumberInternal)" IncludeMaximum="no" />\r
-               </Upgrade>\r
+    </Upgrade>\r
 \r
                <Media Id="1" Cabinet="TSVN.cab" EmbedCab="yes" CompressionLevel="high" />\r
 \r
                <Icon Id="TSVNIcon" SourceFile="..\Resources\Tortoise.ico" />\r
 \r
+               <Property Id="SSHRadio">Plink</Property>\r
+                         \r
                <!-- Launch Condition related properties ................................................................................. -->\r
                <Property Id="VERSIONIE">\r
                        <RegistrySearch Id="RegSearchIeVersion" Root="HKLM" Key="SOFTWARE\Microsoft\Internet Explorer" Name="Version" Type="raw" Win64="$(var.Win64YesNo)"/>\r
                </Property>\r
                <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>\r
 \r
-               <?if $(env.Platform) = "win32" ?>\r
+               <?if $(var.Platform) = "win32" ?>\r
                <Property Id="GDIPLUSINSTALLED">\r
                        <DirectorySearch Id="WND" Path="[SystemFolder]">\r
-                               <FileSearch Name="GDIPlus.dll" />\r
+                               <FileSearch LongName="GDIPlus.dll" />\r
                        </DirectorySearch>\r
                </Property>\r
                <Condition Message="You must have GDIPlus installed. Please download it from Microsoft and copy the GDIPlus.dll into your Windows\System32 folder."><![CDATA[((GDIPLUSINSTALLED<>"") OR (VersionNT <> 500))]]></Condition>\r
@@ -49,7 +51,7 @@
 \r
                <Property Id="ShowChangelogCheck">1</Property>\r
                <Property Id="ALLUSERS">1</Property>\r
-\r
+               \r
                <Condition Message="[ProductName] requires a Windows NT based OS (Windows 2000 or later, specifically).">VersionNT</Condition>\r
                <Condition Message="[ProductName] requires Windows 2000 or later."><![CDATA[VersionNT >= 500]]></Condition>\r
 \r
                </Property>\r
                <CustomAction Id="Set_ShowChangelog" Property="ShowChangelog" Value="Yes" Return="check" />\r
                <CustomAction Id="ShowChangelogAction" Property="TEXTEDITOR" ExeCommand="[INSTALLDIR]changelog.txt" Return="asyncNoWait" />\r
-               <CustomAction Id="ShowDonatePage" BinaryKey="CustomActionsDLL" DllEntry="OpenDonatePage" />\r
-               <CustomAction Id="KillCache" BinaryKey="CustomActionsDLL" DllEntry="TerminateCache" />\r
+       \r
+    <CustomAction Id="ShowDonatePage" BinaryKey="CustomActionsDLL" DllEntry="OpenDonatePage" />\r
+               \r
+\r
+    <CustomAction Id="KillCache" BinaryKey="CustomActionsDLL" DllEntry="TerminateCache" />\r
                <Binary Id="CustomActionsDLL" SourceFile="..\..\bin\$(var.ReleasePath)\bin\CustomActions.dll" />\r
 \r
                <!-- Unsafe-check properties and custom actions .......................................................................... -->\r
@@ -70,7 +75,7 @@
                <CustomAction Id="ERRCA_UIANDADVERTISED" Error="[VSDUIANDADVERTISED]" />\r
 \r
                <!-- Figure out where a previous installation was, if any ................................................................ -->\r
-               <?if $(env.Platform) = "x64" ?>\r
+               <?if $(var.Platform) = "x64" ?>\r
                <CustomAction Id="DefaultTargetDir" Property="INSTALLDIR" Value="[ProgramFiles64Folder]$(var.ProductName)" Execute="immediate" />\r
                <Property Id="INSTALLDIR">\r
                        <RegistrySearch Id="PreviousInstallLocationRegistrySearch" Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Type="raw" Win64="$(var.Win64YesNo)"/>\r
                        <RegistrySearch Id="PreviousInstallLocationRegistrySearch" Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Type="raw" Win64="$(var.Win64YesNo)"/>\r
                </Property>\r
                <?endif ?>\r
-\r
-               <DirectoryRef Id="TARGETDIR"/>\r
-\r
-               <FeatureRef Id="DefaultFeature" />\r
-\r
-               <UIRef Id="UIFrag" />\r
-\r
+    \r
+       \r
+    <?include FeaturesFragment.wxi?>\r
+    <?include StructureFragment.wxi?>\r
+    <?include UIFragment.wxi?>\r
+    \r
+    <!--\r
+               <FragmentRef Id="StructureFragment"/>\r
+\r
+               <FragmentRef Id="FeaturesFragment" />\r
+\r
+               <FragmentRef Id="UIFragment" />\r
+    -->\r
                <!-- Execute Sequencing ................................................................................................. -->\r
                <AdminExecuteSequence />\r
                <InstallExecuteSequence>\r
                        <AppSearch Sequence="1"></AppSearch>\r
                        <LaunchConditions After="AppSearch" />\r
                        <Custom Action="DefaultTargetDir" After="LaunchConditions">INSTALLDIR=""</Custom>\r
+      \r
                        <RemoveExistingProducts After="InstallFinalize"><![CDATA[PREVIOUSVERSIONSINSTALLED OR (NOT NEWERVERSIONDETECTED AND OKTODOWNGRADE = 1)]]></RemoveExistingProducts>\r
-                       <Custom Action="KillCache" After="RemoveExistingProducts">Installed</Custom>\r
+          \r
+      <Custom Action="KillCache" After="RemoveExistingProducts">Installed</Custom>\r
+      \r
                        <ScheduleReboot After="RegisterProduct" />\r
                </InstallExecuteSequence>\r
 \r