Added the CNAM and LNP query over SIP module to Windows build.
Show info about C Runtime in installer. git-svn-id: http://yate.null.ro/svn/yate/trunk@4166 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
parent
1b68f67501
commit
9cf6f9592e
|
@ -33,6 +33,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libyate", "Libyate.vcproj",
|
|||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modules", "Modules.vcproj", "{BE362993-354F-4315-B878-05E952E1D164}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{5F248A16-8E3D-497A-8E68-F9E08971F583} = {5F248A16-8E3D-497A-8E68-F9E08971F583}
|
||||
{8721C91C-E1BB-4758-78A1-C0718EDFF940} = {8721C91C-E1BB-4758-78A1-C0718EDFF940}
|
||||
{C296BBF2-AD56-4249-AEF6-C04B03131474} = {C296BBF2-AD56-4249-AEF6-C04B03131474}
|
||||
{2BA805ED-19D3-4100-BC32-2AD05C9977A7} = {2BA805ED-19D3-4100-BC32-2AD05C9977A7}
|
||||
{88C1CCEC-C1AF-4888-A4A1-C0798EDB3947} = {88C1CCEC-C1AF-4888-A4A1-C0798EDB3947}
|
||||
|
@ -86,7 +88,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Modules", "Modules.vcproj",
|
|||
{AA54CD1D-E1E1-4A00-9974-EE6924D85DBD} = {AA54CD1D-E1E1-4A00-9974-EE6924D85DBD}
|
||||
{34AC2018-91F1-41AF-A839-47DCF27D4434} = {34AC2018-91F1-41AF-A839-47DCF27D4434}
|
||||
{42B76F17-895F-4B1C-B783-7AAC92AFD56E} = {42B76F17-895F-4B1C-B783-7AAC92AFD56E}
|
||||
{5F248A16-8E3D-497A-8E68-F9E08971F583} = {5F248A16-8E3D-497A-8E68-F9E08971F583}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Service", "Service.vcproj", "{B1015F66-0C3D-43DA-8329-15FB43D2F74B}"
|
||||
|
@ -563,12 +564,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_clientarchive", "_clientar
|
|||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QT4Modules", "QT4Modules.vcproj", "{7E8CAE11-0729-4E65-9BE8-8C4D7D11839D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{A9C6A983-C901-5B87-1147-6AD36C5FE4D7} = {A9C6A983-C901-5B87-1147-6AD36C5FE4D7}
|
||||
{A9C3AC83-A201-5B87-1147-6D0961FFE4D7} = {A9C3AC83-A201-5B87-1147-6D0961FFE4D7}
|
||||
{A9C3DA83-C901-5B87-1147-6DA361FFE4D7} = {A9C3DA83-C901-5B87-1147-6DA361FFE4D7}
|
||||
{B2C3DA83-C901-5BA3-1147-6DA361FFD3D7} = {B2C3DA83-C901-5BA3-1147-6DA361FFD3D7}
|
||||
{A9C34AB3-C901-5127-1147-6DA3FAFFE4D7} = {A9C34AB3-C901-5127-1147-6DA3FAFFE4D7}
|
||||
{454C2EC4-909A-4A54-8F3E-F9015FF1D69B} = {454C2EC4-909A-4A54-8F3E-F9015FF1D69B}
|
||||
{A9C34AB3-C901-5127-1147-6DA3FAFFE4D7} = {A9C34AB3-C901-5127-1147-6DA3FAFFE4D7}
|
||||
{B2C3DA83-C901-5BA3-1147-6DA361FFD3D7} = {B2C3DA83-C901-5BA3-1147-6DA361FFD3D7}
|
||||
{A9C3DA83-C901-5B87-1147-6DA361FFE4D7} = {A9C3DA83-C901-5B87-1147-6DA361FFE4D7}
|
||||
{A9C3AC83-A201-5B87-1147-6D0961FFE4D7} = {A9C3AC83-A201-5B87-1147-6D0961FFE4D7}
|
||||
{A9C6A983-C901-5B87-1147-6AD36C5FE4D7} = {A9C6A983-C901-5B87-1147-6AD36C5FE4D7}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sip_cnam_lnp", "_sip_cnam_lnp.vcproj", "{8721C91C-E1BB-4758-78A1-C0718EDFF940}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{254C6F00-6DE5-44A6-AD44-ACABA8912381} = {254C6F00-6DE5-44A6-AD44-ACABA8912381}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
|
@ -957,6 +963,10 @@ Global
|
|||
{7E8CAE11-0729-4E65-9BE8-8C4D7D11839D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{7E8CAE11-0729-4E65-9BE8-8C4D7D11839D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{7E8CAE11-0729-4E65-9BE8-8C4D7D11839D}.Release|Win32.Build.0 = Release|Win32
|
||||
{8721C91C-E1BB-4758-78A1-C0718EDFF940}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{8721C91C-E1BB-4758-78A1-C0718EDFF940}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{8721C91C-E1BB-4758-78A1-C0718EDFF940}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{8721C91C-E1BB-4758-78A1-C0718EDFF940}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
@ -0,0 +1,272 @@
|
|||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8.00"
|
||||
Name="_sip_cnam_lnp"
|
||||
ProjectGUID="{8721C91C-E1BB-4758-78A1-C0718EDFF940}"
|
||||
RootNamespace="_sip_cnam_lnp"
|
||||
>
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"
|
||||
/>
|
||||
</Platforms>
|
||||
<ToolFiles>
|
||||
</ToolFiles>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory=".\Debug\sip"
|
||||
IntermediateDirectory=".\Debug\modules"
|
||||
ConfigurationType="2"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\Debug/_sip_cnam_lnp.tlb"
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=".,.."
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
PrecompiledHeaderFile=".\Debug\modules/_sip_cnam_lnp.pch"
|
||||
AssemblerListingLocation=".\Debug\modules/"
|
||||
ObjectFile=".\Debug\modules/"
|
||||
ProgramDataBaseFileName=".\Debug\modules/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
IgnoreImportLibrary="true"
|
||||
OutputFile="Debug/sip/sip_cnam_lnp.yate"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile=".\Debug/sip_cnam_lnp.pdb"
|
||||
ImportLibrary=".\Debug/sip_cnam_lnp.lib"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
SuppressStartupBanner="true"
|
||||
OutputFile=".\Debug/_sip_cnam_lnp.bsc"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\Release\sip"
|
||||
IntermediateDirectory=".\Release\modules"
|
||||
ConfigurationType="2"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="true"
|
||||
SuppressStartupBanner="true"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\Release/_sip_cnam_lnp.tlb"
|
||||
HeaderFileName=""
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories=".,.."
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="true"
|
||||
PrecompiledHeaderFile=".\Release\modules/_sip_cnam_lnp.pch"
|
||||
AssemblerListingLocation=".\Release\modules/"
|
||||
ObjectFile=".\Release\modules/"
|
||||
ProgramDataBaseFileName=".\Release\modules/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="true"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
IgnoreImportLibrary="true"
|
||||
OutputFile="Release/sip/sip_cnam_lnp.yate"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
ProgramDatabaseFile=".\Release/sip_cnam_lnp.pdb"
|
||||
ImportLibrary=".\Release/sip_cnam_lnp.lib"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
SuppressStartupBanner="true"
|
||||
OutputFile=".\Release/_sip_cnam_lnp.bsc"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\modules\sip\sip_cnam_lnp.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions=""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Resource Files"
|
||||
Filter="ico;cur;bmp;dlg;rc;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
|
||||
>
|
||||
<File
|
||||
RelativePath="version.rc"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions=""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Release|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions=""
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Header Files"
|
||||
Filter="h;hpp;hxx;hm;inl"
|
||||
>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
|
@ -116,6 +116,7 @@ Source: "Release\server\cpuload.yate"; DestDir: "{app}\modules\server"; Flags: r
|
|||
Source: "Release\server\ccongestion.yate"; DestDir: "{app}\modules\server"; Flags: replacesameversion; Components: server\monitor
|
||||
Source: "Release\server\monitoring.yate"; DestDir: "{app}\modules\server"; Flags: replacesameversion; Components: server\monitor
|
||||
Source: "Release\server\ysnmpagent.yate"; DestDir: "{app}\modules\server"; Flags: replacesameversion; Components: server\monitor
|
||||
Source: "Release\sip\sip_cnam_lnp.yate"; DestDir: "{app}\modules\sip"; Flags: replacesameversion; Components: server
|
||||
Source: "Release\qt4\clientarchive.yate"; DestDir: "{app}\modules\qt4"; Flags: replacesameversion; Components: client\qt
|
||||
Source: "Release\qt4\customtable.yate"; DestDir: "{app}\modules\qt4"; Flags: replacesameversion; Components: client\qt
|
||||
Source: "Release\qt4\customtree.yate"; DestDir: "{app}\modules\qt4"; Flags: replacesameversion; Components: client\qt
|
||||
|
@ -280,3 +281,19 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
procedure CurPageChanged(CurPageID: Integer);
|
||||
var
|
||||
crt : String;
|
||||
begin
|
||||
if (CurPageID = wpReady) then begin
|
||||
if CrtLocal then crt := 'Install locally'
|
||||
else if CrtLoadable then crt := 'Already loadable (will not install)'
|
||||
else crt := 'Install globally';
|
||||
if crt <> '' then begin
|
||||
Wizardform.ReadyMemo.Lines.Add('');
|
||||
Wizardform.ReadyMemo.Lines.Add('C Runtimes:');
|
||||
Wizardform.ReadyMemo.Lines.Add(' ' + crt);
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
|
|
Loading…
Reference in New Issue