[gurtle] r229 committed - (Fixes issue #49) : different uuids for 32- and 64 bit versions...

2 views

Skip to first unread message

gur...@googlecode.com

unread,

Apr 11, 2010, 3:57:12 AM4/11/10

to gurtle-...@googlegroups.com

Revision: 229
Author: tortoisesvn
Date: Sun Apr 11 00:56:37 2010
Log: (Fixes issue #49) : different uuids for 32- and 64 bit versions
* replace the "Any CPU" target with specific targets for x86 and x64
* use a different uuid for the x64 and x86 targets
* build both targets with the build script
* adjust the wix scripts to use the different uuid in the registry settings

Update issue #49
Note: after this change, you have to configure Gurtle again with
TortoiseSVN on x64 OS since the uuid for that has changed.
TortoiseSVN on trunk (use a nightly build) also has a new
bugtraq:provideruuid64 property which you should set.

http://code.google.com/p/gurtle/source/detail?r=229

Modified:
/trunk/build.cmd
/trunk/src/Gurtle/Gurtle.csproj
/trunk/src/Gurtle/Plugin.cs
/trunk/src/Gurtle.sln
/trunk/src/Setup/MergeModule.wxs
/trunk/src/Setup/Setup.wxs

=======================================
--- /trunk/build.cmd Tue Aug 25 10:01:41 2009
+++ /trunk/build.cmd Sun Apr 11 00:56:37 2010
@@ -50,7 +50,8 @@
echo ^</Include^> >> src\setup\VersionNumberInclude.wxi

for %%i in (Debug Release) do (
- "%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild"
/p:Configuration=%%i src\Gurtle.sln
+ "%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild"
/p:Configuration=%%i /p:Platform=x86 src\Gurtle.sln
+ "%SystemRoot%\Microsoft.NET\Framework\v3.5\msbuild"
/p:Configuration=%%i /p:Platform=x64 src\Gurtle.sln
)

:: build the installer
=======================================
--- /trunk/src/Gurtle/Gurtle.csproj Thu Jan 21 13:43:48 2010
+++ /trunk/src/Gurtle/Gurtle.csproj Sun Apr 11 00:56:37 2010
@@ -16,22 +16,37 @@
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|
AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|
x64' ">
<DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\bin\Debug\</OutputPath>
+ <OutputPath>..\..\bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|
AnyCPU' ">
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|
x64' ">
+ <OutputPath>..\..\bin\x64\Release\</OutputPath>
+ <DefineConstants>TRACE;WIN64</DefineConstants>
+ <Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
+ <PlatformTarget>x64</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|
x86' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>..\..\bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|
x86' ">
+ <OutputPath>..\..\bin\x86\Release\</OutputPath>
+ <DefineConstants>TRACE;WIN32</DefineConstants>
<Optimize>true</Optimize>
- <OutputPath>..\..\bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
=======================================
--- /trunk/src/Gurtle/Plugin.cs Wed Oct 14 11:21:55 2009
+++ /trunk/src/Gurtle/Plugin.cs Sun Apr 11 00:56:37 2010
@@ -41,7 +41,11 @@
#endregion

[ComVisible(true)]
+#if WIN64
+ [Guid("A0557FA7-7C95-485b-8F40-31303F762C57")]
+#else
[Guid("91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E")]
+#endif
[ClassInterface(ClassInterfaceType.None)]
public sealed class Plugin : IBugTraqProvider2
{
=======================================
--- /trunk/src/Gurtle.sln Mon May 4 12:16:53 2009
+++ /trunk/src/Gurtle.sln Sun Apr 11 00:56:37 2010
@@ -5,6 +5,8 @@
ProjectSection(SolutionItems) = preProject
..\build.cmd = ..\build.cmd
..\COPYING.txt = ..\COPYING.txt
+ Setup\MergeModule.wxs = Setup\MergeModule.wxs
+ Setup\Setup.wxs = Setup\Setup.wxs
TestGurtle.cmd = TestGurtle.cmd
TestGurtle.py = TestGurtle.py
EndProjectSection
@@ -13,14 +15,20 @@
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Debug|Any CPU.ActiveCfg = Debug|
Any CPU
- {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Debug|Any CPU.Build.0 = Debug|Any
CPU
- {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Release|Any CPU.ActiveCfg =
Release|Any CPU
- {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Release|Any CPU.Build.0 = Release|
Any CPU
+ {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Debug|x64.ActiveCfg = Debug|x64
+ {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Debug|x64.Build.0 = Debug|x64
+ {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Debug|x86.ActiveCfg = Debug|x86
+ {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Debug|x86.Build.0 = Debug|x86
+ {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Release|x64.ActiveCfg = Release|
x64
+ {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Release|x64.Build.0 = Release|x64
+ {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Release|x86.ActiveCfg = Release|
x86
+ {43B56168-AC09-49A4-8BC8-F35B8606DB59}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
=======================================
--- /trunk/src/Setup/MergeModule.wxs Tue Aug 25 10:01:41 2009
+++ /trunk/src/Setup/MergeModule.wxs Sun Apr 11 00:56:37 2010
@@ -1,72 +1,75 @@
<?xml version='1.0' encoding='windows-1252'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
- <?include VersionNumberInclude.wxi?>
-

- <?if $(env.Platform)=x64 ?>
- <?define Win64YesNo="yes" ?>
- <?define UpgradeCode = "E573F04A-CFBF-45b4-9026-3CF8221E158B" ?>
- <?define cf="CommonFiles64Folder" ?>
- <?else ?>
- <?define Win64YesNo="no" ?>
- <?define UpgradeCode = "FE804E0B-B1F7-4cad-8C2A-DCE004D46C71" ?>
- <?define cf="CommonFilesFolder" ?>
- <?endif ?>
-
- <Module Id='Gurtle' Language='0'
Version='$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)'>
- <Package Id='$(var.UpgradeCode)' Keywords='Merge Module'
+ <?if $(env.Platform)=x64 ?>
+ <?define Win64YesNo="yes" ?>
+ <?define UpgradeCode = "E573F04A-CFBF-45b4-9026-3CF8221E158B" ?>
+ <?define COMGuid = "{A0557FA7-7C95-485b-8F40-31303F762C57}" ?>
+ <?define cf="CommonFiles64Folder" ?>
+ <?else ?>
+ <?define Win64YesNo="no" ?>
+ <?define UpgradeCode = "FE804E0B-B1F7-4cad-8C2A-DCE004D46C71" ?>
+ <?define COMGuid = "{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}" ?>
+ <?define cf="CommonFilesFolder" ?>
+ <?endif ?>
+
+ <Module Id='Gurtle' Language='0'
Version='$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)'>
+ <Package Id='$(var.UpgradeCode)' Keywords='Merge Module'
Description="IBugTraqProvider for Google Code Hosting"
Comments='http://code.google.com/p/gurtle/' Manufacturer='Gurtle'
- InstallerVersion='200' Languages='1033' SummaryCodepage='1252'
+ InstallerVersion='200' Languages='1033' SummaryCodepage='1252'
Platform='$(env.Platform)' />
-
- <Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='$(var.cf)' Name='Common'>
- <Directory Id='Gurtle' Name='Gurtle' />
- </Directory>
- </Directory>
-
- <DirectoryRef Id='Gurtle'>
- <Component Id='CoreComponent'
Guid='39414E3C-C9FF-40eb-B59F-095D85082234' Win64='$(var.Win64YesNo)'>
- <File Id='Gurtle.DLL' Name='Gurtle.dll'
- Source='../../bin/release/Gurtle.dll' Vital='yes'>
- </File>
- <File Id='Gurtle.PDB' Name='Gurtle.pdb'
- Source='../../bin/release/Gurtle.pdb' Vital='no'>
- </File>
- <File Id='COPYING.TXT' Name='COPYING.txt'
- Source='../../COPYING.txt' Vital='yes'>
- </File>
- <RegistryKey Root="HKLM"
Key="Software\Classes\Gurtle.Plugin" Action="createAndRemoveOnUninstall" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\Gurtle.Plugin" Value="Gurtle
$(var.MajorVersion).$(var.MinorVersion) (Google Code)" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\Gurtle.Plugin\CLSID"
Value="{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}" Type="string" />
-
-
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}"
Value="Gurtle $(var.MajorVersion).$(var.MinorVersion) (Google Code)"
Type="string" />
- <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}"
Action="createAndRemoveOnUninstall" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Value="mscoree.dll" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Name="ThreadingModel" Value="Both" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Name="Class" Value="Gurtle.Plugin" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Name="Assembly" Value="Gurtle,
Version=$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion),
Culture=neutral, PublicKeyToken=null" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Name="RuntimeVersion" Value="v2.0.50727" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Name="CodeBase" Value="[INSTALLDIR]Gurtle.dll" Type="string" />
-
- <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InprocServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Action="createAndRemoveOnUninstall" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="Class" Value="Gurtle.Plugin" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="Assembly" Value="Gurtle,
Version=$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion),
Culture=neutral, PublicKeyToken=null" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="RuntimeVersion" Value="v2.0.50727" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="CodeBase" Value="[INSTALLDIR]Gurtle.dll" Type="string" />
-
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\ProgId"
Value="Gurtle.Plugin" Type="string" />
-
- <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\Implemented
Categories\{62C8FE65-4EBB-45E7-B440-6E39B2CDBF29}"
Action="createAndRemoveOnUninstall" />
- <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\Implemented
Categories\{3494FA92-B139-4730-9591-01135D5E7831}"
Action="createAndRemoveOnUninstall" />
-
- </Component>
- </DirectoryRef>
-
- </Module>
+
+ <Directory Id='TARGETDIR' Name='SourceDir'>
+ <Directory Id='$(var.cf)' Name='Common'>
+ <Directory Id='Gurtle' Name='Gurtle' />
+ </Directory>
+ </Directory>
+
+ <DirectoryRef Id='Gurtle'>
+ <Component Id='CoreComponent'
Guid='39414E3C-C9FF-40eb-B59F-095D85082234' Win64='$(var.Win64YesNo)'>
+ <?if $(env.Platform)=x64 ?>
+ <File Id='Gurtle.DLL' Name='Gurtle.dll'
Source='../../bin/x64/release/Gurtle.dll' Vital='yes' />
+ <File Id='Gurtle.PDB' Name='Gurtle.pdb'
Source='../../bin/x64/release/Gurtle.pdb' Vital='no' />
+ <?else ?>
+ <File Id='Gurtle.DLL' Name='Gurtle.dll'
Source='../../bin/x86/release/Gurtle.dll' Vital='yes' />
+ <File Id='Gurtle.PDB' Name='Gurtle.pdb'
Source='../../bin/x86/release/Gurtle.pdb' Vital='no' />
+ <?endif ?>
+ <File Id='COPYING.TXT' Name='COPYING.txt'
+ Source='../../COPYING.txt' Vital='yes'>
+ </File>
+ <RegistryKey Root="HKLM" Key="Software\Classes\Gurtle.Plugin"
Action="createAndRemoveOnUninstall" />
+ <RegistryValue Root="HKLM" Key="Software\Classes\Gurtle.Plugin"
Value="Gurtle $(var.MajorVersion).$(var.MinorVersion) (Google Code)"
Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\Gurtle.Plugin\CLSID" Value="$(var.COMGuid)"
Type="string" />
+
+
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)" Value="Gurtle
$(var.MajorVersion).$(var.MinorVersion) (Google Code)" Type="string" />
+ <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)"
Action="createAndRemoveOnUninstall" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32"
Value="mscoree.dll" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32"
Name="ThreadingModel" Value="Both" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32" Name="Class"
Value="Gurtle.Plugin" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32" Name="Assembly"
Value="Gurtle,
Version=$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion),
Culture=neutral, PublicKeyToken=null" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32"
Name="RuntimeVersion" Value="v2.0.50727" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32" Name="CodeBase"
Value="[INSTALLDIR]Gurtle.dll" Type="string" />
+
+ <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InprocServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Action="createAndRemoveOnUninstall" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="Class" Value="Gurtle.Plugin" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="Assembly" Value="Gurtle,
Version=$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion),
Culture=neutral, PublicKeyToken=null" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="RuntimeVersion" Value="v2.0.50727" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="CodeBase" Value="[INSTALLDIR]Gurtle.dll" Type="string" />
+
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\ProgId" Value="Gurtle.Plugin"
Type="string" />
+
+ <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\Implemented
Categories\{62C8FE65-4EBB-45E7-B440-6E39B2CDBF29}"
Action="createAndRemoveOnUninstall" />
+ <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\Implemented
Categories\{3494FA92-B139-4730-9591-01135D5E7831}"
Action="createAndRemoveOnUninstall" />
+
+ </Component>
+ </DirectoryRef>
+
+ </Module>
</Wix>
=======================================
--- /trunk/src/Setup/Setup.wxs Tue Aug 25 10:01:41 2009
+++ /trunk/src/Setup/Setup.wxs Sun Apr 11 00:56:37 2010
@@ -1,22 +1,24 @@
<?xml version='1.0' encoding='windows-1252'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
- <?include VersionNumberInclude.wxi?>
-

- <Package Id='*' Keywords='Installer'
+ <Package Id='*' Keywords='Installer'
Description="IBugTraqProvider for Google Code Hosting"
Comments='http://code.google.com/p/gurtle/' Manufacturer='Gurtle'
- InstallerVersion='200' Languages='1033' Compressed='yes'
SummaryCodepage='1252'
+ InstallerVersion='200' Languages='1033' Compressed='yes'
SummaryCodepage='1252'
Platform='$(env.Platform)' />

- <Upgrade Id="$(var.UpgradeCode)" >
- 
- <UpgradeVersion Property="PREVIOUSVERSIONSINSTALLED"
Maximum="$(var.MajorVersion).$(var.MinorVersion).$(var.BuildVersion)"
IncludeMaximum="no" />
- </Upgrade>
-
- <Media Id='1' Cabinet='Gurtle.cab' EmbedCab='yes' />
- <Property Id="ALLUSERS">1</Property>
- <Condition Message='This application only runs on Windows XP and
later.'>VersionNT >= 501</Condition>
-
- <Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='$(var.cf)' Name='Common'>
- <Directory Id='INSTALLDIR' Name='Gurtle' />
- </Directory>
- </Directory>
-
- <DirectoryRef Id='INSTALLDIR'>
- <Component Id='CoreComponent'
Guid='39414E3C-C9FF-40eb-B59F-095D85082234' Win64='$(var.Win64YesNo)'>
- <File Id='Gurtle.DLL' Name='Gurtle.dll' DiskId='1'
- Source='../../bin/release/Gurtle.dll' Vital='yes'>
- </File>
- <File Id='Gurtle.PDB' Name='Gurtle.pdb' DiskId='1'
- Source='../../bin/release/Gurtle.pdb' Vital='no'>
- </File>
- <File Id='COPYING.TXT' Name='COPYING.txt' DiskId='1'
- Source='../../COPYING.txt' Vital='yes'>
- </File>
- <RegistryKey Root="HKLM"
Key="Software\Classes\Gurtle.Plugin" Action="createAndRemoveOnUninstall" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\Gurtle.Plugin" Value="Gurtle
$(var.MajorVersion).$(var.MinorVersion) (Google Code)" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\Gurtle.Plugin\CLSID"
Value="{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}" Type="string" />
-
-
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}"
Value="Gurtle $(var.MajorVersion).$(var.MinorVersion) (Google Code)"
Type="string" />
- <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}"
Action="createAndRemoveOnUninstall" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Value="mscoree.dll" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Name="ThreadingModel" Value="Both" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Name="Class" Value="Gurtle.Plugin" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Name="Assembly" Value="Gurtle,
Version=$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion),
Culture=neutral, PublicKeyToken=null" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Name="RuntimeVersion" Value="v2.0.50727" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32"
Name="CodeBase" Value="[INSTALLDIR]Gurtle.dll" Type="string" />
-
- <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InprocServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Action="createAndRemoveOnUninstall" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="Class" Value="Gurtle.Plugin" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="Assembly" Value="Gurtle,
Version=$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion),
Culture=neutral, PublicKeyToken=null" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="RuntimeVersion" Value="v2.0.50727" Type="string" />
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="CodeBase" Value="[INSTALLDIR]Gurtle.dll" Type="string" />
-
- <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\ProgId"
Value="Gurtle.Plugin" Type="string" />
-
- <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\Implemented
Categories\{62C8FE65-4EBB-45E7-B440-6E39B2CDBF29}"
Action="createAndRemoveOnUninstall" />
- <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\{91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}\Implemented
Categories\{3494FA92-B139-4730-9591-01135D5E7831}"
Action="createAndRemoveOnUninstall" />
-
- </Component>
- </DirectoryRef>
-
- <WixVariable Id="WixUILicenseRtf" Value="eula.rtf" />
- <WixVariable Id="WixUIBannerBmp" Value="Banner.jpg" />
- <WixVariable Id="WixUIDialogBmp" Value="Dialog.jpg" />
- <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
- <UIRef Id="WixUI_InstallDir" />
-
- <Feature Id='Complete' Title='Gurtle' Description='The complete package.'
+ <Upgrade Id="$(var.UpgradeCode)" >
+ 
+ <UpgradeVersion Property="PREVIOUSVERSIONSINSTALLED"
Maximum="$(var.MajorVersion).$(var.MinorVersion).$(var.BuildVersion)"
IncludeMaximum="no" />
+ </Upgrade>
+
+ <Media Id='1' Cabinet='Gurtle.cab' EmbedCab='yes' />
+ <Property Id="ALLUSERS">1</Property>
+ <Condition Message='This application only runs on Windows XP and
later.'>VersionNT >= 501</Condition>
+
+ <Directory Id='TARGETDIR' Name='SourceDir'>
+ <Directory Id='$(var.cf)' Name='Common'>
+ <Directory Id='INSTALLDIR' Name='Gurtle' />
+ </Directory>
+ </Directory>
+
+ <DirectoryRef Id='INSTALLDIR'>
+ <Component Id='CoreComponent'
Guid='39414E3C-C9FF-40eb-B59F-095D85082234' Win64='$(var.Win64YesNo)'>
+ <?if $(env.Platform)=x64 ?>
+ <File Id='Gurtle.DLL' Name='Gurtle.dll' DiskId='1'
Source='../../bin/x64/release/Gurtle.dll' Vital='yes' />
+ <File Id='Gurtle.PDB' Name='Gurtle.pdb' DiskId='1'
Source='../../bin/x64/release/Gurtle.pdb' Vital='no' />
+ <?else ?>
+ <File Id='Gurtle.DLL' Name='Gurtle.dll' DiskId='1'
Source='../../bin/x86/release/Gurtle.dll' Vital='yes' />
+ <File Id='Gurtle.PDB' Name='Gurtle.pdb' DiskId='1'
Source='../../bin/x86/release/Gurtle.pdb' Vital='no' />
+ <?endif ?>
+ <File Id='COPYING.TXT' Name='COPYING.txt' DiskId='1'
+ Source='../../COPYING.txt' Vital='yes'>
+ </File>
+ <RegistryKey Root="HKLM" Key="Software\Classes\Gurtle.Plugin"
Action="createAndRemoveOnUninstall" />
+ <RegistryValue Root="HKLM" Key="Software\Classes\Gurtle.Plugin"
Value="Gurtle $(var.MajorVersion).$(var.MinorVersion) (Google Code)"
Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\Gurtle.Plugin\CLSID" Value="$(var.COMGuid)"
Type="string" />
+
+
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)" Value="Gurtle
$(var.MajorVersion).$(var.MinorVersion) (Google Code)" Type="string" />
+ <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)"
Action="createAndRemoveOnUninstall" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32"
Value="mscoree.dll" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32"
Name="ThreadingModel" Value="Both" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32" Name="Class"
Value="Gurtle.Plugin" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32" Name="Assembly"
Value="Gurtle,
Version=$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion),
Culture=neutral, PublicKeyToken=null" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32"
Name="RuntimeVersion" Value="v2.0.50727" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32" Name="CodeBase"
Value="[INSTALLDIR]Gurtle.dll" Type="string" />
+
+ <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InprocServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Action="createAndRemoveOnUninstall" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="Class" Value="Gurtle.Plugin" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="Assembly" Value="Gurtle,
Version=$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion),
Culture=neutral, PublicKeyToken=null" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="RuntimeVersion" Value="v2.0.50727" Type="string" />
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\InProcServer32\$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)"
Name="CodeBase" Value="[INSTALLDIR]Gurtle.dll" Type="string" />
+
+ <RegistryValue Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\ProgId" Value="Gurtle.Plugin"
Type="string" />
+
+ <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\Implemented
Categories\{62C8FE65-4EBB-45E7-B440-6E39B2CDBF29}"
Action="createAndRemoveOnUninstall" />
+ <RegistryKey Root="HKLM"
Key="Software\Classes\CLSID\$(var.COMGuid)\Implemented
Categories\{3494FA92-B139-4730-9591-01135D5E7831}"
Action="createAndRemoveOnUninstall" />
+
+ </Component>
+ </DirectoryRef>
+
+ <WixVariable Id="WixUILicenseRtf" Value="eula.rtf" />
+ <WixVariable Id="WixUIBannerBmp" Value="Banner.jpg" />
+ <WixVariable Id="WixUIDialogBmp" Value="Dialog.jpg" />
+ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+ <UIRef Id="WixUI_InstallDir" />
+
+ <Feature Id='Complete' Title='Gurtle' Description='The complete
package.'
Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
- <Feature Id='CoreComponent' Title='Binaries' Description='The core
binaries.' Level='1'>
- <ComponentRef Id='CoreComponent' />
- </Feature>
- </Feature>
-
- <InstallExecuteSequence>
- <AppSearch Sequence="1"></AppSearch>
- <LaunchConditions After="AppSearch" />
- <RemoveExistingProducts
After="InstallValidate"><![CDATA[PREVIOUSVERSIONSINSTALLED]]></RemoveExistingProducts>
- </InstallExecuteSequence>
-
- </Product>
+ <Feature Id='CoreComponent' Title='Binaries' Description='The core
binaries.' Level='1'>
+ <ComponentRef Id='CoreComponent' />
+ </Feature>
+ </Feature>
+
+ <InstallExecuteSequence>
+ <AppSearch Sequence="1"></AppSearch>
+ <LaunchConditions After="AppSearch" />
+ <RemoveExistingProducts
After="InstallValidate"><![CDATA[PREVIOUSVERSIONSINSTALLED]]></RemoveExistingProducts>
+ </InstallExecuteSequence>
+
+ </Product>
</Wix>

Reply all

Reply to author

Forward

0 new messages