diff --git a/w32/vsnet/GetLibs.bat b/w32/vsnet/GetLibs.bat index cb7ee17d8e..bd1ea747cf 100644 --- 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 set OSIPURL=http://www.antisip.com/download/ set OSIPDESTDIR=osip +set BACKUPURL=http://www.sofaswitch.org/mikej/ IF NOT EXIST %LIBSRCDIR% md %LIBSRCDIR% @@ -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% IF NOT EXIST %LIBSRCDIR%\%JTHREADTAR% IF NOT EXIST %LIBSRCDIR%\%JTHREADDESTDIR% %WGET% %JTHREADURL%%JTHREADTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JTHREADTAR% | %TAR% xvf - & ren %JTHREADDIR% %JTHREADDESTDIR% & del %JTHREADTAR% IF NOT EXIST %LIBSRCDIR%\%JRTPTAR% IF NOT EXIST %LIBSRCDIR%\%JRTPDESTDIR% %WGET% %JRTPURL%%JRTPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JRTPTAR% | %TAR% xvf - & ren %JRTPDIR% %JRTPDESTDIR% & del %JRTPTAR% + +REM Backup download locations for all the libs just in case the primaries are down +IF NOT EXIST %LIBSRCDIR%\%APRTAR% IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR% %WGET% %BACKUPURL%%APRTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%APRTAR% | %TAR% xvf - & ren %APRDIR% %APRDESTDIR% & del %APRTAR% +IF NOT EXIST %LIBSRCDIR%\%EXOSIPTAR% IF NOT EXIST %LIBSRCDIR%\%EXOSIPDESTDIR% %WGET% %BACKUPURL%%EXOSIPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%EXOSIPTAR% | %TAR% xvf - & ren %EXOSIPDIR% %EXOSIPDESTDIR% & del %EXOSIPTAR% +IF NOT EXIST %LIBSRCDIR%\%OSIPTAR% IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR% %WGET% %BACKUPURL%%OSIPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%OSIPTAR% | %TAR% xvf - & ren %OSIPDIR% %OSIPDESTDIR% & del %OSIPTAR% +IF NOT EXIST %LIBSRCDIR%\%JTHREADTAR% IF NOT EXIST %LIBSRCDIR%\%JTHREADDESTDIR% %WGET% %BACKUPURL%%JTHREADTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JTHREADTAR% | %TAR% xvf - & ren %JTHREADDIR% %JTHREADDESTDIR% & del %JTHREADTAR% +IF NOT EXIST %LIBSRCDIR%\%JRTPTAR% IF NOT EXIST %LIBSRCDIR%\%JRTPDESTDIR% %WGET% %BACKUPURL%%JRTPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JRTPTAR% | %TAR% xvf - & ren %JRTPDIR% %JRTPDESTDIR% & del %JRTPTAR% cd ECHO **************************************************************** @@ -68,14 +76,14 @@ GOTO END :VS8 set DEVENV="%VS80COMNTOOLS%..\IDE\devenv" -IF NOT EXIST %UTILSDIR%\upgrade.vbs copy %UTILSDIR%\upgrade8.vbs %UTILSDIR%\upgrade.vbs call "%VS80COMNTOOLS%vsvars32.bat" +SET MSVCVER=8 GOTO NEXT :VS7 set DEVENV="%VS71COMNTOOLS%..\IDE\devenv" -IF NOT EXIST %UTILSDIR%\upgrade.vbs copy %UTILSDIR%\upgrade7.vbs %UTILSDIR%\upgrade.vbs call "%VS71COMNTOOLS%vsvars32.bat" +SET MSVCVER=7 :NEXT ECHO **************************************************************** @@ -91,24 +99,26 @@ ECHO **************************************************************** ECHO ************** OSIP BUILD ***************** ECHO **************************************************************** -del %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osipparser2.vcproj -copy %UTILSDIR%\osipparser2.vcproj %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\ -%DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /Upgrade -REM %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /build Debug +IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\patched.tag del %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osipparser2.vcproj +IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\patched.tag copy %UTILSDIR%\osipparser2.vcproj %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\ +IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\patched.tag %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /Upgrade +REM IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\Debug\osip2.lib %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /build Debug +IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\patched.tag ECHO. > %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\patched.tag ECHO **************************************************************** ECHO ************** EXOSIP BUILD ***************** ECHO **************************************************************** -%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /Upgrade -REM %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /build Debug +IF NOT EXIST %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\upgrade.tag %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /Upgrade +IF NOT EXIST %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\upgrade.tag ECHO. > %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\upgrade.tag +REM IF NOT EXIST %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\Debug\eXosip.lib %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /build Debug ECHO **************************************************************** ECHO ************** JRTP BUILD ***************** ECHO **************************************************************** -REM %DEVENV% %LIBSRCDIR%\jrtp4c\w32\jrtp4c.sln /build Debug +REM IF NOT EXIST %LIBSRCDIR%\jrtp4c\w32\Debug\jrtp4c.obj %DEVENV% %LIBSRCDIR%\jrtp4c\w32\jrtp4c.sln /build Debug :END cd %UTILSDIR%\.. diff --git a/w32/vsnet/LaunchFreeswitch.bat b/w32/vsnet/LaunchFreeswitch.bat deleted file mode 100644 index 7e7003707e..0000000000 --- a/w32/vsnet/LaunchFreeswitch.bat +++ /dev/null @@ -1,13 +0,0 @@ -echo %0 -md conf -xcopy -D ..\..\..\conf\*.* conf -cd mod -md temp -move *.ilk temp -cd .. -FreeSwitch.exe -cd mod -copy .\temp\*.ilk -del .\temp\*.ilk -rd temp -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 index 0000000000..161f98becd --- /dev/null +++ b/w32/vsnet/Tools/upgrade.vbs @@ -0,0 +1,39 @@ +Set objFile = Createobject("Scripting.FileSystemObject") +Set objArgs = WScript.Arguments +Set WshShell = WScript.CreateObject("WScript.Shell") +Set WshSysEnv = WshShell.Environment("SYSTEM") + +If WshSysEnv("VS80COMNTOOLS")<> "" Then + Set vcProj = CreateObject("VisualStudio.VCProjectEngine.7.1") +Else If WshSysEnv("VS71COMNTOOLS")<> "" Then + Set vcProj = CreateObject("VisualStudio.VCProjectEngine.8.0") +Else + Wscript.Echo("Did not find any Visual Studio .net 2003 or 2005 on your machine") + WScript.Quit(1) +End If +End If + +'// check the arguments to be sure it's right +if (objArgs.Count() < 2) Then + WScript.Echo("VC6 or 5 DSP Project File Conversion") + WScript.Echo("Opens specified .dsp and converts to VC7.1 Format.") + WScript.Echo("Will create project file with .vcproj extension") + WScript.Echo("usage: ") + WScript.Quit(1) +End If + + +WScript.Echo("Converting: "+ objArgs.Item(0)) +'// If there is a file name of the .vcproj extension, do not convert +Set vcProject = vcProj.LoadProject(objArgs.Item(0)) +If Not objFile.FileExists(vcProject.ProjectFile) Then + ' // specify name and location of new project file + vcProject.ProjectFile = objArgs.Item(1) + + ' // call the project engine to save this off. + ' // when no name is shown, it will create one with the .vcproj name + vcProject.Save() + WScript.Echo("New Project Name: "+vcProject.ProjectFile+"") +Else + WScript.Echo("ERROR!: "+vcProject.ProjectFile+" already exists!") +End If diff --git a/w32/vsnet/Tools/upgrade7.vbs b/w32/vsnet/Tools/upgrade7.vbs deleted file mode 100644 index 78b5506bed..0000000000 --- a/w32/vsnet/Tools/upgrade7.vbs +++ /dev/null @@ -1,28 +0,0 @@ -Set vcProj = CreateObject("VisualStudio.VCProjectEngine.7.1") -Set objFile = Createobject("Scripting.FileSystemObject") -Set objArgs = WScript.Arguments - -'// check the arguments to be sure it's right -if (objArgs.Count() < 2) Then - WScript.Echo("VC6 or 5 DSP Project File Conversion") - WScript.Echo("Opens specified .dsp and converts to VC7.1 Format.") - WScript.Echo("Will create project file with .vcproj extension") - WScript.Echo("usage: ") - WScript.Quit(1) -End If -WScript.Echo("Converting: "+ objArgs.Item(0)) -'// If there is a file name of the .vcproj extension, do not convert -Set vcProject = vcProj.LoadProject(objArgs.Item(0)) -If Not objFile.FileExists(vcProject.ProjectFile) Then -' // specify name and location of new project file -vcProject.ProjectFile = objArgs.Item(1) - -' // call the project engine to save this off. -' // when no name is shown, it will create one with the .vcproj name -vcProject.Save() -WScript.Echo("New Project Name: "+vcProject.ProjectFile+"") - -else - - WScript.Echo("ERROR!: "+vcProject.ProjectFile+" already exists!") -End If diff --git a/w32/vsnet/Tools/upgrade8.vbs b/w32/vsnet/Tools/upgrade8.vbs deleted file mode 100644 index ec6664e4bf..0000000000 --- a/w32/vsnet/Tools/upgrade8.vbs +++ /dev/null @@ -1,28 +0,0 @@ -Set vcProj = CreateObject("VisualStudio.VCProjectEngine.8.0") -Set objFile = Createobject("Scripting.FileSystemObject") -Set objArgs = WScript.Arguments - -'// check the arguments to be sure it's right -if (objArgs.Count() < 2) Then - WScript.Echo("VC6 or 5 DSP Project File Conversion") - WScript.Echo("Opens specified .dsp and converts to VC7.1 Format.") - WScript.Echo("Will create project file with .vcproj extension") - WScript.Echo("usage: ") - WScript.Quit(1) -End If -WScript.Echo("Converting: "+ objArgs.Item(0)) -'// If there is a file name of the .vcproj extension, do not convert -Set vcProject = vcProj.LoadProject(objArgs.Item(0)) -If Not objFile.FileExists(vcProject.ProjectFile) Then -' // specify name and location of new project file -vcProject.ProjectFile = objArgs.Item(1) - -' // call the project engine to save this off. -' // when no name is shown, it will create one with the .vcproj name -vcProject.Save() -WScript.Echo("New Project Name: "+vcProject.ProjectFile+"") - -else - - WScript.Echo("ERROR!: "+vcProject.ProjectFile+" already exists!") -End If