Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Split BEurtleSetup into 32 and 64 bit incarnations

  • Loading branch information...
commit d2a14b044dfe57a8433095c7b7efc194b273352b 1 parent b5d36a2
Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) authored
View
74 BEurtle.sln
@@ -15,9 +15,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "BEXML", "BEXML\BEXML.pyproj", "{ACAEFC7D-2E27-4E17-8184-89468D9EDFB1}"
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}"
+ 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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -62,7 +76,6 @@ Global
{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}.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.Build.0 = Release|Any CPU
{DB789663-858A-45BA-B202-3508856A0BE6}.Installer|x64.ActiveCfg = Release|Any CPU
@@ -85,31 +98,13 @@ Global
{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|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|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|x86.ActiveCfg = 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.Build.0 = 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|x64.ActiveCfg = Release|x86
@@ -117,10 +112,43 @@ Global
{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|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|x86.ActiveCfg = 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
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
2  BEurtleSetup/BEurtleSetup.wixproj → BEurtleSetup32/BEurtleSetup32.wixproj
@@ -6,7 +6,7 @@
<ProductVersion>3.6</ProductVersion>
<ProjectGuid>{8d524857-0171-4099-911f-f83752bfe034}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
- <OutputName>BEurtlePlugin</OutputName>
+ <OutputName>BEurtleSetup32</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>
View
6 BEurtleSetup/Product.wxs → BEurtleSetup32/Product.wxs
@@ -5,12 +5,14 @@
<?if $(var.Platform) = x64 ?>
<?define Win64="yes" ?>
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+<?define UpgradeCode = "0512541b-f604-4ab7-9b01-46f9ccf0aeff" ?>
<?else ?>
<?define Win64="no" ?>
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+<?define UpgradeCode = "c279e66c-171d-45a8-af23-637b0b77d191" ?>
<?endif ?>
<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" />
<PropertyRef Id="NETFRAMEWORK20"/>
<Condition Message="This application requires .NET Framework 2.0. Please install the .NET Framework then run this installer again.">
@@ -36,7 +38,7 @@
</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'>
<ComponentGroupRef Id="BEurtle.dll"/>
<ComponentRef Id="Plugin" />
View
54 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>
Please sign in to comment.
Something went wrong with that request. Please try again.