Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
别团等shy哥发育
redis
提交
d835f244
R
redis
项目概览
别团等shy哥发育
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d835f244
编写于
4月 03, 2015
作者:
A
Alexis Campailla
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MSI fixes & tweaks
上级
9a8aade2
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
36 addition
and
41 deletion
+36
-41
msvs/RedisServer.sln
msvs/RedisServer.sln
+15
-23
msvs/msi/RedisMsi.CustomActions/CustomAction.config
msvs/msi/RedisMsi.CustomActions/CustomAction.config
+0
-0
msvs/msi/RedisMsi.CustomActions/CustomAction.cs
msvs/msi/RedisMsi.CustomActions/CustomAction.cs
+1
-1
msvs/msi/RedisMsi.CustomActions/Properties/AssemblyInfo.cs
msvs/msi/RedisMsi.CustomActions/Properties/AssemblyInfo.cs
+4
-4
msvs/msi/RedisMsi.CustomActions/RedisMsi.CustomActions.csproj
.../msi/RedisMsi.CustomActions/RedisMsi.CustomActions.csproj
+2
-2
msvs/msi/RedisMsi/Components/DocumentationComponents.wxs
msvs/msi/RedisMsi/Components/DocumentationComponents.wxs
+0
-0
msvs/msi/RedisMsi/Components/FileComponents.wxs
msvs/msi/RedisMsi/Components/FileComponents.wxs
+0
-0
msvs/msi/RedisMsi/Components/WindowsServiceComponents.wxs
msvs/msi/RedisMsi/Components/WindowsServiceComponents.wxs
+2
-2
msvs/msi/RedisMsi/Dialogs/CustomInstallDir.wxs
msvs/msi/RedisMsi/Dialogs/CustomInstallDir.wxs
+0
-0
msvs/msi/RedisMsi/Dialogs/FirewallDialog.wxs
msvs/msi/RedisMsi/Dialogs/FirewallDialog.wxs
+0
-0
msvs/msi/RedisMsi/Images/redis_background.jpg
msvs/msi/RedisMsi/Images/redis_background.jpg
+0
-0
msvs/msi/RedisMsi/Images/top_banner.jpg
msvs/msi/RedisMsi/Images/top_banner.jpg
+0
-0
msvs/msi/RedisMsi/License.rtf
msvs/msi/RedisMsi/License.rtf
+0
-0
msvs/msi/RedisMsi/Product.wxs
msvs/msi/RedisMsi/Product.wxs
+4
-4
msvs/msi/RedisMsi/RedisMsi.wixproj
msvs/msi/RedisMsi/RedisMsi.wixproj
+8
-5
未找到文件。
msvs/RedisServer.sln
浏览文件 @
d835f244
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.
31101.0
VisualStudioVersion = 12.0.
21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RedisServer", "RedisServer.vcxproj", "{46842776-68A5-EC98-6A09-1859BBFC73AA}"
ProjectSection(ProjectDependencies) = postProject
...
...
@@ -42,9 +42,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReleasePackagingTool", "Rel
{A65C2CD6-72A3-441A-AEA3-D754BEA9A86A} = {A65C2CD6-72A3-441A-AEA3-D754BEA9A86A}
EndProjectSection
EndProject
Project("{
930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "RedisWindowsX64", "msi\RedisWindowsX64\RedisWindowsX64.wixproj", "{C829D256-16B4-4DC7-9BF9-6814F76B441E
}"
Project("{
FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisMsi.CustomActions", "msi\RedisMsi.CustomActions\RedisMsi.CustomActions.csproj", "{A917027E-D229-46C9-B969-1F4CE7D5D2CA
}"
EndProject
Project("{
FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisWindowsX64.CustomActions", "msi\RedisWindowsX64.CustomActions\RedisWindowsX64.CustomActions.csproj", "{A917027E-D229-46C9-B969-1F4CE7D5D2CA
}"
Project("{
930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "RedisMsi", "msi\RedisMsi\RedisMsi.wixproj", "{C829D256-16B4-4DC7-9BF9-6814F76B441E
}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
...
...
@@ -196,34 +196,26 @@ Global
{74A69E5D-6540-43CC-9975-20989BF19EB0}.Release|x64.ActiveCfg = Release|x64
{74A69E5D-6540-43CC-9975-20989BF19EB0}.Release|x64.Build.0 = Release|x64
{74A69E5D-6540-43CC-9975-20989BF19EB0}.Release|x86.ActiveCfg = Release|x64
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Mixed Platforms.Build.0 = Debug|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Win32.ActiveCfg = Debug|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|x64.ActiveCfg = Debug|x64
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|x86.ActiveCfg = Debug|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Mixed Platforms.ActiveCfg = Release|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Mixed Platforms.Build.0 = Release|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Win32.ActiveCfg = Release|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|x64.ActiveCfg = Release|x64
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|x86.ActiveCfg = Release|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Mixed Platforms.Build.0 = Debug|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Win32.ActiveCfg = Debug|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|Win32.Build.0 = Debug|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x64.ActiveCfg = Debug|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x64.ActiveCfg = Debug|x64
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x86.ActiveCfg = Debug|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Debug|x86.Build.0 = Debug|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Mixed Platforms.ActiveCfg = Release|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Mixed Platforms.Build.0 = Release|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Win32.ActiveCfg = Release|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|Win32.Build.0 = Release|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x64.ActiveCfg = Release|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x64.ActiveCfg = Release|x64
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x86.ActiveCfg = Release|x86
{C829D256-16B4-4DC7-9BF9-6814F76B441E}.Release|x86.Build.0 = Release|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Mixed Platforms.Build.0 = Debug|x64
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Win32.ActiveCfg = Debug|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|Win32.Build.0 = Debug|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|x64.ActiveCfg = Debug|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|x86.ActiveCfg = Debug|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Debug|x86.Build.0 = Debug|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Mixed Platforms.ActiveCfg = Release|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Mixed Platforms.Build.0 = Release|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Win32.ActiveCfg = Release|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|Win32.Build.0 = Release|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|x64.ActiveCfg = Release|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|x86.ActiveCfg = Release|x86
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
...
...
msvs/msi/Redis
WindowsX64
.CustomActions/CustomAction.config
→
msvs/msi/Redis
Msi
.CustomActions/CustomAction.config
浏览文件 @
d835f244
文件已移动
msvs/msi/Redis
WindowsX64
.CustomActions/CustomAction.cs
→
msvs/msi/Redis
Msi
.CustomActions/CustomAction.cs
浏览文件 @
d835f244
...
...
@@ -2,7 +2,7 @@
using
System.IO
;
using
Microsoft.Deployment.WindowsInstaller
;
namespace
Redis
WindowsX64
.CustomActions
namespace
Redis
Msi
.CustomActions
{
/// <summary>
/// Defines actions to take during the MSI install that don't
...
...
msvs/msi/Redis
WindowsX64
.CustomActions/Properties/AssemblyInfo.cs
→
msvs/msi/Redis
Msi
.CustomActions/Properties/AssemblyInfo.cs
浏览文件 @
d835f244
...
...
@@ -4,11 +4,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[
assembly
:
AssemblyTitle
(
"Redis
WindowsX64
.CustomActions"
)]
[
assembly
:
AssemblyTitle
(
"Redis
Msi
.CustomActions"
)]
[
assembly
:
AssemblyDescription
(
""
)]
[
assembly
:
AssemblyCompany
(
"M
SOpenTech
"
)]
[
assembly
:
AssemblyProduct
(
"Redis
WindowsX64
.CustomActions"
)]
[
assembly
:
AssemblyCopyright
(
"Copyright © M
SOpenTech
2015"
)]
[
assembly
:
AssemblyCompany
(
"M
icrosoft Open Technologies
"
)]
[
assembly
:
AssemblyProduct
(
"Redis
Msi
.CustomActions"
)]
[
assembly
:
AssemblyCopyright
(
"Copyright © M
icrosoft Open Technologies
2015"
)]
[
assembly
:
AssemblyTrademark
(
""
)]
[
assembly
:
AssemblyCulture
(
""
)]
...
...
msvs/msi/Redis
WindowsX64.CustomActions/RedisWindowsX64
.CustomActions.csproj
→
msvs/msi/Redis
Msi.CustomActions/RedisMsi
.CustomActions.csproj
浏览文件 @
d835f244
...
...
@@ -8,8 +8,8 @@
<ProjectGuid>
{A917027E-D229-46C9-B969-1F4CE7D5D2CA}
</ProjectGuid>
<OutputType>
Library
</OutputType>
<AppDesignerFolder>
Properties
</AppDesignerFolder>
<RootNamespace>
Redis
WindowsX64
.CustomActions
</RootNamespace>
<AssemblyName>
Redis
WindowsX64
.CustomActions
</AssemblyName>
<RootNamespace>
Redis
Msi
.CustomActions
</RootNamespace>
<AssemblyName>
Redis
Msi
.CustomActions
</AssemblyName>
<TargetFrameworkVersion>
v2.0
</TargetFrameworkVersion>
<FileAlignment>
512
</FileAlignment>
<WixCATargetsPath
Condition=
" '$(WixCATargetsPath)' == '' "
>
$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets
</WixCATargetsPath>
...
...
msvs/msi/Redis
WindowsX64
/Components/DocumentationComponents.wxs
→
msvs/msi/Redis
Msi
/Components/DocumentationComponents.wxs
浏览文件 @
d835f244
文件已移动
msvs/msi/Redis
WindowsX64
/Components/FileComponents.wxs
→
msvs/msi/Redis
Msi
/Components/FileComponents.wxs
浏览文件 @
d835f244
文件已移动
msvs/msi/Redis
WindowsX64
/Components/WindowsServiceComponents.wxs
→
msvs/msi/Redis
Msi
/Components/WindowsServiceComponents.wxs
浏览文件 @
d835f244
...
...
@@ -88,8 +88,8 @@
<!--
Custom actions that update the redis config file during installation
-->
<Binary
Id=
"RedisCADLL"
SourceFile=
"$(var.Redis
WindowsX64.CustomActions.TargetDir)RedisWindowsX64.CustomActions
.dll"
/>
<CustomAction
Id=
"ca_UpdateRedisConfig"
BinaryKey=
"RedisCADLL"
DllEntry=
"UpdateRedisConfig"
Execute=
"deferred"
Return=
"check"
/>
<Binary
Id=
"RedisCADLL"
SourceFile=
"$(var.Redis
Msi.CustomActions.TargetDir)RedisMsi.CustomActions.CA
.dll"
/>
<CustomAction
Id=
"ca_UpdateRedisConfig"
BinaryKey=
"RedisCADLL"
DllEntry=
"UpdateRedisConfig"
Execute=
"deferred"
Return=
"check"
Impersonate=
"no"
/>
<SetProperty
Id=
"ca_UpdateRedisConfig"
Value=
"CONFIG_PATH=[#file_redis_serviceCONF];PORT=[PORT];"
Sequence=
"execute"
Before=
"ca_UpdateRedisConfig"
/>
<InstallExecuteSequence>
...
...
msvs/msi/Redis
WindowsX64
/Dialogs/CustomInstallDir.wxs
→
msvs/msi/Redis
Msi
/Dialogs/CustomInstallDir.wxs
浏览文件 @
d835f244
文件已移动
msvs/msi/Redis
WindowsX64
/Dialogs/FirewallDialog.wxs
→
msvs/msi/Redis
Msi
/Dialogs/FirewallDialog.wxs
浏览文件 @
d835f244
文件已移动
msvs/msi/Redis
WindowsX64
/Images/redis_background.jpg
→
msvs/msi/Redis
Msi
/Images/redis_background.jpg
浏览文件 @
d835f244
文件已移动
msvs/msi/Redis
WindowsX64
/Images/top_banner.jpg
→
msvs/msi/Redis
Msi
/Images/top_banner.jpg
浏览文件 @
d835f244
文件已移动
msvs/msi/Redis
WindowsX64
/License.rtf
→
msvs/msi/Redis
Msi
/License.rtf
浏览文件 @
d835f244
文件已移动
msvs/msi/Redis
WindowsX64
/Product.wxs
→
msvs/msi/Redis
Msi
/Product.wxs
浏览文件 @
d835f244
...
...
@@ -7,13 +7,13 @@
Example installation (command-line):
default install:
msiexec /i Redis-
Windows-x64
.msi
msiexec /i Redis-
[version]
.msi
set port and turn off firewall exception:
msiexec /i Redis-
Windows-x64
.msi PORT=1234 FIREWALL_ON=""
msiexec /i Redis-
[version]
.msi PORT=1234 FIREWALL_ON=""
set port and turn on firewall exception:
msiexec /i Redis-
Windows-x64
.msi PORT=1234 FIREWALL_ON=1
msiexec /i Redis-
[version]
.msi PORT=1234 FIREWALL_ON=1
-->
...
...
@@ -57,7 +57,7 @@
<!--Directory structure to create-->
<Directory
Id=
"TARGETDIR"
Name=
"SourceDir"
>
<Directory
Id=
"ProgramFiles64Folder"
>
<Directory
Id=
"INSTALLFOLDER"
Name=
"Redis
-Windows
"
>
<Directory
Id=
"INSTALLFOLDER"
Name=
"Redis"
>
<Directory
Id=
"LogsFolder"
Name=
"Logs"
/>
</Directory>
</Directory>
...
...
msvs/msi/Redis
WindowsX64/RedisWindowsX64
.wixproj
→
msvs/msi/Redis
Msi/RedisMsi
.wixproj
浏览文件 @
d835f244
...
...
@@ -6,29 +6,32 @@
<ProductVersion>
3.9
</ProductVersion>
<ProjectGuid>
c829d256-16b4-4dc7-9bf9-6814f76b441e
</ProjectGuid>
<SchemaVersion>
2.0
</SchemaVersion>
<OutputName>
Redis-Windows-x64
</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|x86' "
>
<OutputName>
Redis-x86
</OutputName>
<OutputPath>
bin\$(Configuration)\
</OutputPath>
<IntermediateOutputPath>
obj\$(Configuration)\
</IntermediateOutputPath>
<DefineConstants>
Debug
</DefineConstants>
<CompilerAdditionalOptions>
-arch x
64
</CompilerAdditionalOptions>
<CompilerAdditionalOptions>
-arch x
86
</CompilerAdditionalOptions>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Release|x86' "
>
<OutputName>
Redis-x86
</OutputName>
<OutputPath>
bin\$(Configuration)\
</OutputPath>
<IntermediateOutputPath>
obj\$(Configuration)\
</IntermediateOutputPath>
<CompilerAdditionalOptions>
-arch x
64
</CompilerAdditionalOptions>
<CompilerAdditionalOptions>
-arch x
86
</CompilerAdditionalOptions>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Debug|x64' "
>
<OutputName>
Redis-x64
</OutputName>
<DefineConstants>
Debug
</DefineConstants>
<CompilerAdditionalOptions>
-arch x64
</CompilerAdditionalOptions>
<OutputPath>
bin\$(Platform)\$(Configuration)\
</OutputPath>
<IntermediateOutputPath>
obj\$(Platform)\$(Configuration)\
</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Release|x64' "
>
<OutputName>
Redis-x64
</OutputName>
<CompilerAdditionalOptions>
-arch x64
</CompilerAdditionalOptions>
<OutputPath>
bin\$(Platform)\$(Configuration)\
</OutputPath>
<IntermediateOutputPath>
obj\$(Platform)\$(Configuration)\
</IntermediateOutputPath>
...
...
@@ -82,8 +85,8 @@
<RefProjectOutputGroups>
Binaries;Content;Satellites
</RefProjectOutputGroups>
<RefTargetDir>
INSTALLFOLDER
</RefTargetDir>
</ProjectReference>
<ProjectReference
Include=
"..\Redis
WindowsX64.CustomActions\RedisWindowsX64
.CustomActions.csproj"
>
<Name>
Redis
WindowsX64
.CustomActions
</Name>
<ProjectReference
Include=
"..\Redis
Msi.CustomActions\RedisMsi
.CustomActions.csproj"
>
<Name>
Redis
Msi
.CustomActions
</Name>
<Project>
{a917027e-d229-46c9-b969-1f4ce7d5d2ca}
</Project>
<Private>
True
</Private>
<DoNotHarvest>
True
</DoNotHarvest>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录