Author: mikej Date: Wed Jan 31 02:54:02 2007 New Revision: 4096 Modified: freeswitch/trunk/libs/win32/apr-util/xml.vcproj freeswitch/trunk/libs/win32/util.vbs freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: fix windows build when there is a space in the source directory name. Modified: freeswitch/trunk/libs/win32/apr-util/xml.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/apr-util/xml.vcproj (original) +++ freeswitch/trunk/libs/win32/apr-util/xml.vcproj Wed Jan 31 02:54:02 2007 @@ -346,7 +346,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating expat.h from expat.h.in" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h " + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" " Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" /> </FileConfiguration> @@ -356,7 +356,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating expat.h from expat.h.in" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h " + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" " Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" /> </FileConfiguration> @@ -370,7 +370,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h " + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" " Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" /> </FileConfiguration> @@ -380,7 +380,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h " + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" " Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/util.vbs ============================================================================== --- freeswitch/trunk/libs/win32/util.vbs (original) +++ freeswitch/trunk/libs/win32/util.vbs Wed Jan 31 02:54:02 2007 @@ -231,7 +231,7 @@ MyFile.WriteLine("@" & "cd " & quote & tmpFolder & quote ) MyFile.WriteLine("@" & VersionCmd) MyFile.Close - Set oExec = WshShell.Exec(tmpFolder & "tmpVersion.Bat") + Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote) Do strFromProc = OExec.StdOut.ReadLine() VERSION=strFromProc Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Wed Jan 31 02:54:02 2007 @@ -106,7 +106,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y if not exist $(SolutionDir)$(OutDir)\db md $(SolutionDir)$(OutDir)\db if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\log if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\htdocs " + CommandLine="xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db" if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log" if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs" " /> </Configuration> <Configuration @@ -195,7 +195,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y if not exist $(SolutionDir)$(OutDir)\db md $(SolutionDir)$(OutDir)\db if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\log if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\htdocs " + CommandLine="xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db" if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log" if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs" " /> </Configuration> </Configurations>