update to apr 1.2.6 for windows build.

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

w32/vsnet/GetLibs.vbs

@@ -236,21 +236,17 @@ WScript.Echo "Complete"
 '  ******************
 Sub BuildLibs_aprutil(BuildDebug, BuildRelease)
 	If Not FSO.FolderExists(LibDestDir & "apr-util") Then 
-		WgetUnCompress "ftp://ftp.wayne.edu/apache/apr/apr-util-1.2.2.tar.gz", LibDestDir
-		If Not FSO.FolderExists(LibDestDir & "apr-util-1.2.2") Then
+		WgetUnCompress "ftp://ftp.wayne.edu/apache/apr/apr-util-1.2.6.tar.gz", LibDestDir
+		If Not FSO.FolderExists(LibDestDir & "apr-util-1.2.6") Then
 			Wscript.echo "Unable to get apr-util from default download location, Trying backup location:"
-			WgetUnCompress LibsBase & "apr-util-1.2.2.tar.gz", LibDestDir
+			WgetUnCompress LibsBase & "apr-util-1.2.6.tar.gz", LibDestDir
 		End If
-		RenameFolder LibDestDir & "apr-util-1.2.2", "apr-util"
+		RenameFolder LibDestDir & "apr-util-1.2.6", "apr-util"
 		FSO.CopyFile Utilsdir & "apr\xml.vcproj", LibDestDir & "apr-util\xml\expat\lib\", True
-		FSO.CopyFile Utilsdir & "apr\gen_uri_delims.vcproj", LibDestDir & "apr-util\uri\", True
 		FSO.CopyFile Utilsdir & "apr\libaprutil.vcproj", LibDestDir & "apr-util\", True
 	End If 
 	If FSO.FolderExists(LibDestDir & "apr-util") Then 
 		If BuildDebug Then
-			If Not FSO.FileExists(LibDestDir & "apr-util\uri\uri_delims.h") Then 
-				BuildViaVCBuild LibDestDir & "apr-util\uri\gen_uri_delims.vcproj", "Debug"
-			End If
 			If Not FSO.FileExists(LibDestDir & "apr-util\xml\expat\lib\Debug\xml.lib") Then 
 				BuildViaVCBuild LibDestDir & "apr-util\xml\expat\lib\xml.vcproj", "Debug"
 			End If
@@ -261,9 +257,6 @@ Sub BuildLibs_aprutil(BuildDebug, BuildRelease)
 			End If
 		End If
 		If BuildRelease Then
-			If Not FSO.FileExists(LibDestDir & "apr-util\uri\uri_delims.h") Then 
-				BuildViaVCBuild LibDestDir & "apr-util\uri\gen_uri_delims.vcproj", "Release"
-			End If
 			If Not FSO.FileExists(LibDestDir & "apr-util\xml\expat\lib\Release\xml.lib") Then 
 				BuildViaVCBuild LibDestDir & "apr-util\xml\expat\lib\xml.vcproj", "Release"
 			End If
@@ -310,14 +303,14 @@ End Sub
 
 Sub BuildLibs_apr(BuildDebug, BuildRelease)
 	If Not FSO.FolderExists(LibDestDir & "apr") Then 
-		WgetUnCompress "ftp://ftp.wayne.edu/apache/apr/apr-1.2.2.tar.gz", LibDestDir
-		If Not FSO.FolderExists(LibDestDir & "apr-1.2.2") Then
+		WgetUnCompress "ftp://ftp.wayne.edu/apache/apr/apr-1.2.6.tar.gz", LibDestDir
+		If Not FSO.FolderExists(LibDestDir & "apr-1.2.6") Then
 			Wscript.echo "Unable to get apr from default download location, Trying backup location:"
-			WgetUnCompress LibsBase & "apr-1.2.2.tar.gz", LibDestDir
+			WgetUnCompress LibsBase & "apr-1.2.6.tar.gz", LibDestDir
 		End If
-		RenameFolder LibDestDir & "apr-1.2.2", "apr"
+		RenameFolder LibDestDir & "apr-1.2.6", "apr"
 		FSO.CopyFile Utilsdir & "apr\libapr.vcproj", LibDestDir & "apr\", True
-		FindReplaceInFile LibDestDir & "apr\file_io\unix\fullrw.c", "int i;", "unsigned int i;"
+		FSO.CopyFile Utilsdir & "apr\apr.hw", LibDestDir & "apr\include\", True
 	End If 
 	If FSO.FolderExists(LibDestDir & "apr") Then 
 		If BuildDebug Then

w32/vsnet/Tools/apr/libapr.vcproj

@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="libapr"
-	ProjectGUID="{7F12EAA4-8E4D-4878-9D69-64B8EA1B7A76}"
+	ProjectGUID="{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}"
 	>
 	<Platforms>
 		<Platform
@@ -45,9 +45,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/EHsc "
 				Optimization="0"
 				AdditionalIncludeDirectories="./include,./include/arch,./include/arch/win32,./include/arch/unix"
-				PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				PreprocessorDefinitions="_DEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/libapr.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -144,7 +145,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="./include,./include/arch,./include/arch/win32,./include/arch/unix"
-				PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

w32/vsnet/Tools/apr/libaprutil.vcproj

@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="libaprutil"
-	ProjectGUID="{FE09581F-2B4D-42E3-99CC-7F1B0324C29D}"
+	ProjectGUID="{F057DA7F-79E5-4B00-845C-EF446EF055E3}"
 	>
 	<Platforms>
 		<Platform
@@ -45,9 +45,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/EHsc "
 				Optimization="0"
 				AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,./dbm/sdbm,./xml/expat/lib"
-				PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/libaprutil.pch"
 				AssemblerListingLocation=".\Debug/"
@@ -71,11 +72,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib mswsock.lib wldap32.lib libapr-1.lib libapriconv-1.lib xml.lib"
+				AdditionalDependencies="ws2_32.lib mswsock.lib wldap32.lib  xml.lib libapr-1.lib libapriconv-1.lib"
 				OutputFile="Debug/libaprutil-1.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\apr\$(OutDir);..\apr-iconv\$(OutDir);.\xml\expat\lib\$(OutDir)"
+				AdditionalLibraryDirectories="xml\expat\lib\LibD;..\apr\Debug;..\apr-iconv\Debug"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/libaprutil-1.pdb"
 				SubSystem="2"
@@ -145,7 +146,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="./include,../apr/include,./include/private,../apr-iconv/include,./dbm/sdbm,./xml/expat/lib"
-				PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+				PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -171,11 +172,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib mswsock.lib wldap32.lib libapr-1.lib libapriconv-1.lib xml.lib"
+				AdditionalDependencies="ws2_32.lib mswsock.lib wldap32.lib  xml.lib libapr-1.lib libapriconv-1.lib"
 				OutputFile="Release/libaprutil-1.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\apr\$(OutDir);..\apr-iconv\$(OutDir);.\xml\expat\lib\$(OutDir)"
+				AdditionalLibraryDirectories="xml\expat\lib\LibR;..\apr\Release;..\apr-iconv\Release"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Release/libaprutil-1.pdb"
 				SubSystem="2"
@@ -1384,30 +1385,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="uri\gen_uri_delims.exe"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating uri_delims.h"
-						CommandLine=".\uri\gen_uri_delims.exe &gt;.\uri\uri_delims.h&#x0D;&#x0A;"
-						Outputs=".\uri\uri_delims.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating uri_delims.h"
-						CommandLine=".\uri\gen_uri_delims.exe &gt;.\uri\uri_delims.h&#x0D;&#x0A;"
-						Outputs=".\uri\uri_delims.h"
-					/>
-				</FileConfiguration>
-			</File>
 		</Filter>
 		<Filter
 			Name="Public Header Files"

w32/vsnet/Tools/apr/xml.vcproj

@@ -3,8 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="xml"
-	ProjectGUID="{57ACC5C6-CE0E-4BAA-8EBD-21AA92F6C6EF}"
-	RootNamespace="xml"
+	ProjectGUID="{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
 	>
 	<Platforms>
 		<Platform
@@ -16,7 +15,7 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
+			OutputDirectory=".\LibR"
 			IntermediateDirectory=".\LibR"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -44,7 +43,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -68,7 +67,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\xml.lib"
+				OutputFile=".\LibR\xml.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -91,7 +90,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
+			OutputDirectory=".\LibD"
 			IntermediateDirectory=".\LibD"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
@@ -116,9 +115,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/EHsc "
 				Optimization="0"
 				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\&quot;expat_1.95.2\&quot;"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\LibD/xml.pch"
 				AssemblerListingLocation=".\LibD/"
@@ -140,7 +140,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\xml.lib"
+				OutputFile=".\LibD\xml.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -178,7 +178,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1;$(NoInherit)"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -187,7 +187,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1;$(NoInherit)"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -200,7 +200,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1;$(NoInherit)"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -209,7 +209,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1;$(NoInherit)"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -222,7 +222,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1;$(NoInherit)"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -231,7 +231,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1;$(NoInherit)"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -245,7 +245,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1;$(NoInherit)"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -255,7 +255,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1;$(NoInherit)"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>
@@ -269,7 +269,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1;$(NoInherit)"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -279,7 +279,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;VERSION=\&quot;expat_1.95.1\&quot;;XML_MAJOR_VERSION=1;XML_MINOR_VERSION=95;XML_MICRO_VERSION=1;$(NoInherit)"
+						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 			</File>