Skip to content
This repository has been archived by the owner on Feb 15, 2019. It is now read-only.

Commit

Permalink
Split BEurtleSetup into 32 and 64 bit incarnations
Browse files Browse the repository at this point in the history
  • Loading branch information
Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) committed Jul 15, 2012
1 parent b5d36a2 commit d2a14b0
Show file tree
Hide file tree
Showing 4 changed files with 110 additions and 26 deletions.
74 changes: 51 additions & 23 deletions BEurtle.sln
Expand Up @@ -15,9 +15,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject EndProject
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "BEXML", "BEXML\BEXML.pyproj", "{ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}" Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "BEXML", "BEXML\BEXML.pyproj", "{ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}"
EndProject EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "BEurtleSetup", "BEurtleSetup\BEurtleSetup.wixproj", "{8D524857-0171-4099-911F-F83752BFE034}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{E3D6765E-F632-45EE-9B54-191115E19F14}" Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{E3D6765E-F632-45EE-9B54-191115E19F14}"
ProjectSection(ProjectDependencies) = postProject
{8D524857-0171-4099-911F-F83752BFE034} = {8D524857-0171-4099-911F-F83752BFE034}
{20A9AC5C-043A-4FEF-B661-958E88C1E57E} = {20A9AC5C-043A-4FEF-B661-958E88C1E57E}
{0B06CA6D-8831-4400-93E1-4543282F1868} = {0B06CA6D-8831-4400-93E1-4543282F1868}
EndProjectSection
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "BEurtleSetup32", "BEurtleSetup32\BEurtleSetup32.wixproj", "{8D524857-0171-4099-911F-F83752BFE034}"
ProjectSection(ProjectDependencies) = postProject
{20A9AC5C-043A-4FEF-B661-958E88C1E57E} = {20A9AC5C-043A-4FEF-B661-958E88C1E57E}
EndProjectSection
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "BEurtleSetup64", "BEurtleSetup64\BEurtleSetup64.wixproj", "{0B06CA6D-8831-4400-93E1-4543282F1868}"
ProjectSection(ProjectDependencies) = postProject
{8D524857-0171-4099-911F-F83752BFE034} = {8D524857-0171-4099-911F-F83752BFE034}
{20A9AC5C-043A-4FEF-B661-958E88C1E57E} = {20A9AC5C-043A-4FEF-B661-958E88C1E57E}
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -62,7 +76,6 @@ Global
{DB789663-858A-45BA-B202-3508856A0BE6}.Debug|x64.ActiveCfg = Debug|Any CPU {DB789663-858A-45BA-B202-3508856A0BE6}.Debug|x64.ActiveCfg = Debug|Any CPU
{DB789663-858A-45BA-B202-3508856A0BE6}.Debug|x86.ActiveCfg = Debug|Any CPU {DB789663-858A-45BA-B202-3508856A0BE6}.Debug|x86.ActiveCfg = Debug|Any CPU
{DB789663-858A-45BA-B202-3508856A0BE6}.Installer|Any CPU.ActiveCfg = Release|Any CPU {DB789663-858A-45BA-B202-3508856A0BE6}.Installer|Any CPU.ActiveCfg = Release|Any CPU
{DB789663-858A-45BA-B202-3508856A0BE6}.Installer|Any CPU.Build.0 = Release|Any CPU
{DB789663-858A-45BA-B202-3508856A0BE6}.Installer|Mixed Platforms.ActiveCfg = Release|Any CPU {DB789663-858A-45BA-B202-3508856A0BE6}.Installer|Mixed Platforms.ActiveCfg = Release|Any CPU
{DB789663-858A-45BA-B202-3508856A0BE6}.Installer|Mixed Platforms.Build.0 = Release|Any CPU {DB789663-858A-45BA-B202-3508856A0BE6}.Installer|Mixed Platforms.Build.0 = Release|Any CPU
{DB789663-858A-45BA-B202-3508856A0BE6}.Installer|x64.ActiveCfg = Release|Any CPU {DB789663-858A-45BA-B202-3508856A0BE6}.Installer|x64.ActiveCfg = Release|Any CPU
Expand All @@ -85,42 +98,57 @@ Global
{ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}.Release|x64.ActiveCfg = Release|Any CPU {ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}.Release|x64.ActiveCfg = Release|Any CPU
{ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}.Release|x86.ActiveCfg = Release|Any CPU {ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}.Release|x86.ActiveCfg = Release|Any CPU
{8D524857-0171-4099-911F-F83752BFE034}.Debug|Any CPU.ActiveCfg = Debug|x86
{8D524857-0171-4099-911F-F83752BFE034}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{8D524857-0171-4099-911F-F83752BFE034}.Debug|Mixed Platforms.Build.0 = Debug|x86
{8D524857-0171-4099-911F-F83752BFE034}.Debug|x64.ActiveCfg = Debug|x86
{8D524857-0171-4099-911F-F83752BFE034}.Debug|x86.ActiveCfg = Debug|x86
{8D524857-0171-4099-911F-F83752BFE034}.Debug|x86.Build.0 = Debug|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|Any CPU.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|Mixed Platforms.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|Mixed Platforms.Build.0 = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|x64.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|x86.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|x86.Build.0 = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Release|Any CPU.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Release|Mixed Platforms.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Release|Mixed Platforms.Build.0 = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Release|x64.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Release|x86.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Release|x86.Build.0 = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Debug|Any CPU.ActiveCfg = Debug|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Debug|Any CPU.ActiveCfg = Debug|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Debug|Mixed Platforms.Build.0 = Debug|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Debug|x64.ActiveCfg = Debug|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Debug|x64.ActiveCfg = Debug|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Debug|x86.ActiveCfg = Debug|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Debug|x86.ActiveCfg = Debug|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Debug|x86.Build.0 = Debug|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Debug|x86.Build.0 = Debug|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|Any CPU.ActiveCfg = Release|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|Any CPU.ActiveCfg = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|Any CPU.Build.0 = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|Mixed Platforms.ActiveCfg = Release|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|Mixed Platforms.ActiveCfg = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|Mixed Platforms.Build.0 = Release|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|Mixed Platforms.Build.0 = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|x64.ActiveCfg = Release|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|x64.ActiveCfg = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|x86.ActiveCfg = Release|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|x86.ActiveCfg = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|x86.Build.0 = Release|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Installer|x86.Build.0 = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Release|Any CPU.ActiveCfg = Release|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Release|Any CPU.ActiveCfg = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Release|Mixed Platforms.ActiveCfg = Release|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Release|Mixed Platforms.ActiveCfg = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Release|Mixed Platforms.Build.0 = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Release|x64.ActiveCfg = Release|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Release|x64.ActiveCfg = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Release|x86.ActiveCfg = Release|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Release|x86.ActiveCfg = Release|x86
{E3D6765E-F632-45EE-9B54-191115E19F14}.Release|x86.Build.0 = Release|x86 {E3D6765E-F632-45EE-9B54-191115E19F14}.Release|x86.Build.0 = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Debug|Any CPU.ActiveCfg = Debug|x86
{8D524857-0171-4099-911F-F83752BFE034}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{8D524857-0171-4099-911F-F83752BFE034}.Debug|x64.ActiveCfg = Debug|x86
{8D524857-0171-4099-911F-F83752BFE034}.Debug|x86.ActiveCfg = Debug|x86
{8D524857-0171-4099-911F-F83752BFE034}.Debug|x86.Build.0 = Debug|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|Any CPU.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|Any CPU.Build.0 = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|Mixed Platforms.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|Mixed Platforms.Build.0 = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|x64.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|x86.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Installer|x86.Build.0 = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Release|Any CPU.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Release|Mixed Platforms.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Release|x64.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Release|x86.ActiveCfg = Release|x86
{8D524857-0171-4099-911F-F83752BFE034}.Release|x86.Build.0 = Release|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Debug|Any CPU.ActiveCfg = Debug|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Debug|x64.ActiveCfg = Debug|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Debug|x86.ActiveCfg = Debug|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Debug|x86.Build.0 = Debug|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Installer|Any CPU.ActiveCfg = Release|x64
{0B06CA6D-8831-4400-93E1-4543282F1868}.Installer|Any CPU.Build.0 = Release|x64
{0B06CA6D-8831-4400-93E1-4543282F1868}.Installer|Mixed Platforms.ActiveCfg = Release|x64
{0B06CA6D-8831-4400-93E1-4543282F1868}.Installer|Mixed Platforms.Build.0 = Release|x64
{0B06CA6D-8831-4400-93E1-4543282F1868}.Installer|x64.ActiveCfg = Release|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Installer|x86.ActiveCfg = Release|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Installer|x86.Build.0 = Release|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Release|Any CPU.ActiveCfg = Release|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Release|Mixed Platforms.ActiveCfg = Release|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Release|x64.ActiveCfg = Release|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Release|x86.ActiveCfg = Release|x86
{0B06CA6D-8831-4400-93E1-4543282F1868}.Release|x86.Build.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
Expand Down
Expand Up @@ -6,7 +6,7 @@
<ProductVersion>3.6</ProductVersion> <ProductVersion>3.6</ProductVersion>
<ProjectGuid>{8d524857-0171-4099-911f-f83752bfe034}</ProjectGuid> <ProjectGuid>{8d524857-0171-4099-911f-f83752bfe034}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<OutputName>BEurtlePlugin</OutputName> <OutputName>BEurtleSetup32</OutputName>
<OutputType>Package</OutputType> <OutputType>Package</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
Expand Down
6 changes: 4 additions & 2 deletions BEurtleSetup/Product.wxs → BEurtleSetup32/Product.wxs
Expand Up @@ -5,12 +5,14 @@
<?if $(var.Platform) = x64 ?> <?if $(var.Platform) = x64 ?>
<?define Win64="yes" ?> <?define Win64="yes" ?>
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?> <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
<?define UpgradeCode = "0512541b-f604-4ab7-9b01-46f9ccf0aeff" ?>
<?else ?> <?else ?>
<?define Win64="no" ?> <?define Win64="no" ?>
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?> <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
<?define UpgradeCode = "c279e66c-171d-45a8-af23-637b0b77d191" ?>
<?endif ?> <?endif ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<Product Id="*" Name="BEurtle Plugin for TortoiseXXX" Language="1033" Version="$(var.Version)" Manufacturer="ned Productions Limited" UpgradeCode="c279e66c-171d-45a8-af23-637b0b77d191"> <Product Id="*" Name="BEurtle Plugin for TortoiseXXX ($(var.Platform))" Language="1033" Version="$(var.Version)" Manufacturer="ned Productions Limited" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<PropertyRef Id="NETFRAMEWORK20"/> <PropertyRef Id="NETFRAMEWORK20"/>
<Condition Message="This application requires .NET Framework 2.0. Please install the .NET Framework then run this installer again."> <Condition Message="This application requires .NET Framework 2.0. Please install the .NET Framework then run this installer again.">
Expand All @@ -36,7 +38,7 @@
</Directory> </Directory>
</Directory> </Directory>


<Feature Id="FeaturePlugin" Title="BEurtle Plugin for TortoiseXXX" Description="A TortoiseXXX plugin for the Bugs Everywhere distributed issue tracker" <Feature Id="FeaturePlugin" Title="BEurtle Plugin for TortoiseXXX ($(var.Platform))" Description="A TortoiseXXX plugin for the Bugs Everywhere distributed issue tracker"
Display="expand" Level="1" ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no'> Display="expand" Level="1" ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no'>
<ComponentGroupRef Id="BEurtle.dll"/> <ComponentGroupRef Id="BEurtle.dll"/>
<ComponentRef Id="Plugin" /> <ComponentRef Id="Plugin" />
Expand Down
54 changes: 54 additions & 0 deletions BEurtleSetup64/BEurtleSetup64.wixproj
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProductVersion>3.6</ProductVersion>
<ProjectGuid>{0b06ca6d-8831-4400-93e1-4543282f1868}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>BEurtleSetup64</OutputName>
<OutputType>Package</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>BE_srcdir=..\..\..\..\BE\dist;BEurtle_bindir=..\..\..\..\BEurtle\bin\Release</DefineConstants>
</PropertyGroup>
<ItemGroup>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name>
</WixExtension>
<WixExtension Include="WixNetFxExtension">
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
<Name>WixNetFxExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
<Compile Include="..\BEurtleSetup32\BE.wxs">
<Link>BE.wxs</Link>
</Compile>
<Compile Include="..\BEurtleSetup32\BEurtle.dll.wxs">
<Link>BEurtle.dll.wxs</Link>
</Compile>
<Compile Include="..\BEurtleSetup32\Product.wxs">
<Link>Product.wxs</Link>
</Compile>
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

0 comments on commit d2a14b0

Please sign in to comment.