add mod_pcre to msvc build. Add building of pcre library.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@380 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/dialplans/mod_pcre/mod_pcre.vcproj

@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="mod_pcre"
-	ProjectGUID="{2988EB83-785F-45D4-8731-8E1E4345177E}"
+	ProjectGUID="{07113B25-D3AF-4E04-BA77-4CD1171F022C}"
 	RootNamespace="mod_pcre"
 	Keyword="Win32Proj"
 	>
@@ -25,6 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_pcre Debug"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -41,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;"
+				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\pcre&quot;;&quot;$(InputDir)..\..\..\..\libs\pcre\win32&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -62,9 +63,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libpcre.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_pcre.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(InputDir)..\..\..\libs\apr\Debug"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\pcre\win32\Debug&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/mod_pcre.pdb"
 				SubSystem="2"
@@ -106,6 +108,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_pcre Release"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -121,7 +124,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;"
+				AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\pcre&quot;;&quot;$(InputDir)..\..\..\..\libs\pcre\win32&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -140,9 +143,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libpcre.lib"
 				OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_pcre.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\libs\apr\Release&quot;"
+				AdditionalLibraryDirectories="&quot;$(InputDir)..\..\..\..\libs\pcre\win32\Release&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"

w32/vsnet/Freeswitch.sln

@@ -111,6 +111,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "docs", "..\..\docs\docs.vcp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchVersion", "FreeSwitchVersion.vcproj", "{FE191916-DEDD-43B3-B28C-D09C9088C586}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_pcre", "..\..\src\mod\dialplans\mod_pcre\mod_pcre.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -193,6 +198,10 @@ Global
 		{FE191916-DEDD-43B3-B28C-D09C9088C586}.Debug|Win32.Build.0 = Debug|Win32
 		{FE191916-DEDD-43B3-B28C-D09C9088C586}.Release|Win32.ActiveCfg = Release|Win32
 		{FE191916-DEDD-43B3-B28C-D09C9088C586}.Release|Win32.Build.0 = Release|Win32
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Debug|Win32.Build.0 = Debug|Win32
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|Win32.ActiveCfg = Release|Win32
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -209,6 +218,7 @@ Global
 		{78100236-7CEA-4948-96CC-E8ED3160329C} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{E1794405-29D4-466D-9BE3-DD2344C2A663} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{2988EB83-785F-45D4-8731-8E1E4345177E} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4}
+		{07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4}
 		{3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{FE3540C5-3303-46E0-A69E-D92F775687F1} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}

w32/vsnet/GetLibs.vbs

@@ -23,6 +23,7 @@ BuildModCodecGSM=False
 BuildModXMPPEvent=False
 BuildModsndfile=False
 BuildModrawaudio=False
+BuildModpcre=False
 BuildSpiderMonkey=False
 quote=Chr(34)
 ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName))
@@ -32,10 +33,12 @@ LibsBase="http://www.freeswitch.org/downloads/libs/"
 LibDestDir=Showpath(ScriptDir & "..\..\libs")
 FreeswitchDir=Showpath(ScriptDir & "..\..")
 UtilsDir=Showpath(ScriptDir & "Tools")
-If objArgs(0) <> "Version" Then
+If objArgs.Count >=1 Then
-	GetTarGZObjects UtilsDir
+	If objArgs(0) <> "Version" Then
-	GetVCBuild
+		GetTarGZObjects UtilsDir
-	Wscript.echo "Detected VCBuild: " & VCBuild
+		GetVCBuild
+		Wscript.echo "Detected VCBuild: " & VCBuild
+	End If
 End If
 
 ' **************
@@ -78,6 +81,8 @@ If objArgs.Count >=1 Then
 			BuildModsndfile=True
 		Case "Mod_rawaudio"
 			BuildModrawaudio=True
+		Case "Mod_pcre"
+			BuildModpcre=True
 		Case Else
 			BuildCore=True
 			BuildModExosip=True
@@ -89,6 +94,7 @@ If objArgs.Count >=1 Then
 			BuildModsndfile=True
 			BuildModrawaudio=True
 			BuildVersion=True
+			BuildModpcre=True
 	End Select
 Else
 	BuildCore=True
@@ -101,6 +107,7 @@ Else
 	BuildModsndfile=True
 	BuildModrawaudio=True
 	BuildVersion=True
+	BuildModpcre=True
 End If
 
 ' ******************
@@ -167,6 +174,10 @@ If BuildModrawaudio Then
 	BuildLibs_libresample BuildDebug, BuildRelease
 End If
 
+If BuildModpcre Then
+	BuildLibs_pcre BuildDebug, BuildRelease
+End If
+
 If BuildSpiderMonkey Then
 	BuildLibs_SpiderMonkey BuildDebug, BuildRelease
 End If
@@ -556,6 +567,36 @@ Sub BuildLibs_libresample(BuildDebug, BuildRelease)
 	End If 
 End Sub
 
+Sub BuildLibs_pcre(BuildDebug, BuildRelease)
+	If Not FSO.FolderExists(LibDestDir & "pcre") Then 
+		WgetUnTarGz LibsBase & "pcre-6.4.tar.gz", LibDestDir
+		RenameFolder LibDestDir & "pcre-6.4", "pcre"
+		If Not FSO.FolderExists(LibDestDir & "pcre\win32") Then
+			FSO.CreateFolder(LibDestDir & "pcre\win32")
+		End If
+		FSO.CopyFile Utilsdir & "pcre\libpcre.vcproj", LibDestDir & "pcre\win32\", True
+		FSO.CopyFile Utilsdir & "pcre\pcre_chartables.c.vcproj", LibDestDir & "pcre\win32\", True
+		FSO.CopyFile Utilsdir & "pcre\pcre.h", LibDestDir & "pcre\win32\", True
+		FSO.CopyFile Utilsdir & "pcre\config.h", LibDestDir & "pcre\win32\", True
+	End If 
+	If FSO.FolderExists(LibDestDir & "pcre") Then 
+		If BuildDebug Then
+			If Not FSO.FileExists(LibDestDir & "pcre\win32\Debug\libpcre.lib") Then 
+				BuildViaVCBuild LibDestDir & "pcre\win32\pcre_chartables.c.vcproj", "Debug"
+				BuildViaVCBuild LibDestDir & "pcre\win32\libpcre.vcproj", "Debug"
+			End If
+		End If
+		If BuildRelease Then
+			If Not FSO.FileExists(LibDestDir & "pcre\win32\Release\libpcre.lib") Then 
+				BuildViaVCBuild LibDestDir & "pcre\win32\pcre_chartables.c.vcproj", "Release"
+				BuildViaVCBuild LibDestDir & "pcre\win32\libpcre.vcproj", "Release"
+			End If
+		End If
+	Else
+		Wscript.echo "Unable to download pcre"
+	End If 
+End Sub
+
 Sub BuildLibs_SpiderMonkey(BuildDebug, BuildRelease)
 	If Not FSO.FolderExists(LibDestDir & "js") Then 
 		WgetUnZip LibsBase & "js20051231.zip", LibDestDir

w32/vsnet/Tools/pcre/libpcre.vcproj

@@ -25,11 +25,12 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="building pcre_chartables.c"
+				Description=""
-				CommandLine="if not exist pcre_chartables.c call &quot;$(VCInstallDir)bin\vcvars32.bat&quot;&#x0D;&#x0A;if not exist pcre_chartables.c &quot;$(VCInstallDir)bin\cl.exe&quot; ..\dftables.c /I. /D_CRT_SECURE_NO_DEPRECATE&#x0D;&#x0A;if not exist pcre_chartables.c dftables.exe pcre_chartables.c&#x0D;&#x0A;"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				Description=""
 				CommandLine=""
 				AdditionalDependencies=""
 				Outputs=""
@@ -110,11 +111,12 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="building pcre_chartables.c"
+				Description=""
-				CommandLine="if not exist pcre_chartables.c call &quot;$(VCInstallDir)bin\vcvars32.bat&quot;&#x0D;&#x0A;if not exist pcre_chartables.c &quot;$(VCInstallDir)bin\cl.exe&quot; ..\dftables.c /I. /D_CRT_SECURE_NO_DEPRECATE&#x0D;&#x0A;if not exist pcre_chartables.c dftables.exe pcre_chartables.c&#x0D;&#x0A;"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				Description=""
 				CommandLine=""
 				AdditionalDependencies=""
 				Outputs=""
@@ -196,11 +198,12 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="building pcre_chartables.c"
+				Description=""
-				CommandLine="if not exist pcre_chartables.c call &quot;$(VCInstallDir)bin\vcvars32.bat&quot;&#x0D;&#x0A;if not exist pcre_chartables.c &quot;$(VCInstallDir)bin\cl.exe&quot; ..\dftables.c /I. /D_CRT_SECURE_NO_DEPRECATE&#x0D;&#x0A;if not exist pcre_chartables.c dftables.exe pcre_chartables.c&#x0D;&#x0A;"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				Description=""
 				CommandLine=""
 				AdditionalDependencies=""
 				Outputs=""
@@ -297,11 +300,12 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="building pcre_chartables.c"
+				Description=""
-				CommandLine="if not exist pcre_chartables.c call &quot;$(VCInstallDir)bin\vcvars32.bat&quot;&#x0D;&#x0A;if not exist pcre_chartables.c &quot;$(VCInstallDir)bin\cl.exe&quot; ..\dftables.c /I. /D_CRT_SECURE_NO_DEPRECATE&#x0D;&#x0A;if not exist pcre_chartables.c dftables.exe pcre_chartables.c&#x0D;&#x0A;"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
+				Description=""
 				CommandLine=""
 				AdditionalDependencies=""
 				Outputs=""

w32/vsnet/Tools/pcre/pcre_chartables.c.vcproj

@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Generate pcre_chartables.c"
+	ProjectGUID="{1CED5987-A529-46DC-B30F-870D85FF9C94}"
+	RootNamespace="Generatepcre_chartablesc"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="."
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\dftables.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="$(TargetPath) $(ProjectDir)pcre_chartables.c"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\dftables.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="$(TargetPath) $(ProjectDir)pcre_chartables.c"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\dftables.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>