fix windows build when there is a space in the source directory name.

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

diff --git a/libs/win32/apr-util/xml.vcproj b/libs/win32/apr-util/xml.vcproj
index f9ac5906bcf7d54445ff48db5ca0e4d3702ccf6e..28013412f4def1895331206a5752691236e282c6 100644 (file)
--- a/libs/win32/apr-util/xml.vcproj
+++ b/libs/win32/apr-util/xml.vcproj
@@ -346,7 +346,7 @@
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating expat.h from expat.h.in"\r
-                                               CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h&#x0D;&#x0A;"\r
+                                               CommandLine="if not exist &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h&quot; type &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h&quot;&#x0D;&#x0A;"\r
                                                Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"\r
                                        />\r
                                </FileConfiguration>\r
@@ -356,7 +356,7 @@
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating expat.h from expat.h.in"\r
-                                               CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h&#x0D;&#x0A;"\r
+                                               CommandLine="if not exist &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h&quot; type &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h&quot;&#x0D;&#x0A;"\r
                                                Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"\r
                                        />\r
                                </FileConfiguration>\r
@@ -370,7 +370,7 @@
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating config.h from winconfig.h"\r
-                                               CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h&#x0D;&#x0A;"\r
+                                               CommandLine="if not exist &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h&quot; type &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h&quot;&#x0D;&#x0A;"\r
                                                Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"\r
                                        />\r
                                </FileConfiguration>\r
@@ -380,7 +380,7 @@
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating config.h from winconfig.h"\r
-                                               CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h&#x0D;&#x0A;"\r
+                                               CommandLine="if not exist &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h&quot; type &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h&quot; &gt; &quot;$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h&quot;&#x0D;&#x0A;"\r
                                                Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"\r
                                        />\r
                                </FileConfiguration>\r

diff --git a/libs/win32/util.vbs b/libs/win32/util.vbs
index 24b31cd7e0144b3b670a5cd54e454f96dc0feb0c..30e3fd8813b6b4d97a443cafbe5b7a73e5d3c1ec 100644 (file)
--- a/libs/win32/util.vbs
+++ b/libs/win32/util.vbs
@@ -231,7 +231,7 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
        MyFile.WriteLine("@" & "cd " & quote & tmpFolder & quote )\r
        MyFile.WriteLine("@" & VersionCmd)\r
        MyFile.Close\r
-       Set oExec = WshShell.Exec(tmpFolder & "tmpVersion.Bat")\r
+       Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote)\r
        Do\r
                strFromProc = OExec.StdOut.ReadLine()\r
                VERSION=strFromProc\r

diff --git a/w32/Library/FreeSwitchCore.vcproj b/w32/Library/FreeSwitchCore.vcproj
index 6af8a5174ff1703818cf229e45ce3f208760fa4e..c5ee8115f1c966936b396471336fd52c60619dc9 100644 (file)
--- a/w32/Library/FreeSwitchCore.vcproj
+++ b/w32/Library/FreeSwitchCore.vcproj
@@ -106,7 +106,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y&#x0D;&#x0A;if not exist $(SolutionDir)$(OutDir)\db md  $(SolutionDir)$(OutDir)\db&#x0D;&#x0A;if not exist $(SolutionDir)$(OutDir)\log md  $(SolutionDir)$(OutDir)\log&#x0D;&#x0A;if not exist $(SolutionDir)$(OutDir)\log md  $(SolutionDir)$(OutDir)\htdocs&#x0D;&#x0A;&#x0D;&#x0A;"\r
+                               CommandLine="xcopy &quot;$(SolutionDir)conf\*.*&quot; &quot;$(SolutionDir)$(OutDir)\conf\&quot; /C /D /Y&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(OutDir)\db&quot; md  &quot;$(SolutionDir)$(OutDir)\db&quot;&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(OutDir)\log&quot; md  &quot;$(SolutionDir)$(OutDir)\log&quot;&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(OutDir)\htdocs&quot; md  &quot;$(SolutionDir)$(OutDir)\htdocs&quot;&#x0D;&#x0A;&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
                <Configuration\r
@@ -195,7 +195,7 @@
                        />\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y&#x0D;&#x0A;if not exist $(SolutionDir)$(OutDir)\db md  $(SolutionDir)$(OutDir)\db&#x0D;&#x0A;if not exist $(SolutionDir)$(OutDir)\log md  $(SolutionDir)$(OutDir)\log&#x0D;&#x0A;if not exist $(SolutionDir)$(OutDir)\log md  $(SolutionDir)$(OutDir)\htdocs&#x0D;&#x0A;&#x0D;&#x0A;"\r
+                               CommandLine="xcopy &quot;$(SolutionDir)conf\*.*&quot; &quot;$(SolutionDir)$(OutDir)\conf\&quot; /C /D /Y&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(OutDir)\db&quot; md  &quot;$(SolutionDir)$(OutDir)\db&quot;&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(OutDir)\log&quot; md  &quot;$(SolutionDir)$(OutDir)\log&quot;&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(OutDir)\htdocs&quot; md  &quot;$(SolutionDir)$(OutDir)\htdocs&quot;&#x0D;&#x0A;&#x0D;&#x0A;"\r
                        />\r
                </Configuration>\r
        </Configurations>\r