Message ID | 1442951618-13080-2-git-send-email-aserdean@cloudbasesolutions.com |
---|---|
State | Accepted |
Headers | show |
On Tue, Sep 22, 2015 at 12:53 PM, Alin Serdean <aserdean@cloudbasesolutions.com> wrote: > This patch defines the x64 in the configuration of the visual studio > solution: ovs-windows-installer.sln > > Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> Looks good, applied. > --- > windows/ovs-windows-installer.sln | 4 ++- > .../ovs-windows-installer.wixproj | 41 +++++++++++++++++++++- > 2 files changed, 43 insertions(+), 2 deletions(-) > > diff --git a/windows/ovs-windows-installer.sln b/windows/ovs-windows-installer.sln > index 298c831..09311f9 100644 > --- a/windows/ovs-windows-installer.sln > +++ b/windows/ovs-windows-installer.sln > @@ -1,4 +1,3 @@ > -? > Microsoft Visual Studio Solution File, Format Version 12.00 > # Visual Studio 2013 > VisualStudioVersion = 12.0.31101.0 > @@ -7,9 +6,12 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ovs-windows-installer", "ov > EndProject > Global > GlobalSection(SolutionConfigurationPlatforms) = preSolution > + Release|x64 = Release|x64 > Release|x86 = Release|x86 > EndGlobalSection > GlobalSection(ProjectConfigurationPlatforms) = postSolution > + {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.ActiveCfg = Release|x86 > + {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.Build.0 = Release|x86 > {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x86.ActiveCfg = Release|x86 > {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x86.Build.0 = Release|x86 > EndGlobalSection > diff --git a/windows/ovs-windows-installer/ovs-windows-installer.wixproj b/windows/ovs-windows-installer/ovs-windows-installer.wixproj > index af22f42..30b5d55 100644 > --- a/windows/ovs-windows-installer/ovs-windows-installer.wixproj > +++ b/windows/ovs-windows-installer/ovs-windows-installer.wixproj > @@ -24,6 +24,45 @@ > <Pedantic>False</Pedantic> > <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> > </PropertyGroup> > + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> > + <DefineConstants>Debug</DefineConstants> > + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> > + </PropertyGroup> > + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> > + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> > + <SuppressAllWarnings>False</SuppressAllWarnings> > + <Pedantic>False</Pedantic> > + <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> > + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> > + </PropertyGroup> > + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> > + <DefineConstants>Debug</DefineConstants> > + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> > + </PropertyGroup> > + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> > + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> > + <SuppressAllWarnings>False</SuppressAllWarnings> > + <Pedantic>False</Pedantic> > + <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> > + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> > + </PropertyGroup> > + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> > + <DefineConstants>Debug</DefineConstants> > + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> > + </PropertyGroup> > + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> > + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> > + <SuppressAllWarnings>False</SuppressAllWarnings> > + <Pedantic>False</Pedantic> > + <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> > + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> > + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> > + </PropertyGroup> > <ItemGroup> > <Compile Include="Binaries.wxs" /> > <Compile Include="CustomActions.wxs" /> > @@ -76,4 +115,4 @@ > <Target Name="AfterBuild"> > </Target> > --> > -</Project> > \ No newline at end of file > +</Project> > -- > 1.9.5.msysgit.0 > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
diff --git a/windows/ovs-windows-installer.sln b/windows/ovs-windows-installer.sln index 298c831..09311f9 100644 --- a/windows/ovs-windows-installer.sln +++ b/windows/ovs-windows-installer.sln @@ -1,4 +1,3 @@ -? Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.31101.0 @@ -7,9 +6,12 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ovs-windows-installer", "ov EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.ActiveCfg = Release|x86 + {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.Build.0 = Release|x86 {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x86.ActiveCfg = Release|x86 {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x86.Build.0 = Release|x86 EndGlobalSection diff --git a/windows/ovs-windows-installer/ovs-windows-installer.wixproj b/windows/ovs-windows-installer/ovs-windows-installer.wixproj index af22f42..30b5d55 100644 --- a/windows/ovs-windows-installer/ovs-windows-installer.wixproj +++ b/windows/ovs-windows-installer/ovs-windows-installer.wixproj @@ -24,6 +24,45 @@ <Pedantic>False</Pedantic> <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <DefineConstants>Debug</DefineConstants> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> + <SuppressAllWarnings>False</SuppressAllWarnings> + <Pedantic>False</Pedantic> + <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <DefineConstants>Debug</DefineConstants> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> + <SuppressAllWarnings>False</SuppressAllWarnings> + <Pedantic>False</Pedantic> + <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <DefineConstants>Debug</DefineConstants> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <DefineConstants>BinariesPath=Binaries;SymbolsPath=Symbols;</DefineConstants> + <SuppressAllWarnings>False</SuppressAllWarnings> + <Pedantic>False</Pedantic> + <SuppressSpecificWarnings>1076;</SuppressSpecificWarnings> + <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> + <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath> + </PropertyGroup> <ItemGroup> <Compile Include="Binaries.wxs" /> <Compile Include="CustomActions.wxs" /> @@ -76,4 +115,4 @@ <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project>
This patch defines the x64 in the configuration of the visual studio solution: ovs-windows-installer.sln Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> --- windows/ovs-windows-installer.sln | 4 ++- .../ovs-windows-installer.wixproj | 41 +++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-)