From b243f790242c9e20daeb02e7ada4ffd214ba4402 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sat, 14 Jan 2006 15:00:01 +0000 Subject: [PATCH] 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 | 14 +- w32/vsnet/Freeswitch.sln | 10 + w32/vsnet/GetLibs.vbs | 49 ++++- w32/vsnet/Tools/pcre/libpcre.vcproj | 20 +- w32/vsnet/Tools/pcre/pcre_chartables.c.vcproj | 202 ++++++++++++++++++ 5 files changed, 278 insertions(+), 17 deletions(-) create mode 100644 w32/vsnet/Tools/pcre/pcre_chartables.c.vcproj diff --git a/src/mod/dialplans/mod_pcre/mod_pcre.vcproj b/src/mod/dialplans/mod_pcre/mod_pcre.vcproj index a0d5138f7d..c488ce2d91 100644 --- a/src/mod/dialplans/mod_pcre/mod_pcre.vcproj +++ b/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 @@ > "Version" Then - GetTarGZObjects UtilsDir - GetVCBuild - Wscript.echo "Detected VCBuild: " & VCBuild +If objArgs.Count >=1 Then + If objArgs(0) <> "Version" Then + GetTarGZObjects UtilsDir + 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 diff --git a/w32/vsnet/Tools/pcre/libpcre.vcproj b/w32/vsnet/Tools/pcre/libpcre.vcproj index 4663851e6e..6cea048f5f 100644 --- a/w32/vsnet/Tools/pcre/libpcre.vcproj +++ b/w32/vsnet/Tools/pcre/libpcre.vcproj @@ -25,11 +25,12 @@ > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +