GetLibs.bat cleanups. No longer re-runs upgrades and such on multiple runs of the...

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

diff --git a/w32/vsnet/GetLibs.bat b/w32/vsnet/GetLibs.bat
index cb7ee17d8ebaf86a2d13ddeb51eb19ddd73877f6..bd1ea747cf827c53ad41b50587c86cd5d5fe07fe 100644 (file)
--- a/w32/vsnet/GetLibs.bat
+++ b/w32/vsnet/GetLibs.bat
@@ -36,6 +36,7 @@ set OSIPDIR=libosip2-2.2.1
 set OSIPTAR=%OSIPDIR%.tar.gz\r
 set OSIPURL=http://www.antisip.com/download/\r
 set OSIPDESTDIR=osip\r
+set BACKUPURL=http://www.sofaswitch.org/mikej/\r
 \r
 IF NOT EXIST %LIBSRCDIR% md %LIBSRCDIR%\r
 \r
@@ -55,6 +56,13 @@ IF NOT EXIST %LIBSRCDIR%\%EXOSIPTAR% IF NOT EXIST %LIBSRCDIR%\%EXOSIPDESTDIR% %W
 IF NOT EXIST %LIBSRCDIR%\%OSIPTAR% IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR% %WGET% %OSIPURL%%OSIPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%OSIPTAR% | %TAR% xvf - & ren %OSIPDIR% %OSIPDESTDIR% & del %OSIPTAR%\r
 IF NOT EXIST %LIBSRCDIR%\%JTHREADTAR% IF NOT EXIST %LIBSRCDIR%\%JTHREADDESTDIR% %WGET% %JTHREADURL%%JTHREADTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JTHREADTAR% | %TAR% xvf - & ren %JTHREADDIR% %JTHREADDESTDIR% & del %JTHREADTAR%\r
 IF NOT EXIST %LIBSRCDIR%\%JRTPTAR% IF NOT EXIST %LIBSRCDIR%\%JRTPDESTDIR% %WGET% %JRTPURL%%JRTPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JRTPTAR% | %TAR% xvf - & ren %JRTPDIR% %JRTPDESTDIR% & del %JRTPTAR%\r
+\r
+REM Backup download locations for all the libs just in case the primaries are down\r
+IF NOT EXIST %LIBSRCDIR%\%APRTAR% IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR% %WGET% %BACKUPURL%%APRTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%APRTAR% | %TAR% xvf - & ren %APRDIR% %APRDESTDIR% & del %APRTAR%\r
+IF NOT EXIST %LIBSRCDIR%\%EXOSIPTAR% IF NOT EXIST %LIBSRCDIR%\%EXOSIPDESTDIR% %WGET% %BACKUPURL%%EXOSIPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%EXOSIPTAR% | %TAR% xvf - & ren %EXOSIPDIR% %EXOSIPDESTDIR% & del %EXOSIPTAR%\r
+IF NOT EXIST %LIBSRCDIR%\%OSIPTAR% IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR% %WGET% %BACKUPURL%%OSIPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%OSIPTAR% | %TAR% xvf - & ren %OSIPDIR% %OSIPDESTDIR% & del %OSIPTAR%\r
+IF NOT EXIST %LIBSRCDIR%\%JTHREADTAR% IF NOT EXIST %LIBSRCDIR%\%JTHREADDESTDIR% %WGET% %BACKUPURL%%JTHREADTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JTHREADTAR% | %TAR% xvf - & ren %JTHREADDIR% %JTHREADDESTDIR% & del %JTHREADTAR%\r
+IF NOT EXIST %LIBSRCDIR%\%JRTPTAR% IF NOT EXIST %LIBSRCDIR%\%JRTPDESTDIR% %WGET% %BACKUPURL%%JRTPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JRTPTAR% | %TAR% xvf - & ren %JRTPDIR% %JRTPDESTDIR% & del %JRTPTAR%\r
 cd \r
 \r
 ECHO ****************************************************************\r
@@ -68,14 +76,14 @@ GOTO END
 \r
 :VS8\r
 set DEVENV="%VS80COMNTOOLS%..\IDE\devenv" \r
-IF NOT EXIST %UTILSDIR%\upgrade.vbs copy %UTILSDIR%\upgrade8.vbs %UTILSDIR%\upgrade.vbs\r
 call "%VS80COMNTOOLS%vsvars32.bat"\r
+SET MSVCVER=8\r
 GOTO NEXT\r
 \r
 :VS7\r
 set DEVENV="%VS71COMNTOOLS%..\IDE\devenv"\r
-IF NOT EXIST %UTILSDIR%\upgrade.vbs copy %UTILSDIR%\upgrade7.vbs %UTILSDIR%\upgrade.vbs\r
 call "%VS71COMNTOOLS%vsvars32.bat"\r
+SET MSVCVER=7\r
 \r
 :NEXT\r
 ECHO ****************************************************************\r
@@ -91,24 +99,26 @@ ECHO ****************************************************************
 ECHO **************            OSIP BUILD           *****************\r
 ECHO ****************************************************************\r
 \r
-del %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osipparser2.vcproj\r
-copy %UTILSDIR%\osipparser2.vcproj %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\\r
-%DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /Upgrade\r
-REM %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /build Debug\r
+IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\patched.tag del %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osipparser2.vcproj\r
+IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\patched.tag copy %UTILSDIR%\osipparser2.vcproj %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\\r
+IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\patched.tag %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /Upgrade\r
+REM IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\Debug\osip2.lib %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /build Debug\r
+IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\patched.tag ECHO. > %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\patched.tag\r
 \r
 \r
 ECHO ****************************************************************\r
 ECHO **************          EXOSIP BUILD           *****************\r
 ECHO ****************************************************************\r
 \r
-%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /Upgrade\r
-REM %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /build Debug\r
+IF NOT EXIST %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\upgrade.tag %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /Upgrade\r
+IF NOT EXIST %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\upgrade.tag ECHO. > %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\upgrade.tag\r
+REM IF NOT EXIST %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\Debug\eXosip.lib %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /build Debug\r
 \r
 ECHO ****************************************************************\r
 ECHO **************           JRTP BUILD            *****************\r
 ECHO ****************************************************************\r
 \r
-REM %DEVENV% %LIBSRCDIR%\jrtp4c\w32\jrtp4c.sln /build Debug\r
+REM IF NOT EXIST %LIBSRCDIR%\jrtp4c\w32\Debug\jrtp4c.obj %DEVENV% %LIBSRCDIR%\jrtp4c\w32\jrtp4c.sln /build Debug\r
 \r
 :END\r
 cd %UTILSDIR%\..\r

diff --git a/w32/vsnet/LaunchFreeswitch.bat b/w32/vsnet/LaunchFreeswitch.bat
deleted file mode 100644 (file)
index 7e70037..0000000
--- a/w32/vsnet/LaunchFreeswitch.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-echo %0\r
-md conf\r
-xcopy -D ..\..\..\conf\*.* conf\r
-cd mod\r
-md temp\r
-move *.ilk temp\r
-cd ..\r
-FreeSwitch.exe \r
-cd mod\r
-copy .\temp\*.ilk\r
-del .\temp\*.ilk\r
-rd temp\r
-pause
\ No newline at end of file

diff --git a/w32/vsnet/Tools/upgrade.vbs b/w32/vsnet/Tools/upgrade.vbs
new file mode 100644 (file)
index 0000000..161f98b
--- /dev/null
+++ b/w32/vsnet/Tools/upgrade.vbs
@@ -0,0 +1,39 @@
+Set objFile = Createobject("Scripting.FileSystemObject")\r
+Set objArgs = WScript.Arguments\r
+Set WshShell = WScript.CreateObject("WScript.Shell")\r
+Set WshSysEnv = WshShell.Environment("SYSTEM")\r
+\r
+If WshSysEnv("VS80COMNTOOLS")<> "" Then \r
+       Set vcProj = CreateObject("VisualStudio.VCProjectEngine.7.1")\r
+Else If WshSysEnv("VS71COMNTOOLS")<> "" Then\r
+       Set vcProj = CreateObject("VisualStudio.VCProjectEngine.8.0")\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
+'// check the arguments to be sure it's right\r
+if (objArgs.Count() < 2) Then\r
+   WScript.Echo("VC6 or 5 DSP Project File Conversion")\r
+   WScript.Echo("Opens specified .dsp and converts to VC7.1 Format.")\r
+   WScript.Echo("Will create project file with .vcproj extension")\r
+   WScript.Echo("usage: <full path\project.dsp> <full path\project.vcproj>")\r
+   WScript.Quit(1)\r
+End If\r
+\r
+\r
+WScript.Echo("Converting: "+ objArgs.Item(0))\r
+'// If there is a file name of the .vcproj extension, do not convert\r
+Set vcProject = vcProj.LoadProject(objArgs.Item(0))\r
+If Not objFile.FileExists(vcProject.ProjectFile) Then\r
+       '   // specify name and location of new project file\r
+       vcProject.ProjectFile = objArgs.Item(1)\r
+       \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
+       WScript.Echo("New Project Name: "+vcProject.ProjectFile+"")\r
+Else\r
+   WScript.Echo("ERROR!: "+vcProject.ProjectFile+" already exists!")\r
+End If\r

diff --git a/w32/vsnet/Tools/upgrade7.vbs b/w32/vsnet/Tools/upgrade7.vbs
deleted file mode 100644 (file)
index 78b5506..0000000
--- a/w32/vsnet/Tools/upgrade7.vbs
+++ /dev/null
@@ -1,28 +0,0 @@
-Set vcProj = CreateObject("VisualStudio.VCProjectEngine.7.1")\r
-Set objFile = Createobject("Scripting.FileSystemObject")\r
-Set objArgs = WScript.Arguments\r
-\r
-'// check the arguments to be sure it's right\r
-if (objArgs.Count() < 2) Then\r
-   WScript.Echo("VC6 or 5 DSP Project File Conversion")\r
-   WScript.Echo("Opens specified .dsp and converts to VC7.1 Format.")\r
-   WScript.Echo("Will create project file with .vcproj extension")\r
-   WScript.Echo("usage: <full path\project.dsp> <full path\project.vcproj>")\r
-   WScript.Quit(1)\r
-End If\r
-WScript.Echo("Converting: "+ objArgs.Item(0))\r
-'// If there is a file name of the .vcproj extension, do not convert\r
-Set vcProject = vcProj.LoadProject(objArgs.Item(0))\r
-If Not objFile.FileExists(vcProject.ProjectFile) Then\r
-'   // specify name and location of new project file\r
-vcProject.ProjectFile = objArgs.Item(1)\r
-\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
-WScript.Echo("New Project Name: "+vcProject.ProjectFile+"")\r
-\r
-else\r
-\r
-   WScript.Echo("ERROR!: "+vcProject.ProjectFile+" already exists!")\r
-End If\r

diff --git a/w32/vsnet/Tools/upgrade8.vbs b/w32/vsnet/Tools/upgrade8.vbs
deleted file mode 100644 (file)
index ec6664e..0000000
--- a/w32/vsnet/Tools/upgrade8.vbs
+++ /dev/null
@@ -1,28 +0,0 @@
-Set vcProj = CreateObject("VisualStudio.VCProjectEngine.8.0")\r
-Set objFile = Createobject("Scripting.FileSystemObject")\r
-Set objArgs = WScript.Arguments\r
-\r
-'// check the arguments to be sure it's right\r
-if (objArgs.Count() < 2) Then\r
-   WScript.Echo("VC6 or 5 DSP Project File Conversion")\r
-   WScript.Echo("Opens specified .dsp and converts to VC7.1 Format.")\r
-   WScript.Echo("Will create project file with .vcproj extension")\r
-   WScript.Echo("usage: <full path\project.dsp> <full path\project.vcproj>")\r
-   WScript.Quit(1)\r
-End If\r
-WScript.Echo("Converting: "+ objArgs.Item(0))\r
-'// If there is a file name of the .vcproj extension, do not convert\r
-Set vcProject = vcProj.LoadProject(objArgs.Item(0))\r
-If Not objFile.FileExists(vcProject.ProjectFile) Then\r
-'   // specify name and location of new project file\r
-vcProject.ProjectFile = objArgs.Item(1)\r
-\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
-WScript.Echo("New Project Name: "+vcProject.ProjectFile+"")\r
-\r
-else\r
-\r
-   WScript.Echo("ERROR!: "+vcProject.ProjectFile+" already exists!")\r
-End If\r