Update Version Number

[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitSetup / TortoiseSVN.wxs

diff --git a/src/TortoiseGitSetup/TortoiseSVN.wxs b/src/TortoiseGitSetup/TortoiseSVN.wxs
index fbde2bf..dca357b 100644 (file)
--- a/src/TortoiseGitSetup/TortoiseSVN.wxs
+++ b/src/TortoiseGitSetup/TortoiseSVN.wxs
@@ -4,18 +4,18 @@
        <Product\r
        UpgradeCode="$(var.UpgradeGuid)"\r
        Name="$(var.ProductName) $(var.VersionNumberUserVisible) $(var.PlatformUserVisible)"\r
        <Product\r
        UpgradeCode="$(var.UpgradeGuid)"\r
        Name="$(var.ProductName) $(var.VersionNumberUserVisible) $(var.PlatformUserVisible)"\r

-       Id="????????-????-????-????-????????????"\r
+       Id="*"\r

        Version="$(var.VersionNumberInternal)"\r
        Version="$(var.VersionNumberInternal)"\r

-       Manufacturer="TortoiseSVN"\r
+       Manufacturer="TortoiseGit"\r

        Language="1033">\r
                <Package\r
        Language="1033">\r
                <Package\r

-               Id="????????-????-????-????-????????????"\r
+               Id="*"\r

                Keywords="$(var.PackageKeywords)"\r
                Description="$(var.PackageDescription)"\r
                Comments="$(var.PackageComments)"\r
                Manufacturer="$(var.PackageManufacturer)"\r
                InstallerVersion="300"\r
                Keywords="$(var.PackageKeywords)"\r
                Description="$(var.PackageDescription)"\r
                Comments="$(var.PackageComments)"\r
                Manufacturer="$(var.PackageManufacturer)"\r
                InstallerVersion="300"\r

-               Platforms="$(var.PackagePlatforms)"\r
+               Platform="$(var.PackagePlatforms)"\r

                Languages="1033"\r
                Compressed="yes"\r
                SummaryCodepage="1252"/>\r
                Languages="1033"\r
                Compressed="yes"\r
                SummaryCodepage="1252"/>\r


@@ -26,19 +26,21 @@
 \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
 \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
 \r
                <Media Id="1" Cabinet="TSVN.cab" EmbedCab="yes" CompressionLevel="high" />\r
 \r

-               <Icon Id="TSVNIcon" src="..\Resources\Tortoise.ico" />\r
+               <Icon Id="TSVNIcon" SourceFile="..\Resources\Tortoise.ico" />\r

 \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
                <!-- 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 LongName="GDIPlus.dll" />\r
                <Property Id="GDIPLUSINSTALLED">\r
                        <DirectorySearch Id="WND" Path="[SystemFolder]">\r
                                <FileSearch LongName="GDIPlus.dll" />\r


@@ -61,16 +63,19 @@
                </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
                </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
-               <Binary Id="CustomActionsDLL" src="..\..\bin\$(var.ReleasePath)\bin\CustomActions.dll" />\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
                <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>\r
                <CustomAction Id="ERRCA_UIANDADVERTISED" Error="[VSDUIANDADVERTISED]" />\r
 \r
                <!-- Figure out where a previous installation was, if any ................................................................ -->\r
 \r
                <!-- Unsafe-check properties and custom actions .......................................................................... -->\r
                <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>\r
                <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
                <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


@@ -81,13 +86,19 @@
                        <RegistrySearch Id="PreviousInstallLocationRegistrySearch" Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Type="raw" Win64="$(var.Win64YesNo)"/>\r
                </Property>\r
                <?endif ?>\r
                        <RegistrySearch Id="PreviousInstallLocationRegistrySearch" Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Type="raw" Win64="$(var.Win64YesNo)"/>\r
                </Property>\r
                <?endif ?>\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
                <FragmentRef Id="StructureFragment"/>\r
 \r
                <FragmentRef Id="FeaturesFragment" />\r
 \r
                <FragmentRef Id="UIFragment" />\r

-\r
+    -->\r

                <!-- Execute Sequencing ................................................................................................. -->\r
                <AdminExecuteSequence />\r
                <InstallExecuteSequence>\r
                <!-- Execute Sequencing ................................................................................................. -->\r
                <AdminExecuteSequence />\r
                <InstallExecuteSequence>\r


@@ -95,8 +106,11 @@
                        <AppSearch Sequence="1"></AppSearch>\r
                        <LaunchConditions After="AppSearch" />\r
                        <Custom Action="DefaultTargetDir" After="LaunchConditions">INSTALLDIR=""</Custom>\r
                        <AppSearch Sequence="1"></AppSearch>\r
                        <LaunchConditions After="AppSearch" />\r
                        <Custom Action="DefaultTargetDir" After="LaunchConditions">INSTALLDIR=""</Custom>\r

-                       <RemoveExistingProducts After="FindRelatedProducts"><![CDATA[PREVIOUSVERSIONSINSTALLED OR (NOT NEWERVERSIONDETECTED AND OKTODOWNGRADE = 1)]]></RemoveExistingProducts>\r
-                       <Custom Action="KillCache" After="RemoveExistingProducts">Installed</Custom>\r
+      \r
+                       <RemoveExistingProducts After="InstallFinalize"><![CDATA[PREVIOUSVERSIONSINSTALLED OR (NOT NEWERVERSIONDETECTED AND OKTODOWNGRADE = 1)]]></RemoveExistingProducts>\r
+          \r
+      <Custom Action="KillCache" After="RemoveExistingProducts">Installed</Custom>\r
+      \r

                        <ScheduleReboot After="RegisterProduct" />\r
                </InstallExecuteSequence>\r
 \r
                        <ScheduleReboot After="RegisterProduct" />\r
                </InstallExecuteSequence>\r
 \r