Skip to content

F
freeswitch
提交 a503166d authored 作者: Andrey Volk's avatar Andrey Volk
浏览文件
操作

FS-11403: [Build-System] Add missing htdocs, images, fonts, grammar to the… 

FS-11403: [Build-System] Add missing htdocs, images, fonts, grammar to the Windows installer. Add descriptions to the installed components. Cleanup legacy project files.
上级 f8e52dca
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 94 行增加 和 7300 行删除
w32/Library/FreeSwitchCore.2017.vcxproj
浏览文件 @ a503166d
......@@ -113,13 +113,19 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..\libs\apr\include\arch\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<PostBuildEvent>
<Command>if not exist "$(OutDir)conf" xcopy "$(SolutionDir)conf\vanilla\*.*" "$(OutDir)conf\" /C /D /Y /S
if not exist "$(OutDir)db" md "$(OutDir)db"
if not exist "$(OutDir)log" md "$(OutDir)log"
if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs\" /C /D /Y /S
if not exist "$(OutDir)images" xcopy "$(SolutionDir)images\*.*" "$(OutDir)images\" /C /D /Y /S
if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\" /C /D /Y /S
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<BuildLog />
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
......@@ -161,25 +167,12 @@
<ShowProgress>
</ShowProgress>
</Link>
<PostBuildEvent>
<Command>if not exist "$(OutDir)conf" xcopy "$(SolutionDir)conf\vanilla\*.*" "$(OutDir)conf\" /C /D /Y /S
if not exist "$(OutDir)db" md "$(OutDir)db"
if not exist "$(OutDir)log" md "$(OutDir)log"
if not exist "$(OutDir)htdocs" md "$(OutDir)htdocs"
if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs\" /C /D /Y /S
</Command>
</PostBuildEvent>
<ResourceCompile>
<AdditionalIncludeDirectories>$(SolutionDir)src\include</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<BuildLog />
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
......@@ -221,22 +214,9 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
<ImportLibrary>$(OutDir)FreeSwitchCore.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
<Command>if not exist "$(OutDir)conf" xcopy "$(SolutionDir)conf\vanilla\*.*" "$(OutDir)conf\" /C /D /Y /S
if not exist "$(OutDir)db" md "$(OutDir)db"
if not exist "$(OutDir)log" md "$(OutDir)log"
if not exist "$(OutDir)htdocs" md "$(OutDir)htdocs"
if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs\" /C /D /Y /S
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<BuildLog />
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite-amalgamation-3080401;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
......@@ -269,22 +249,9 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
<ImportLibrary>$(OutDir)FreeSwitchCore.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>if not exist "$(OutDir)conf" xcopy "$(SolutionDir)conf\vanilla\*.*" "$(OutDir)conf\" /C /D /Y /S
if not exist "$(OutDir)db" md "$(OutDir)db"
if not exist "$(OutDir)log" md "$(OutDir)log"
if not exist "$(OutDir)htdocs" md "$(OutDir)htdocs"
if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs\" /C /D /Y /S
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<BuildLog />
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
......@@ -320,15 +287,6 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
<ImportLibrary>$(OutDir)FreeSwitchCore.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
<Command>if not exist "$(OutDir)conf" xcopy "$(SolutionDir)conf\vanilla\*.*" "$(OutDir)conf\" /C /D /Y /S
if not exist "$(OutDir)db" md "$(OutDir)db"
if not exist "$(OutDir)log" md "$(OutDir)log"
if not exist "$(OutDir)htdocs" md "$(OutDir)htdocs"
if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs\" /C /D /Y /S
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\libs\libtpl-1.5\src\tpl.c">
......
w32/Setup/FreeSWITCHConsole.wxs
浏览文件 @ a503166d
......@@ -33,7 +33,7 @@
<Fragment>
<DirectoryRef Id="INSTALLLOCATION">
<Component Id="cmp7AC01B2B6EDD58CE539876AB86975286" Guid="*">
<File Id="filA3A7609AFEB16B75D819A0208EFFF451" Source="$(var.FreeSwitchConsole.ProjectDir)\FreeSwitchConsole.2010.vcxproj" />
<File Id="filA3A7609AFEB16B75D819A0208EFFF451" Source="$(var.FreeSwitchConsole.ProjectDir)\FreeSwitchConsole.2017.vcxproj" />
</Component>
</DirectoryRef>
</Fragment>
......
w32/Setup/Product.2017.wxs
浏览文件 @ a503166d
......@@ -99,7 +99,9 @@
<RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FS_CLI" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</DirectoryRef>
<Feature Id="ProductFeature" Title="FreeSWITCH Core" Level="1">
<Feature Id="ProductFeature" Title="FreeSWITCH Core" Level="1"
Description = "FreeSWITCH core library, all available modules and their dependencies."
>
<!-- TODO: Remove the comments around this ComponentRef element and the Component above in order to add resources to this installer. -->
<!-- <ComponentRef Id="ProductComponent" /> -->
<!-- The following Ref pulls in FreeSWITCHconsole.wxs items -->
......@@ -108,6 +110,10 @@
<ComponentRef Id="cmp5A06A4A7E1884331BC6C949456B5F293"/>
<!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->
<ComponentGroupRef Id="FreeSWITCHBaseFiles" />
<ComponentGroupRef Id="FreeSWITCHhtdocsFiles" />
<ComponentGroupRef Id="FreeSWITCHimagesFiles" />
<ComponentGroupRef Id="FreeSWITCHfontsFiles" />
<ComponentGroupRef Id="FreeSWITCHgrammarFiles" />
<?if $(var.Platform) != x64 ?>
<MergeRef Id="CrtFiles_x86"/>
<?endif ?>
......@@ -115,16 +121,24 @@
<MergeRef Id="CrtFiles_x64"/>
<?endif ?>
</Feature>
<Feature Id="ProductFeatureFreeSWITCH" Title="FreeSWITCH" Level="1">
<Feature Id="ProductFeatureFreeSWITCH" Title="FreeSWITCH" Level="1"
Description = "FreeSWITCH Console Application Shortcut"
>
<ComponentRef Id="ApplicationShortcut" />
</Feature>
<Feature Id="ProductFeatureFSCli" Title="FreeSWITCH Command Line Interface" Level="1">
<Feature Id="ProductFeatureFSCli" Title="FreeSWITCH Command Line Interface" Level="1"
Description = "FreeSWITCH CLI Application Shortcut"
>
<ComponentRef Id="FSCliShortcut" />
</Feature>
<Feature Id="ProductFeatureConf" Title="FreeSWITCH Configuration Sample" Level="1">
<Feature Id="ProductFeatureConf" Title="FreeSWITCH Configuration Sample" Level="1"
Description = "Vanilla is the 'Default configuration' for FreeSWITCH, *NOT* designed for a production environment without some important modifications!"
>
<ComponentGroupRef Id="FreeSWITCHConfFiles" />
</Feature>
<Feature Id="ProductFeatureSounds" Title="FreeSWITCH Sounds 8Khz" Level="1">
<Feature Id="ProductFeatureSounds" Title="FreeSWITCH Sounds 8Khz" Level="1"
Description = "We provide 8Khz sounds with the installer. Follow our Confluence to get 16, 32, 48Khz sounds."
>
<ComponentGroupRef Id="FreeSWITCHSoundFiles8" />
</Feature>
<UIRef Id="WixUI_Mondo" />
......
w32/Setup/Setup.2017.wixproj
浏览文件 @ a503166d
......@@ -44,6 +44,10 @@
<Compile Include="Fragments\FreeSWITCHConfFiles.wxs" />
<Compile Include="Fragments\FreeSWITCHSoundFiles8.wxs" />
<Compile Include="Fragments\FreeSWITCHBaseFiles.wxs" />
<Compile Include="Fragments\FreeSWITCHhtdocsFilesDir.wxs" />
<Compile Include="Fragments\FreeSWITCHimagesFilesDir.wxs" />
<Compile Include="Fragments\FreeSWITCHfontsFilesDir.wxs" />
<Compile Include="Fragments\FreeSWITCHgrammarFilesDir.wxs" />
<Compile Include="FreeSWITCHConsole.wxs" />
<Compile Include="Product.2017.wxs" />
</ItemGroup>
......@@ -922,7 +926,15 @@
<CreateProperty Value="$(VSInstallDir)\VC\Redist\MSVC\$(VCLibVersion)\MergeModules\">
<Output TaskParameter="Value" PropertyName="MergeModules" />
</CreateProperty>
<CreateProperty Value="FreeSWITCHSoundFilesDir=$(SoundsDir);MergeModules=$(MergeModules);VCVer=$(PlatformToolsetVersion);$(DefineConstants)">
<CreateProperty Value="
FreeSWITCHgrammarFilesDir=$(SolutionDir)$(UserFriendlyPlatform)\$(Configuration)\grammar;
FreeSWITCHfontsFilesDir=$(SolutionDir)fonts;
FreeSWITCHimagesFilesDir=$(SolutionDir)images;
FreeSWITCHhtdocsFilesDir=$(SolutionDir)htdocs;
FreeSWITCHSoundFilesDir=$(SoundsDir);
MergeModules=$(MergeModules);
VCVer=$(PlatformToolsetVersion);
$(DefineConstants)">
<Output TaskParameter="Value" PropertyName="DefineConstants" />
</CreateProperty>
<Message Importance="High" Text="Visual C++ lib-version: $(VCLibVersion)" />
......@@ -970,24 +982,62 @@
SuppressFragments="true"
PreprocessorVariable="var.FreeSWITCHSoundFilesDir">
</HeatDirectory>
<HeatDirectory Condition=" '$(Platform)' == 'x86' "
<HeatDirectory
ToolPath="$(WixToolPath)"
OutputFile="$(ProjectDir)Fragments\FreeSWITCHBaseFiles.wxs"
Directory="$(SolutionDir)Win32\$(Configuration)"
Transforms="$(ProjectDir)filter.xslt"
OutputFile="$(ProjectDir)Fragments\FreeSWITCHhtdocsFilesDir.wxs"
Directory="$(ProjectDir)..\..\htdocs"
DirectoryRefId="INSTALLLOCATION"
ComponentGroupName="FreeSWITCHBaseFiles"
ComponentGroupName="FreeSWITCHhtdocsFiles"
GenerateGuidsNow="true"
SuppressRootDirectory="true"
SuppressRootDirectory="false"
SuppressRegistry="true"
SuppressCom="true"
SuppressFragments="true"
PreprocessorVariable="var.FreeSWITCHBaseDir">
PreprocessorVariable="var.FreeSWITCHhtdocsFilesDir">
</HeatDirectory>
<HeatDirectory
ToolPath="$(WixToolPath)"
OutputFile="$(ProjectDir)Fragments\FreeSWITCHimagesFilesDir.wxs"
Directory="$(ProjectDir)..\..\images"
DirectoryRefId="INSTALLLOCATION"
ComponentGroupName="FreeSWITCHimagesFiles"
GenerateGuidsNow="true"
SuppressRootDirectory="false"
SuppressRegistry="true"
SuppressCom="true"
SuppressFragments="true"
PreprocessorVariable="var.FreeSWITCHimagesFilesDir">
</HeatDirectory>
<HeatDirectory Condition=" '$(Platform)' == 'x64' "
<HeatDirectory
ToolPath="$(WixToolPath)"
OutputFile="$(ProjectDir)Fragments\FreeSWITCHfontsFilesDir.wxs"
Directory="$(ProjectDir)..\..\fonts"
DirectoryRefId="INSTALLLOCATION"
ComponentGroupName="FreeSWITCHfontsFiles"
GenerateGuidsNow="true"
SuppressRootDirectory="false"
SuppressRegistry="true"
SuppressCom="true"
SuppressFragments="true"
PreprocessorVariable="var.FreeSWITCHfontsFilesDir">
</HeatDirectory>
<HeatDirectory
ToolPath="$(WixToolPath)"
OutputFile="$(ProjectDir)Fragments\FreeSWITCHgrammarFilesDir.wxs"
Directory="$(SolutionDir)$(UserFriendlyPlatform)\$(Configuration)\grammar"
DirectoryRefId="INSTALLLOCATION"
ComponentGroupName="FreeSWITCHgrammarFiles"
GenerateGuidsNow="true"
SuppressRootDirectory="false"
SuppressRegistry="true"
SuppressCom="true"
SuppressFragments="true"
PreprocessorVariable="var.FreeSWITCHgrammarFilesDir">
</HeatDirectory>
<HeatDirectory
ToolPath="$(WixToolPath)"
OutputFile="$(ProjectDir)Fragments\FreeSWITCHBaseFiles.wxs"
Directory="$(SolutionDir)x64\$(Configuration)"
Directory="$(SolutionDir)$(UserFriendlyPlatform)\$(Configuration)"
Transforms="$(ProjectDir)filter.xslt"
DirectoryRefId="INSTALLLOCATION"
ComponentGroupName="FreeSWITCHBaseFiles"
......
w32/Setup/Setup.vdproj deleted 100644 → 0
浏览文件 @ f8e52dca
差异被折叠。
w32/Setup/Setup.wixproj deleted 100644 → 0
浏览文件 @ f8e52dca
差异被折叠。
w32/Setup/filter.xslt
浏览文件 @ a503166d
......@@ -19,11 +19,13 @@
</xsl:template>
<!-- Exclude all File elements that are not a .dll file -->
<xsl:template match="wix:Component[not(contains(wix:File/@Source,
'.dll'))]" />
<xsl:template match="wix:Component[not(contains(wix:File/@Source, '.dll'))]" />
<!-- Exclude Directory elements -->
<!--<xsl:template match="wix:Directory[not(contains(*/@Source, '.pdb'))]"/>-->
<xsl:template match="wix:Directory[@Name='htdocs']"/>
<xsl:template match="wix:Directory[@Name='images']"/>
<xsl:template match="wix:Directory[@Name='fonts']"/>
<xsl:template match="wix:Directory[@Name='conf']"/>
<xsl:template match="wix:Directory[@Name='sounds']"/>
<xsl:template match="wix:Directory[@Name='grammar']"/>
......
w32/Setup/freeswitch.aip deleted 100644 → 0
浏览文件 @ f8e52dca
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论