]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
cleanup.
authorMichael Jerris <mike@jerris.com>
Mon, 13 Mar 2006 06:39:37 +0000 (06:39 +0000)
committerMichael Jerris <mike@jerris.com>
Mon, 13 Mar 2006 06:39:37 +0000 (06:39 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@855 d0543943-73ff-0310-b7d9-9358b9ac24b2

w32/vsnet/GetLibs.vbs

index e4d9ba7470b407ed1c3f155b24beefab407c069e..9226dbf7a82f0f633f7cead6d168a5664cb70c8f 100644 (file)
@@ -37,12 +37,12 @@ FreeswitchDir=Showpath(ScriptDir & "..\..")
 UtilsDir=Showpath(ScriptDir & "Tools")\r
 If objArgs.Count >=1 Then\r
        If objArgs(0) <> "Version" Then\r
-               GetTarGZObjects UtilsDir\r
+               GetCompressionTools UtilsDir\r
                GetVCBuild\r
                Wscript.echo "Detected VCBuild: " & VCBuild\r
        End If\r
 Else\r
-       GetTarGZObjects UtilsDir\r
+       GetCompressionTools UtilsDir\r
 End If\r
 \r
 ' **************\r
@@ -219,10 +219,10 @@ WScript.Echo "Complete"
 '  ******************\r
 Sub BuildLibs_aprutil(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "apr-util") Then \r
-               WgetUnTarGz "ftp://ftp.wayne.edu/apache/apr/apr-util-1.2.2.tar.gz", LibDestDir\r
+               WgetUnCompress "ftp://ftp.wayne.edu/apache/apr/apr-util-1.2.2.tar.gz", LibDestDir\r
                If Not FSO.FolderExists(LibDestDir & "apr-util-1.2.2") Then\r
                        Wscript.echo "Unable to get apr-util from default download location, Trying backup location:"\r
-                       WgetUnTarGz LibsBase & "apr-util-1.2.2.tar.gz", LibDestDir\r
+                       WgetUnCompress LibsBase & "apr-util-1.2.2.tar.gz", LibDestDir\r
                End If\r
                RenameFolder LibDestDir & "apr-util-1.2.2", "apr-util"\r
                FSO.CopyFile Utilsdir & "apr\xml.vcproj", LibDestDir & "apr-util\xml\expat\lib\", True\r
@@ -259,10 +259,10 @@ End Sub
 \r
 Sub BuildLibs_apriconv(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "apr-iconv") Then \r
-               WgetUnTarGz "ftp://ftp.wayne.edu/apache/apr/apr-iconv-1.1.1.tar.gz", LibDestDir\r
+               WgetUnCompress "ftp://ftp.wayne.edu/apache/apr/apr-iconv-1.1.1.tar.gz", LibDestDir\r
                If Not FSO.FolderExists(LibDestDir & "apr-iconv-1.1.1") Then\r
                        Wscript.echo "Unable to get apr-iconv from default download location, Trying backup location:"\r
-                       WgetUnTarGz LibsBase & "apr-iconv-1.1.1.tar.gz", LibDestDir\r
+                       WgetUnCompress LibsBase & "apr-iconv-1.1.1.tar.gz", LibDestDir\r
                End If\r
                RenameFolder LibDestDir & "apr-iconv-1.1.1", "apr-iconv"\r
                FSO.CopyFile Utilsdir & "apr\apriconv.vcproj", LibDestDir & "apr-iconv\", True\r
@@ -285,10 +285,10 @@ End Sub
 \r
 Sub BuildLibs_apr(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "apr") Then \r
-               WgetUnTarGz "ftp://ftp.wayne.edu/apache/apr/apr-1.2.2.tar.gz", LibDestDir\r
+               WgetUnCompress "ftp://ftp.wayne.edu/apache/apr/apr-1.2.2.tar.gz", LibDestDir\r
                If Not FSO.FolderExists(LibDestDir & "apr-1.2.2") Then\r
                        Wscript.echo "Unable to get apr from default download location, Trying backup location:"\r
-                       WgetUnTarGz LibsBase & "apr-1.2.2.tar.gz", LibDestDir\r
+                       WgetUnCompress LibsBase & "apr-1.2.2.tar.gz", LibDestDir\r
                End If\r
                RenameFolder LibDestDir & "apr-1.2.2", "apr"\r
                FSO.CopyFile Utilsdir & "apr\apr.vcproj", LibDestDir & "apr\", True\r
@@ -312,10 +312,10 @@ End Sub
 \r
 Sub BuildLibs_exosip(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "libeXosip2") Then \r
-               WgetUnTarGz "http://www.antisip.com/download/libeXosip2-2.2.2.tar.gz", LibDestDir\r
+               WgetUnCompress "http://www.antisip.com/download/libeXosip2-2.2.2.tar.gz", LibDestDir\r
                If Not FSO.FolderExists(LibDestDir & "libeXosip2-2.2.2") Then\r
                        Wscript.echo "Unable to get eXosip from default download location, Trying backup location:"\r
-                       WgetUnTarGz LibsBase & "libeXosip2-2.2.2.tar.gz", LibDestDir\r
+                       WgetUnCompress LibsBase & "libeXosip2-2.2.2.tar.gz", LibDestDir\r
                End If\r
                RenameFolder LibDestDir & "libeXosip2-2.2.2", "libeXosip2"\r
                FindReplaceInFile LibDestDir & "libeXosip2\platform\vsnet\eXosip.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"\r
@@ -338,10 +338,10 @@ End Sub
 \r
 Sub BuildLibs_libosip2(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "osip") Then\r
-               WgetUnTarGz "http://www.antisip.com/download/libosip2-2.2.2.tar.gz", LibDestDir\r
+               WgetUnCompress "http://www.antisip.com/download/libosip2-2.2.2.tar.gz", LibDestDir\r
                If Not FSO.FolderExists(LibDestDir & "libosip2-2.2.2") Then\r
                        Wscript.echo "Unable to get osip from default download location, Trying backup location:"\r
-                       WgetUnTarGz LibsBase & "libosip2-2.2.2.tar.gz", LibDestDir\r
+                       WgetUnCompress LibsBase & "libosip2-2.2.2.tar.gz", LibDestDir\r
                End If\r
                RenameFolder LibDestDir & "libosip2-2.2.2", "osip"\r
                FindReplaceInFile LibDestDir & "osip\platform\vsnet\osipparser2.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"\r
@@ -385,10 +385,10 @@ End Sub
 \r
 Sub BuildLibs_sqlite(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "sqlite") Then \r
-               WgetUnZip "http://www.sqlite.org/sqlite-source-3_2_7.zip", LibDestDir \r
+               WgetUnCompress "http://www.sqlite.org/sqlite-source-3_2_7.zip", LibDestDir \r
                If Not FSO.FolderExists(LibDestDir & "sqlite-source-3_2_7") Then\r
                        Wscript.echo "Unable to get SQLite from default download location, Trying backup location:"\r
-                       WgetUnTarGz LibsBase & "sqlite-source-3_2_7.zip", LibDestDir\r
+                       WgetUnCompress LibsBase & "sqlite-source-3_2_7.zip", LibDestDir\r
                End If\r
                RenameFolder LibDestDir & "sqlite-source-3_2_7", "sqlite"\r
                FSO.CopyFile Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\", True\r
@@ -412,10 +412,10 @@ End Sub
 \r
 Sub BuildLibs_iksemel(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "iksemel") Then \r
-               WgetUnTarGz "http://jabberstudio.2nw.net/iksemel/iksemel-1.2.tar.gz", LibDestDir \r
+               WgetUnCompress "http://jabberstudio.2nw.net/iksemel/iksemel-1.2.tar.gz", LibDestDir \r
                If Not FSO.FolderExists(LibDestDir & "iksemel-1.2") Then\r
                        Wscript.echo "Unable to get iksemel from default download location, Trying backup location:"\r
-                       WgetUnTarGz LibsBase & "iksemel-1.2.tar.gz", LibDestDir\r
+                       WgetUnCompress LibsBase & "iksemel-1.2.tar.gz", LibDestDir\r
                End If\r
                RenameFolder LibDestDir & "iksemel-1.2", "iksemel"\r
                FSO.CopyFile Utilsdir & "iksemel\iksemel.vcproj", LibDestDir & "iksemel\", True\r
@@ -456,7 +456,7 @@ End Sub
 \r
 Sub BuildLibs_portaudio(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "PortAudio") Then \r
-               WgetUnZip LibsBase & "portaudio_v18_1.zip", LibDestDir\r
+               WgetUnCompress LibsBase & "portaudio_v18_1.zip", LibDestDir\r
                RenameFolder LibDestDir & "portaudio_v18_1", "PortAudio"\r
        End If \r
        If FSO.FolderExists(LibDestDir & "PortAudio") Then \r
@@ -477,10 +477,10 @@ End Sub
 \r
 Sub BuildLibs_libxml2(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "libxml2") Then \r
-               WgetUnTarGz "http://xmlsoft.org/sources/libxml2-sources-2.6.23.tar.gz", LibDestDir \r
+               WgetUnCompress "http://xmlsoft.org/sources/libxml2-sources-2.6.23.tar.gz", LibDestDir \r
                If Not FSO.FolderExists(LibDestDir & "libxml2-2.6.23") Then\r
                        Wscript.echo "Unable to get libxml2 from default download location, Trying backup location:"\r
-                       WgetUnTarGz LibsBase & "libxml2-sources-2.6.23.tar.gz", LibDestDir\r
+                       WgetUnCompress LibsBase & "libxml2-sources-2.6.23.tar.gz", LibDestDir\r
                End If\r
                RenameFolder LibDestDir & "libxml2-2.6.23", "libxml2"\r
        End If\r
@@ -536,10 +536,10 @@ End Sub
 \r
 Sub BuildLibs_SpeexCodec(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "speex") Then \r
-               WgetUnTarGz "http://downloads.us.xiph.org/releases/speex/speex-1.1.11.1.tar.gz", LibDestDir\r
+               WgetUnCompress "http://downloads.us.xiph.org/releases/speex/speex-1.1.11.1.tar.gz", LibDestDir\r
                If Not FSO.FolderExists(LibDestDir & "speex-1.1.11.1") Then\r
                        Wscript.echo "Unable to get libspeex from default download location, Trying backup location:"\r
-                       WgetUnTarGz LibsBase & "speex-1.1.11.1.tar.gz", LibDestDir\r
+                       WgetUnCompress LibsBase & "speex-1.1.11.1.tar.gz", LibDestDir\r
                End If\r
                RenameFolder LibDestDir & "speex-1.1.11.1", "speex"\r
                FSO.CopyFile Utilsdir & "libspeex.vcproj", LibDestDir & "speex\win32\libspeex\", True\r
@@ -562,7 +562,7 @@ End Sub
 \r
 Sub BuildLibs_libsndfile(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "libsndfile") Then \r
-               WgetUnTarGz LibsBase & "libsndfile-1.0.12.tar.gz", LibDestDir\r
+               WgetUnCompress LibsBase & "libsndfile-1.0.12.tar.gz", LibDestDir\r
                RenameFolder LibDestDir & "libsndfile-1.0.12", "libsndfile"\r
                FSO.CopyFile Utilsdir & "libsndfile.vcproj", LibDestDir & "libsndfile\Win32\", True\r
        End If \r
@@ -584,7 +584,7 @@ End Sub
 \r
 Sub BuildLibs_howl(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "howl") Then \r
-               WgetUnTarGz LibsBase & "howl-1.0.0.tar.gz", LibDestDir\r
+               WgetUnCompress LibsBase & "howl-1.0.0.tar.gz", LibDestDir\r
                RenameFolder LibDestDir & "howl-1.0.0", "howl"\r
                FSO.CopyFile Utilsdir & "howl\libhowl.vcproj", LibDestDir & "howl\src\lib\howl\Win32\", True\r
                FSO.CopyFile Utilsdir & "howl\libmDNSResponder.vcproj", LibDestDir & "howl\src\lib\mDNSResponder\Win32\", True\r
@@ -613,7 +613,7 @@ End Sub
 \r
 Sub BuildLibs_libresample(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "libresample") Then \r
-               WgetUnZip LibsBase & "libresample-0.1.3.zip", LibDestDir\r
+               WgetUnCompress LibsBase & "libresample-0.1.3.zip", LibDestDir\r
                RenameFolder LibDestDir & "libresample-0.1.3", "libresample"\r
        End If \r
        If FSO.FolderExists(LibDestDir & "libresample") Then \r
@@ -634,7 +634,7 @@ End Sub
 \r
 Sub BuildLibs_pcre(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "pcre") Then \r
-               WgetUnTarGz LibsBase & "pcre-6.4.tar.gz", LibDestDir\r
+               WgetUnCompress LibsBase & "pcre-6.4.tar.gz", LibDestDir\r
                RenameFolder LibDestDir & "pcre-6.4", "pcre"\r
                If Not FSO.FolderExists(LibDestDir & "pcre\win32") Then\r
                        FSO.CreateFolder(LibDestDir & "pcre\win32")\r
@@ -664,7 +664,7 @@ End Sub
 \r
 Sub BuildLibs_curl(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "curl") Then \r
-               WgetUnTarGz LibsBase & "curl-7.15.2.tar.gz", LibDestDir\r
+               WgetUnCompress LibsBase & "curl-7.15.2.tar.gz", LibDestDir\r
                RenameFolder LibDestDir & "curl-7.15.2", "curl"\r
                FSO.CopyFile Utilsdir & "curl\curllib.vcproj", LibDestDir & "curl\lib\", True\r
        End If \r
@@ -686,7 +686,7 @@ End Sub
 \r
 Sub    BuildLibs_ldap(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "openldap") Then \r
-               WgetUnTarGz LibsBase & "openldap-2.3.19.tar.gz", LibDestDir\r
+               WgetUnCompress LibsBase & "openldap-2.3.19.tar.gz", LibDestDir\r
                RenameFolder LibDestDir & "openldap-2.3.19", "openldap"\r
                FSO.CopyFile Utilsdir & "openldap\lber_types.h", LibDestDir & "openldap\include\", True\r
                FSO.CopyFile Utilsdir & "openldap\ldap_config.h", LibDestDir & "openldap\include\", True\r
@@ -717,10 +717,10 @@ End Sub
 \r
 Sub BuildLibs_SpiderMonkey(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "js") Then \r
-               WgetUnZip LibsBase & "js20051231.zip", LibDestDir\r
+               WgetUnCompress LibsBase & "js20051231.zip", LibDestDir\r
                RenameFolder LibDestDir & "js20051231", "js"\r
-               WgetUnZip LibsBase & "nspr-4.6.1.winnt5.debug.zip", LibDestDir & "js"\r
-               WgetUnZip LibsBase & "nspr-4.6.1.winnt5.release.zip", LibDestDir & "js"\r
+               WgetUnCompress LibsBase & "nspr-4.6.1.winnt5.debug.zip", LibDestDir & "js"\r
+               WgetUnCompress LibsBase & "nspr-4.6.1.winnt5.release.zip", LibDestDir & "js"\r
                FSO.CreateFolder LibDestDir & "js\nspr\"\r
                FSO.CopyFolder LibDestDir & "js\nspr-4.6.1.winnt5.debug\nspr-4.6.1\*", LibDestDir & "js\nspr\",true\r
        End If \r
@@ -774,7 +774,7 @@ Sub CreateSwitchVersion()
                VERSION=strFromProc\r
        Loop While Not OExec.StdOut.atEndOfStream\r
        If VERSION = "" Then\r
-               WgetUnZip ToolsBase & "svnversion.zip", UtilsDir \r
+               WgetUnCompress ToolsBase & "svnversion.zip", UtilsDir \r
                Set oExec = WshShell.Exec(UtilsDir & "svnversion\tmpVersion.Bat")\r
                Do\r
                        strFromProc = OExec.StdOut.ReadLine()\r
@@ -798,27 +798,6 @@ Sub CreateSwitchVersion()
        End If\r
 End Sub\r
 \r
-Sub UpgradeViaDevEnv(ProjectFile)\r
-       Set oExec = WshShell.Exec(quote & DevEnv & quote & " " & quote & ProjectFile & quote & " /Upgrade ")\r
-       Do While oExec.Status <> 1\r
-       WScript.Sleep 100\r
-       Loop\r
-End Sub\r
-\r
-Sub BuildViaDevEnv(ProjectFile, BuildType)\r
-       Wscript.echo "Building : " & ProjectFile & " Config type: " & BuildType\r
-       BuildCmd=quote & DevEnv & quote & " " & quote & ProjectFile & quote & " /Build " & BuildType\r
-       Set MyFile = fso.CreateTextFile(UtilsDir & "tmpBuild.Bat", True)\r
-       MyFile.WriteLine("@" & BuildCmd)\r
-       MyFile.Close\r
-\r
-       Set oExec = WshShell.Exec(UtilsDir & "tmpBuild.Bat")\r
-       Do\r
-               strFromProc = OExec.StdOut.ReadLine()\r
-               WScript.Echo  strFromProc\r
-       Loop While Not OExec.StdOut.atEndOfStream\r
-End Sub\r
-\r
 Sub BuildViaVCBuild(ProjectFile, BuildType)\r
        Wscript.echo "Building : " & ProjectFile & " Config type: " & BuildType\r
        BuildCmd=quote & VCBuild & quote & " /nologo /nocolor " & quote & ProjectFile & quote & " " & quote & BuildType & quote\r
@@ -873,52 +852,11 @@ Sub GetVCBuild()
        End If\r
 End Sub\r
 \r
-Sub GetDevEnv()\r
-       If WshSysEnv("VS80COMNTOOLS")<> "" Then \r
-               vcver = "8"\r
-               DevEnv=Showpath(WshSysEnv("VS80COMNTOOLS")&"..\IDE\") & "devenv"\r
-       Else If WshSysEnv("VS71COMNTOOLS")<> "" Then\r
-               vcver = "7"\r
-               DevEnv=Showpath(WshSysEnv("VS71COMNTOOLS")&"..\IDE\") & "devenv"\r
-       Else\r
-               Wscript.Echo("Did not find any Visual Studio .net 2003 or 2005 on your machine")\r
-               WScript.Quit(1)\r
-       End If\r
-       End If\r
-End Sub\r
-\r
-\r
 Sub RenameFolder(FolderName, NewFolderName)\r
        Set Folder=FSO.GetFolder(FolderName)\r
        Folder.Name = NewFolderName\r
 End Sub\r
 \r
-Sub Upgrade(OldFileName, NewFileName)\r
-       If WshSysEnv("VS80COMNTOOLS")<> "" Then \r
-               Wscript.echo "8.0"\r
-               Set vcProj = CreateObject("VisualStudio.VCProjectEngine.8.0")\r
-               \r
-       Else If WshSysEnv("VS71COMNTOOLS")<> "" Then\r
-               Wscript.echo "7.1"\r
-               Set vcProj = CreateObject("VisualStudio.VCProjectEngine.7.1")\r
-       Else\r
-               Wscript.Echo("Did not find any Visual Studio .net 2003 or 2005 on your machine")\r
-               WScript.Quit(1)\r
-       End If\r
-       End If\r
-               \r
-       Set vcProject = vcProj.LoadProject(OldFileName)\r
-       If Not FSO.FileExists(vcProject.ProjectFile) Then\r
-               '   // specify name and location of new project file\r
-               vcProject.ProjectFile = NewFileName\r
-       '   // call the project engine to save this off. \r
-       '   // when no name is shown, it will create one with the .vcproj name\r
-       vcProject.Save()\r
-       End If\r
-'      WScript.Echo("New Project Name: "+vcProject.ProjectFile+"")\r
-'On Error GoTo 0\r
-End Sub\r
-\r
 Sub Unix2dos(FileName)\r
        Const OpenAsASCII = 0  ' Opens the file as ASCII (TristateFalse) \r
        Const OpenAsUnicode = -1  ' Opens the file as Unicode (TristateTrue) \r
@@ -954,17 +892,8 @@ Sub FindReplaceInFile(FileName, sFind, sReplace)
        fNewFile.WriteLine sText\r
        fNewFile.Close\r
 End Sub\r
-       \r
-Sub WgetUnTarGZ(URL, DestFolder)\r
-       If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If\r
-       StartPos = InstrRev(URL, "/", -1, 1)   \r
-       strlength = Len(URL)\r
-       filename=Right(URL,strlength-StartPos)\r
-       Wget URL, DestFolder\r
-       UnTarGZ Destfolder & filename, DestFolder\r
-End Sub\r
 \r
-Sub WgetUnZip(URL, DestFolder)\r
+Sub WgetUnCompress(URL, DestFolder)\r
        If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If\r
        StartPos = InstrRev(URL, "/", -1, 1) \r
        strlength = Len(URL)\r
@@ -972,92 +901,47 @@ Sub WgetUnZip(URL, DestFolder)
        NameEnd = InstrRev(filename, ".",-1, 1)\r
        filestrlength = Len(filename)\r
        filebase = Left(filename,NameEnd)\r
+       fileext = Right(filename, Len(filename) - NameEnd)\r
        Wget URL, DestFolder\r
-       UnZip Destfolder & filename, DestFolder & filebase\r
+       If fileext = "zip" Then\r
+               UnCompress Destfolder & filename, DestFolder & filebase\r
+       Else\r
+               UnCompress Destfolder & filename, DestFolder    \r
+       End If\r
 End Sub\r
 \r
-Sub GetTarGZObjects(DestFolder)\r
+Sub GetCompressionTools(DestFolder)\r
        Dim oExec\r
-\r
        If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If\r
-\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 & "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
-       \r
-'      WshShell.Run "regsvr32 /s " & DestFolder & "XTar.dll", 6, True\r
-       \r
-'      WshShell.Run "regsvr32 /s " & DestFolder & "XGZip.dll", 6, True\r
-\r
-       'WshShell.Run "regsvr32 /s " & DestFolder & "XZip.dll", 6, True\r
-       \r
+       End If  \r
 End Sub\r
 \r
-Sub UnTarGZ(TGZfile, DestFolder)\r
-       wscript.echo("Extracting: " & TGZfile)\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
+Sub UnCompress(Archive, DestFolder)\r
+       wscript.echo("Extracting: " & Archive)\r
        Set MyFile = fso.CreateTextFile(UtilsDir & "tmpcmd.Bat", True)\r
-       MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & TGZfile & " -y -o" & DestFolder)\r
+       MyFile.WriteLine("@" & UtilsDir & "7za.exe x " & Archive & " -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
+       If FSO.FileExists(Left(Archive, Len(Archive)-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.WriteLine("@" & UtilsDir & "7za.exe x " & Left(Archive, Len(Archive)-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
+               FSO.DeleteFile Left(Archive, Len(Archive)-3) ,true \r
        End If\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
-'      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
-\r
 Sub Wget(URL, DestFolder)\r
-\r
        StartPos = InstrRev(URL, "/", -1, 1)   \r
        strlength = Len(URL)\r
        filename=Right(URL,strlength-StartPos)\r
@@ -1074,15 +958,9 @@ Sub Wget(URL, DestFolder)
        oStream.type = adTypeBinary\r
        oStream.open\r
        oStream.write xml.responseBody\r
-       \r
-       ' Do not overwrite an existing file\r
-       'oStream.savetofile DestFolder & filename, adSaveCreateNotExist\r
-       \r
-       ' Use this form to overwrite a file if it already exists\r
-        oStream.savetofile DestFolder & filename, adSaveCreateOverWrite\r
+       oStream.savetofile DestFolder & filename, adSaveCreateOverWrite\r
        \r
        oStream.close\r
-       \r
 End Sub\r
 \r
 Function Showpath(folderspec)\r