Fix clean build on windows, and hack when using 1.4 svn to still build.

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

diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index f9f21cf18e3d9c045fa39d3a8321b30d68c955c3..5f08109933c469fc67f5b5a03f122beb1e4aa45d 100644 (file)
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -175,6 +175,8 @@ If BuildCore Then
        BuildLibs_srtp BuildDebug, BuildRelease\r
        FSO.CopyFile LibDestDir & "srtp\include\*.h", LibDestDir & "include"\r
        FSO.CopyFile LibDestDir & "srtp\crypto\include\*.h", LibDestDir & "include"\r
+       BuildLibs_pcre BuildDebug, BuildRelease\r
+       FSO.CopyFile LibDestDir & "pcre\win32\pcre.h", LibDestDir & "include"\r
 End If\r
 \r
 If BuildModXMLRpc Then\r
@@ -251,10 +253,10 @@ Sub BuildLibs_aprutil(BuildDebug, BuildRelease)
        If Not FSO.FolderExists(LibDestDir & "apr-util") Then\r
                Wscript.echo "Unable to get apr-util from default download location, Trying backup location:"\r
                WgetUnCompress LibsBase & "apr-util-1.2.7.tar.gz", LibDestDir\r
+               RenameFolder LibDestDir & "apr-util-1.2.7", "apr-util"\r
+               FSO.CopyFile Utilsdir & "apr\xml.vcproj", LibDestDir & "apr-util\xml\expat\lib\", True\r
+               FSO.CopyFile Utilsdir & "apr\libaprutil.vcproj", LibDestDir & "apr-util\", True\r
        End If\r
-       RenameFolder LibDestDir & "apr-util-1.2.7", "apr-util"\r
-       FSO.CopyFile Utilsdir & "apr\xml.vcproj", LibDestDir & "apr-util\xml\expat\lib\", True\r
-       FSO.CopyFile Utilsdir & "apr\libaprutil.vcproj", LibDestDir & "apr-util\", True\r
        If FSO.FolderExists(LibDestDir & "apr-util") Then \r
                If BuildDebug Then\r
                        If Not FSO.FileExists(LibDestDir & "apr-util\xml\expat\lib\LibD\xml.lib") Then \r
@@ -282,12 +284,12 @@ Sub BuildLibs_aprutil(BuildDebug, BuildRelease)
 End Sub\r
 \r
 Sub BuildLibs_apriconv(BuildDebug, BuildRelease)\r
-       If Not FSO.FolderExists(LibDestDir & "apr-iconv-1.1.1") Then\r
+       If Not FSO.FolderExists(LibDestDir & "apr-iconv") Then\r
                Wscript.echo "Unable to get apr-iconv from default download location, Trying backup location:"\r
                WgetUnCompress LibsBase & "apr-iconv-1.1.1.tar.gz", LibDestDir\r
+               RenameFolder LibDestDir & "apr-iconv-1.1.1", "apr-iconv"\r
+               FSO.CopyFile Utilsdir & "apr\libapriconv.vcproj", LibDestDir & "apr-iconv\", True\r
        End If\r
-       RenameFolder LibDestDir & "apr-iconv-1.1.1", "apr-iconv"\r
-       FSO.CopyFile Utilsdir & "apr\libapriconv.vcproj", LibDestDir & "apr-iconv\", True\r
        If FSO.FolderExists(LibDestDir & "apr-iconv") Then \r
                If BuildDebug Then\r
                        If Not FSO.FileExists(LibDestDir & "apr-iconv\Debug\libapriconv-1.lib") Then \r
@@ -312,10 +314,10 @@ Sub BuildLibs_apr(BuildDebug, BuildRelease)
        If Not FSO.FolderExists(LibDestDir & "apr") Then\r
                Wscript.echo "Unable to get apr from default download location, Trying backup location:"\r
                WgetUnCompress LibsBase & "apr-1.2.7.tar.gz", LibDestDir\r
+               RenameFolder LibDestDir & "apr-1.2.7", "apr"\r
+               FSO.CopyFile Utilsdir & "apr\libapr.vcproj", LibDestDir & "apr\", True\r
+               FSO.CopyFile Utilsdir & "apr\apr.hw", LibDestDir & "apr\include\", True\r
        End If\r
-       RenameFolder LibDestDir & "apr-1.2.7", "apr"\r
-       FSO.CopyFile Utilsdir & "apr\libapr.vcproj", LibDestDir & "apr\", True\r
-       FSO.CopyFile Utilsdir & "apr\apr.hw", LibDestDir & "apr\include\", True\r
        If FSO.FolderExists(LibDestDir & "apr") Then \r
                If BuildDebug Then\r
                        If Not FSO.FileExists(LibDestDir & "apr\Debug\libapr-1.lib") Then \r
@@ -415,10 +417,10 @@ Sub BuildLibs_sqlite(BuildDebug, BuildRelease)
                If Not FSO.FolderExists(LibDestDir & "sqlite") Then\r
                        Wscript.echo "Unable to get SQLite from default download location, Trying backup location:"\r
                        WgetUnCompress LibsBase & "sqlite-source-3_3_6.zip", LibDestDir\r
+                       RenameFolder LibDestDir & "sqlite-source-3_3_6", "sqlite"\r
+                       FSO.CopyFile Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\", True\r
+                       FindReplaceInFile LibDestDir & "sqlite\sqlite.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"\r
                End If\r
-               RenameFolder LibDestDir & "sqlite-source-3_3_6", "sqlite"\r
-               FSO.CopyFile Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\", True\r
-               FindReplaceInFile LibDestDir & "sqlite\sqlite.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"\r
        If FSO.FolderExists(LibDestDir & "sqlite") Then \r
                If BuildDebug Then\r
                        If Not FSO.FileExists(LibDestDir & "sqlite\Debug DLL\sqlite.lib") Then \r
@@ -916,6 +918,16 @@ Sub CreateSwitchVersion()
                FSO.CopyFile FreeswitchDir & "src\include\switch_version.h.in", FreeswitchDir & "src\include\switch_version.h", true\r
                FindReplaceInFile FreeswitchDir & "src\include\switch_version.h", "@SVN_VERSION@", VERSION\r
        End If\r
+       If VERSION = "" Then\r
+               VERSION = "UNKNOWN"\r
+               Set MyFile = fso.CreateTextFile(UtilsDir & "lastversion", True)\r
+               MyFile.WriteLine(VERSION)\r
+               MyFile.Close\r
+       \r
+               FSO.CopyFile FreeswitchDir & "src\include\switch_version.h.in", FreeswitchDir & "src\include\switch_version.h", true\r
+               FindReplaceInFile FreeswitchDir & "src\include\switch_version.h", "@SVN_VERSION@", VERSION\r
+       End If\r
+       \r
 End Sub\r
 \r
 Sub BuildViaVCBuild(ProjectFile, BuildType)\r
@@ -973,6 +985,7 @@ Sub GetVCBuild()
 End Sub\r
 \r
 Sub RenameFolder(FolderName, NewFolderName)\r
+       wscript.echo FolderName\r
        Set Folder=FSO.GetFolder(FolderName)\r
        Folder.Name = NewFolderName\r
 End Sub\r