Win32 build fixups.

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

diff --git a/src/mod/codecs/mod_gsm/mod_gsm.vcproj b/src/mod/codecs/mod_gsm/mod_gsm.vcproj
index e7607a713b3ae04f015cec3149ec860f3313bcfc..953f9bf7cda482ed512fd6ab404bf90050d51380 100644 (file)
--- a/src/mod/codecs/mod_gsm/mod_gsm.vcproj
+++ b/src/mod/codecs/mod_gsm/mod_gsm.vcproj
@@ -67,7 +67,7 @@
                                AdditionalDependencies="libgsm.lib FreeSwitchCore.lib"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Debug;"$(OutDir)""\r
+                               AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/mod_gsm.pdb"\r
                                SubSystem="2"\r
@@ -147,7 +147,7 @@
                                AdditionalDependencies="libgsm.lib FreeSwitchCore.lib"\r
                                OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_gsm.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\Release;$(OutDir)"\r
+                               AdditionalLibraryDirectories="..\..\..\..\libs\codec\gsm\$(OutDir);..\..\..\..\w32\vsnet\$(OutDir)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index a2bdbe555095e41119e1d4c168a3aa2c56efd97d..33caa69dd3bcd32fbe6db5eb8c2b18971c158863 100644 (file)
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -41,6 +41,8 @@ If objArgs.Count >=1 Then
                GetVCBuild\r
                Wscript.echo "Detected VCBuild: " & VCBuild\r
        End If\r
+Else\r
+       GetTarGZObjects UtilsDir\r
 End If\r
 \r
 ' **************\r
@@ -979,46 +981,77 @@ Sub GetTarGZObjects(DestFolder)
 \r
        If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If\r
 \r
-       If Not FSO.FileExists(DestFolder & "XTar.dll") Then \r
-               Wget ToolsBase & "XTar.dll", DestFolder\r
+       If Not FSO.FileExists(DestFolder & "7za.exe") Then \r
+               Wget ToolsBase & "7za.exe", DestFolder\r
        End If\r
 \r
-       If Not FSO.FileExists(DestFolder & "XGZip.dll") Then \r
-               Wget ToolsBase & "XGZip.dll", DestFolder\r
-       End If\r
+'      If Not FSO.FileExists(DestFolder & "XTar.dll") Then \r
+'              Wget ToolsBase & "XTar.dll", DestFolder\r
+'      End If\r
+\r
+'      If Not FSO.FileExists(DestFolder & "XGZip.dll") Then \r
+'              Wget ToolsBase & "XGZip.dll", DestFolder\r
+'      End If\r
        \r
-       If Not FSO.FileExists(DestFolder & "XZip.dll") Then \r
-               Wget ToolsBase & "XZip.dll", DestFolder\r
-       End If\r
+'      If Not FSO.FileExists(DestFolder & "XZip.dll") Then \r
+'              Wget ToolsBase & "XZip.dll", DestFolder\r
+'      End If\r
        \r
-       WshShell.Run "regsvr32 /s " & DestFolder & "XTar.dll", 6, True\r
+'      WshShell.Run "regsvr32 /s " & DestFolder & "XTar.dll", 6, True\r
        \r
-       WshShell.Run "regsvr32 /s " & DestFolder & "XGZip.dll", 6, True\r
+'      WshShell.Run "regsvr32 /s " & DestFolder & "XGZip.dll", 6, True\r
 \r
-       WshShell.Run "regsvr32 /s " & DestFolder & "XZip.dll", 6, True\r
+       'WshShell.Run "regsvr32 /s " & DestFolder & "XZip.dll", 6, True\r
        \r
 End Sub\r
 \r
 Sub UnTarGZ(TGZfile, DestFolder)\r
-\r
-       Set objTAR = WScript.CreateObject("XStandard.TAR")\r
-       Set objGZip = WScript.CreateObject("XStandard.GZip")\r
        wscript.echo("Extracting: " & TGZfile)\r
-       objGZip.Decompress TGZfile, Destfolder\r
-       objTAR.UnPack Left(TGZfile, Len(TGZfile)-3), Destfolder\r
+'      Set objTAR = WScript.CreateObject("XStandard.TAR")\r
+'      Set objGZip = WScript.CreateObject("XStandard.GZip")\r
+'      objGZip.Decompress TGZfile, Destfolder\r
+'      objTAR.UnPack Left(TGZfile, Len(TGZfile)-3), Destfolder\r
+       \r
+'      Set objTAR = Nothing\r
+'      Set objGZip = Nothing\r
+'      WScript.Sleep(500)\r
+       Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True)\r
+       MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & TGZfile & " -y -o" & DestFolder)\r
+       MyFile.Close\r
+       Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat")\r
+       Do\r
+               WScript.Echo OExec.StdOut.ReadLine()\r
+       Loop While Not OExec.StdOut.atEndOfStream\r
+       If FSO.FileExists(Left(TGZfile, Len(TGZfile)-3)) Then  \r
+               Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True)\r
+               MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & Left(TGZfile, Len(TGZfile)-3) & " -y -o" & DestFolder)\r
+               MyFile.Close\r
+               Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat")\r
+               Do\r
+                       WScript.Echo OExec.StdOut.ReadLine()\r
+               Loop While Not OExec.StdOut.atEndOfStream\r
+               WScript.Sleep(500)\r
+               FSO.DeleteFile Left(TGZfile, Len(TGZfile)-3) ,true \r
+       End If\r
        \r
-       Set objTAR = Nothing\r
-       Set objGZip = Nothing\r
-       WScript.Sleep(500)\r
 End Sub\r
 \r
 \r
 Sub UnZip(Zipfile, DestFolder)\r
-       Dim objZip\r
-       Set objZip = WScript.CreateObject("XStandard.Zip")\r
-       wscript.echo("Extracting: " & Zipfile)\r
-       objZip.UnPack Zipfile, DestFolder\r
-       Set objZip = Nothing\r
+'      Dim objZip\r
+'      Set objZip = WScript.CreateObject("XStandard.Zip")\r
+'      wscript.echo("Extracting: " & Zipfile)\r
+'      objZip.UnPack Zipfile, DestFolder\r
+'      Set objZip = Nothing\r
+'      WScript.Sleep(500)\r
+       Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True)\r
+       MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & Zipfile & " -y -o" & DestFolder)\r
+       MyFile.Close\r
+\r
+       Set oExec = WshShell.Exec(UtilsDir & "tmpcmd.Bat")\r
+       Do\r
+               WScript.Echo OExec.StdOut.ReadLine()\r
+       Loop While Not OExec.StdOut.atEndOfStream\r
        WScript.Sleep(500)\r
 End Sub\r
 \r