<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15777] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15777">15777</a></dd>
<dt>Author</dt> <dd>jlenk</dd>
<dt>Date</dt> <dd>2009-12-03 13:43:38 -0600 (Thu, 03 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add changes for sounds download to allow independent version specific selection</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkMakefileam">freeswitch/trunk/Makefile.am</a></li>
<li><a href="#freeswitchtrunkbuildsounds_versiontxt">freeswitch/trunk/build/sounds_version.txt</a></li>
<li><a href="#freeswitchtrunklibswin32Dowload32khzSounds2008vcproj">freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibswin32Download16khzSounds2008vcproj">freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibswin32Download8khzSounds2008vcproj">freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibswin32utilvbs">freeswitch/trunk/libs/win32/util.vbs</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/Makefile.am (15776 => 15777)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/Makefile.am 2009-12-03 18:19:30 UTC (rev 15776)
+++ freeswitch/trunk/Makefile.am 2009-12-03 19:43:38 UTC (rev 15777)
</span><span class="lines">@@ -16,10 +16,11 @@
</span><span class="cx"> @target=`echo $@ | sed -e 's|^.*-||'`; \
</span><span class="cx"> target_prefix=`echo $@ | sed -e 's|-.*$$||'`; \
</span><span class="cx"> sound_perfix=`echo $@ | sed -e 's|-.*||'`; \
</span><del>- sounds_version=`cat $(switch_srcdir)/build/sounds_version.txt`;\
</del><span class="cx"> moh_version=`cat $(switch_srcdir)/build/moh_version.txt`;\
</span><span class="cx"> full_sound_dir=`echo $@ | sed -e 's|^sounds||' | sed -e 's|^-||' | sed -e 's|-install$$||'`; \
</span><span class="cx"> test ! -z $$full_sound_dir || full_sound_dir=`echo $(DEFAULT_SOUNDS)`; \
</span><ins>+ base_sound_dir=`echo $$full_sound_dir | sed -e 's|-[^-]*000$$||' ` ;\
+ sounds_version=`grep $$base_sound_dir $(switch_srcdir)/build/sounds_version.txt | cut -d ' ' -f2`;\
</ins><span class="cx"> soundfile=`echo freeswitch-sounds-$$full_sound_dir-$$moh_version.tar.gz`; \
</span><span class="cx"> echo $$full_sound_dir | grep music >/dev/null || soundfile=`echo freeswitch-sounds-$$full_sound_dir-$$sounds_version.tar.gz`; \
</span><span class="cx"> if test "$$target" = "install"; then $(MAKE) $(AM_MAKEFLAGS) core_install; else $(MAKE) $(AM_MAKEFLAGS) core ; fi; \
</span></span></pre></div>
<a id="freeswitchtrunkbuildsounds_versiontxt"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/build/sounds_version.txt (15776 => 15777)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/build/sounds_version.txt 2009-12-03 18:19:30 UTC (rev 15776)
+++ freeswitch/trunk/build/sounds_version.txt 2009-12-03 19:43:38 UTC (rev 15777)
</span><span class="lines">@@ -1 +1,3 @@
</span><del>-1.0.12
</del><ins>+en-us-callie 1.0.12
+ru-RU-elena 1.0.12
+
</ins></span></pre></div>
<a id="freeswitchtrunklibswin32Dowload32khzSounds2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj (15776 => 15777)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj 2009-12-03 18:19:30 UTC (rev 15776)
+++ freeswitch/trunk/libs/win32/Dowload 32khz Sounds.2008.vcproj 2009-12-03 19:43:38 UTC (rev 15777)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> <Tool
</span><span class="cx"> Name="VCCustomBuildTool"
</span><span class="cx"> Description="Downloading 32khzsound."
</span><del>- CommandLine="set /P SOUND_VERSION=&lt;$(ProjectDir)..\..\build\sounds_version.txt&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\32000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-%SOUND_VERSION%.tar.gz &quot;$(ProjectDir)..\sounds&quot;&#x0D;&#x0A;"
</del><ins>+ CommandLine="if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\32000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzipSounds en-us-callie 32000 &quot;$(ProjectDir)..\sounds&quot; &quot;$(ProjectDir)..\..\build\sounds_version.txt&quot;"
</ins><span class="cx"> Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\32000"
</span><span class="cx"> />
</span><span class="cx"> </FileConfiguration>
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> <Tool
</span><span class="cx"> Name="VCCustomBuildTool"
</span><span class="cx"> Description="Downloading 32khzsound."
</span><del>- CommandLine="set /P SOUND_VERSION=&lt;$(ProjectDir)..\..\build\sounds_version.txt&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\32000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-32000-%SOUND_VERSION%.tar.gz &quot;$(ProjectDir)..\sounds&quot;&#x0D;&#x0A;"
</del><ins>+ CommandLine="if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\32000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzipSounds en-us-callie 32000 &quot;$(ProjectDir)..\sounds&quot; &quot;$(ProjectDir)..\..\build\sounds_version.txt&quot;"
</ins><span class="cx"> Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\32000"
</span><span class="cx"> />
</span><span class="cx"> </FileConfiguration>
</span></span></pre></div>
<a id="freeswitchtrunklibswin32Download16khzSounds2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj (15776 => 15777)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj 2009-12-03 18:19:30 UTC (rev 15776)
+++ freeswitch/trunk/libs/win32/Download 16khz Sounds.2008.vcproj 2009-12-03 19:43:38 UTC (rev 15777)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> <Tool
</span><span class="cx"> Name="VCCustomBuildTool"
</span><span class="cx"> Description="Downloading 16khzsound."
</span><del>- CommandLine="set /P SOUND_VERSION=&lt;$(ProjectDir)..\..\build\sounds_version.txt&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\16000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-%SOUND_VERSION%.tar.gz &quot;$(ProjectDir)..\sounds&quot;&#x0D;&#x0A;"
</del><ins>+ CommandLine="if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\16000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzipSounds en-us-callie 16000 &quot;$(ProjectDir)..\sounds&quot; &quot;$(ProjectDir)..\..\build\sounds_version.txt&quot;"
</ins><span class="cx"> Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\16000"
</span><span class="cx"> />
</span><span class="cx"> </FileConfiguration>
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> <Tool
</span><span class="cx"> Name="VCCustomBuildTool"
</span><span class="cx"> Description="Downloading 16khzsound."
</span><del>- CommandLine="set /P SOUND_VERSION=&lt;$(ProjectDir)..\..\build\sounds_version.txt&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\16000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-16000-%SOUND_VERSION%.tar.gz &quot;$(ProjectDir)..\sounds&quot;&#x0D;&#x0A;"
</del><ins>+ CommandLine="if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\16000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzipSounds en-us-callie 16000 &quot;$(ProjectDir)..\sounds&quot; &quot;$(ProjectDir)..\..\build\sounds_version.txt&quot;"
</ins><span class="cx"> Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\16000"
</span><span class="cx"> />
</span><span class="cx"> </FileConfiguration>
</span></span></pre></div>
<a id="freeswitchtrunklibswin32Download8khzSounds2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj (15776 => 15777)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj 2009-12-03 18:19:30 UTC (rev 15776)
+++ freeswitch/trunk/libs/win32/Download 8khz Sounds.2008.vcproj 2009-12-03 19:43:38 UTC (rev 15777)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> <Tool
</span><span class="cx"> Name="VCCustomBuildTool"
</span><span class="cx"> Description="Downloading 8khzsound."
</span><del>- CommandLine="set /P SOUND_VERSION=&lt;$(ProjectDir)..\..\build\sounds_version.txt&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\8000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-%SOUND_VERSION%.tar.gz &quot;$(ProjectDir)..\sounds&quot;&#x0D;&#x0A;"
</del><ins>+ CommandLine="if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\8000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzipSounds en-us-callie 8000 &quot;$(ProjectDir)..\sounds&quot; &quot;$(ProjectDir)..\..\build\sounds_version.txt&quot;"
</ins><span class="cx"> Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\8000"
</span><span class="cx"> />
</span><span class="cx"> </FileConfiguration>
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> <Tool
</span><span class="cx"> Name="VCCustomBuildTool"
</span><span class="cx"> Description="Downloading 8khzsound."
</span><del>- CommandLine="set /P SOUND_VERSION=&lt;$(ProjectDir)..\..\build\sounds_version.txt&#x0D;&#x0A;if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\8000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/freeswitch-sounds-en-us-callie-8000-%SOUND_VERSION%.tar.gz &quot;$(ProjectDir)..\sounds&quot;&#x0D;&#x0A;"
</del><ins>+ CommandLine="if not exist &quot;$(ProjectDir)..\sounds\en\us\callie\voicemail\8000&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzipSounds en-us-callie 8000 &quot;$(ProjectDir)..\sounds&quot; &quot;$(ProjectDir)..\..\build\sounds_version.txt&quot;"
</ins><span class="cx"> Outputs="$(ProjectDir)..\sounds\en\us\callie\voicemail\8000"
</span><span class="cx"> />
</span><span class="cx"> </FileConfiguration>
</span></span></pre></div>
<a id="freeswitchtrunklibswin32utilvbs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/win32/util.vbs (15776 => 15777)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/win32/util.vbs 2009-12-03 18:19:30 UTC (rev 15776)
+++ freeswitch/trunk/libs/win32/util.vbs 2009-12-03 19:43:38 UTC (rev 15777)
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx"> Wget objArgs(1), Showpath(objArgs(2))
</span><span class="cx"> Case "GetUnzip"
</span><span class="cx"> WgetUnCompress objArgs(1), Showpath(objArgs(2))
</span><ins>+ Case "GetUnzipSounds"
+ WgetSounds objArgs(1), objArgs(2), Showpath(objArgs(3)), objArgs(4)
</ins><span class="cx"> Case "Version"
</span><span class="cx"> 'CreateVersion(tmpFolder, VersionDir, includebase, includedest)
</span><span class="cx"> CreateVersion Showpath(objArgs(1)), Showpath(objArgs(2)), objArgs(3), objArgs(4)
</span><span class="lines">@@ -56,6 +58,23 @@
</span><span class="cx"> ' Utility Subroutines
</span><span class="cx"> ' *******************
</span><span class="cx">
</span><ins>+Sub WgetSounds(PrimaryName, Freq, DestFolder, VersionFile)
+ BaseURL = "http://files.freeswitch.org/freeswitch-sounds"
+ Set objFSO = CreateObject("Scripting.FileSystemObject")
+ Set objTextFile = objFSO.OpenTextFile(VersionFile,1)
+ Do Until objTextFile.AtEndOfStream
+ strLine = objTextFile.Readline
+ versionPos = InstrRev(strLine, " ", -1, 1)
+ name = Left(strLine, versionPos-1)
+ if name = PrimaryName Then
+ version = Right(strLine, Len(strLine) - versionPos)
+ Wscript.Echo "Sound name: " & name & " Version " & version
+ URL = BaseURL & "-" & name & "-" & Freq &"-" & version & ".tar.gz"
+ Wscript.Echo "URL: " & URL
+ WgetUnCompress URL, Showpath(DestFolder)
+ End If
+ Loop
+End Sub
</ins><span class="cx">
</span><span class="cx"> Sub WgetUnCompress(URL, DestFolder)
</span><span class="cx"> If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>