[Build-system] Migrate music/sounds from files.freeswitch.org to https://github.com...

diff --git a/README.md b/README.md
index 48adc31504d96c6e687b282689d8d7ce679ca2e5..2e55b7244bd797486f1a65629542926936bbc9b4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Step by step tutorials to build FreeSWITCH with provided dependency packages:
 
   * [Tarballs](https://files.freeswitch.org/releases/freeswitch/)
   * [Windows Installer](http://files.freeswitch.org/windows/installer/x64/)
-  * [Windows Sound Packages](http://files.freeswitch.org/windows/installer/x64/sounds/)
+  * [Windows Sound Packages](https://github.com/freeswitch/freeswitch-sounds/releases)
 
 ## Contributions
 

diff --git a/build/getsounds.sh.in b/build/getsounds.sh.in
index 309d10bfea59152aee755670024d5b25e894f5f1..2feb15dadde69719be89ddfc8ac77539671dd788 100755 (executable)
--- a/build/getsounds.sh.in
+++ b/build/getsounds.sh.in
@@ -15,10 +15,20 @@ if [ "x${DOWNLOAD_CMD}" = "x" -a -x "$CURL" ] ; then
   DOWNLOAD_CMD="$CURL -L -O"
 fi
 
-base=http://files.freeswitch.org/
+base=https://github.com/freeswitch/freeswitch-sounds/releases/download
 tarfile=$1
 install=$2
 
+# Build the GitHub release URL from the tarball name:
+#   freeswitch-sounds-<voice>-<rate>-<version>.tar.gz  ->  tag <voice>-<version>
+fname=`basename "$tarfile"`
+stem=${fname#freeswitch-sounds-}
+stem=${stem%.tar.gz}
+sver=${stem##*-}
+srest=${stem%-*}
+svoice=${srest%-*}
+url=$base/$svoice-$sver/$fname
+
 echo -n "#"
 pwd
 echo "# $0 $1 $2"
@@ -29,7 +39,7 @@ if [ -n "$FS_SOUNDS_DIR" ]; then
 fi
 
 if [ ! -f $DIR/$tarfile ]; then
-  (cd $DIR && $DOWNLOAD_CMD $base$tarfile)
+  (cd $DIR && $DOWNLOAD_CMD $url)
   if [ ! -f $DIR/$tarfile ]; then
     echo "cannot find $tarfile"
     exit 1

diff --git a/freeswitch-sounds-en-ca-june.spec b/freeswitch-sounds-en-ca-june.spec
index 880d1d0504713c0f4500c09869187cbe73015e7a..376c95d91619393950445e511e7b4cf10e39b59e 100644 (file)
--- a/freeswitch-sounds-en-ca-june.spec
+++ b/freeswitch-sounds-en-ca-june.spec
@@ -69,10 +69,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Ken Rice <krice@freeswitch.org>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
+Source0:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-ca-june-%{version}/%{name}-48000-%{version}.tar.gz
+Source1:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-ca-june-%{version}/%{name}-32000-%{version}.tar.gz
+Source2:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-ca-june-%{version}/%{name}-16000-%{version}.tar.gz
+Source3:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-ca-june-%{version}/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

diff --git a/freeswitch-sounds-en-us-allison.spec b/freeswitch-sounds-en-us-allison.spec
index 26d386461d9abf5b926c0a86bacaac2baa955d52..497eb486e4d9d76fcc8e3a119b41385346430b03 100644 (file)
--- a/freeswitch-sounds-en-us-allison.spec
+++ b/freeswitch-sounds-en-us-allison.spec
@@ -72,10 +72,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Patrick Laimbock <vc-rpms@voipconsulting.nl>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
+Source0:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-allison-%{version}/%{name}-48000-%{version}.tar.gz
+Source1:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-allison-%{version}/%{name}-32000-%{version}.tar.gz
+Source2:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-allison-%{version}/%{name}-16000-%{version}.tar.gz
+Source3:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-allison-%{version}/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

diff --git a/freeswitch-sounds-en-us-callie.spec b/freeswitch-sounds-en-us-callie.spec
index 537e5668ef255cee2858392015431da6dc65c0af..42cfd4a8ae8514320a780dcc78bfdc75b7ec6b8a 100644 (file)
--- a/freeswitch-sounds-en-us-callie.spec
+++ b/freeswitch-sounds-en-us-callie.spec
@@ -72,10 +72,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Patrick Laimbock <vc-rpms@voipconsulting.nl>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
+Source0:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-%{version}/%{name}-48000-%{version}.tar.gz
+Source1:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-%{version}/%{name}-32000-%{version}.tar.gz
+Source2:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-%{version}/%{name}-16000-%{version}.tar.gz
+Source3:https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-%{version}/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

diff --git a/freeswitch-sounds-fr-ca-june.spec b/freeswitch-sounds-fr-ca-june.spec
index c8d413d4abea5547edc058eb7e10cabec14061e9..dca2de2b36fb79f25e7266c71074b6ae2c007535 100644 (file)
--- a/freeswitch-sounds-fr-ca-june.spec
+++ b/freeswitch-sounds-fr-ca-june.spec
@@ -69,10 +69,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Ken Rice <krice@freeswitch.org>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
+Source0:https://github.com/freeswitch/freeswitch-sounds/releases/download/fr-ca-june-%{version}/%{name}-48000-%{version}.tar.gz
+Source1:https://github.com/freeswitch/freeswitch-sounds/releases/download/fr-ca-june-%{version}/%{name}-32000-%{version}.tar.gz
+Source2:https://github.com/freeswitch/freeswitch-sounds/releases/download/fr-ca-june-%{version}/%{name}-16000-%{version}.tar.gz
+Source3:https://github.com/freeswitch/freeswitch-sounds/releases/download/fr-ca-june-%{version}/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

diff --git a/freeswitch-sounds-music.spec b/freeswitch-sounds-music.spec
index a885d2e7e1067b762b24dc781e65ae03b993477c..3d9faa81b488f2655eecd84eb26034cded8f0fe2 100644 (file)
--- a/freeswitch-sounds-music.spec
+++ b/freeswitch-sounds-music.spec
@@ -41,10 +41,10 @@ License:    MPL
 Group:         Productivity/Telephony/Servers
 Packager:      Joseph L. Casale <jcasale@activenetwerx.com>
 URL:           http://www.freeswitch.org
-Source0:       http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
-Source1:        http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
-Source2:        http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
-Source3:        http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
+Source0:       https://github.com/freeswitch/freeswitch-sounds/releases/download/music-%{version}/%{name}-8000-%{version}.tar.gz
+Source1:        https://github.com/freeswitch/freeswitch-sounds/releases/download/music-%{version}/%{name}-16000-%{version}.tar.gz
+Source2:        https://github.com/freeswitch/freeswitch-sounds/releases/download/music-%{version}/%{name}-32000-%{version}.tar.gz
+Source3:        https://github.com/freeswitch/freeswitch-sounds/releases/download/music-%{version}/%{name}-48000-%{version}.tar.gz
 BuildArch:     noarch
 BuildRequires: bash
 Requires:      freeswitch

diff --git a/freeswitch-sounds-pt-BR-karina.spec b/freeswitch-sounds-pt-BR-karina.spec
index c0a9a6ffe04a177322572efb0269a2f8d019a551..80111f5712b9d3fe10187a06c01569d4bd9baa2f 100644 (file)
--- a/freeswitch-sounds-pt-BR-karina.spec
+++ b/freeswitch-sounds-pt-BR-karina.spec
@@ -69,10 +69,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Ken Rice <krice@freeswitch.org>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
+Source0:https://github.com/freeswitch/freeswitch-sounds/releases/download/pt-BR-karina-%{version}/%{name}-48000-%{version}.tar.gz
+Source1:https://github.com/freeswitch/freeswitch-sounds/releases/download/pt-BR-karina-%{version}/%{name}-32000-%{version}.tar.gz
+Source2:https://github.com/freeswitch/freeswitch-sounds/releases/download/pt-BR-karina-%{version}/%{name}-16000-%{version}.tar.gz
+Source3:https://github.com/freeswitch/freeswitch-sounds/releases/download/pt-BR-karina-%{version}/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

diff --git a/freeswitch-sounds-ru-RU-elena.spec b/freeswitch-sounds-ru-RU-elena.spec
index 28f5f5bafe186766dcdce5ea21a7002ba9a2a77d..3d97d3766ecef11dbdd3e7f62edc7be0d58edad9 100644 (file)
--- a/freeswitch-sounds-ru-RU-elena.spec
+++ b/freeswitch-sounds-ru-RU-elena.spec
@@ -75,10 +75,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Michal Bielicki <michal.bielicki@seventhsignal.de>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
+Source0:https://github.com/freeswitch/freeswitch-sounds/releases/download/ru-RU-elena-%{version}/%{name}-48000-%{version}.tar.gz
+Source1:https://github.com/freeswitch/freeswitch-sounds/releases/download/ru-RU-elena-%{version}/%{name}-32000-%{version}.tar.gz
+Source2:https://github.com/freeswitch/freeswitch-sounds/releases/download/ru-RU-elena-%{version}/%{name}-16000-%{version}.tar.gz
+Source3:https://github.com/freeswitch/freeswitch-sounds/releases/download/ru-RU-elena-%{version}/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

diff --git a/freeswitch-sounds-sv-se-jakob.spec b/freeswitch-sounds-sv-se-jakob.spec
index 5ddf6218c84ddca8e6c961832239fa210c8c2708..010379410b1285b8aa7262a564ed7fce026ce023 100644 (file)
--- a/freeswitch-sounds-sv-se-jakob.spec
+++ b/freeswitch-sounds-sv-se-jakob.spec
@@ -67,10 +67,10 @@ License: MPL
 Group: Applications/Communications
 Packager: Ken Rice <krice@freeswitch.org>
 URL: http://www.freeswitch.org
-Source0:http://files.freeswitch.org/releases/sounds/%{name}-48000-%{version}.tar.gz
-Source1:http://files.freeswitch.org/releases/sounds/%{name}-32000-%{version}.tar.gz
-Source2:http://files.freeswitch.org/releases/sounds/%{name}-16000-%{version}.tar.gz
-Source3:http://files.freeswitch.org/releases/sounds/%{name}-8000-%{version}.tar.gz
+Source0:https://github.com/freeswitch/freeswitch-sounds/releases/download/sv-se-jakob-%{version}/%{name}-48000-%{version}.tar.gz
+Source1:https://github.com/freeswitch/freeswitch-sounds/releases/download/sv-se-jakob-%{version}/%{name}-32000-%{version}.tar.gz
+Source2:https://github.com/freeswitch/freeswitch-sounds/releases/download/sv-se-jakob-%{version}/%{name}-16000-%{version}.tar.gz
+Source3:https://github.com/freeswitch/freeswitch-sounds/releases/download/sv-se-jakob-%{version}/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch

diff --git a/scripts/ci/mk-sounds-rpms.sh b/scripts/ci/mk-sounds-rpms.sh
index fda715d02ae31d702fc4f5540c788b383be70187..dca620a54de1762643c37e3ce6d35024342bf561 100755 (executable)
--- a/scripts/ci/mk-sounds-rpms.sh
+++ b/scripts/ci/mk-sounds-rpms.sh
@@ -15,7 +15,7 @@ basedir=$(pwd);
 
 if [ ! -d "$basedir/../freeswitch-sounds" ]; then
        cd $basedir/..
-       git clone https://freeswitch.org/stash/scm/fs/freeswitch-sounds.git
+       git clone https://github.com/freeswitch/freeswitch-sounds.git
 else
        cd $basedir/../freeswitch-sounds
        git clean -fdx

diff --git a/scripts/ci/sounds-en-us-callie.sh b/scripts/ci/sounds-en-us-callie.sh
index f4562888711db358346ff602f07edf849e14e3ea..6512736639619665d2fa9be631114ef201969b59 100755 (executable)
--- a/scripts/ci/sounds-en-us-callie.sh
+++ b/scripts/ci/sounds-en-us-callie.sh
@@ -16,7 +16,7 @@ basedir=$(pwd);
 
 if [ ! -d "$basedir/../freeswitch-sounds" ]; then
        cd $basedir/..
-       git clone https://freeswitch.org/stash/scm/fs/freeswitch-sounds.git 
+       git clone https://github.com/freeswitch/freeswitch-sounds.git 
 else
        cd $basedir/../freeswitch-sounds
        git clean -fdx

diff --git a/scripts/ci/sounds-fr-ca-june.sh b/scripts/ci/sounds-fr-ca-june.sh
index e97053edfa32426872c78c1e9b3c7448299daacd..a2bad5a3103b6a5c6a70ec8fa374350dc1546ecc 100755 (executable)
--- a/scripts/ci/sounds-fr-ca-june.sh
+++ b/scripts/ci/sounds-fr-ca-june.sh
@@ -11,7 +11,7 @@ basedir=$(pwd);
 
 if [ ! -d "$basedir/../freeswitch-sounds" ]; then
        cd $basedir/..
-       git clone https://freeswitch.org/stash/scm/fs/freeswitch-sounds.git 
+       git clone https://github.com/freeswitch/freeswitch-sounds.git 
 else
        cd $basedir/../freeswitch-sounds
        git clean -fdx

diff --git a/scripts/ci/sounds-music.sh b/scripts/ci/sounds-music.sh
index 21a134ea38aa55247828bd43b9f018287a0b8b00..97caa7e502083bb73abb22d8bea1ab0a5462c1cc 100755 (executable)
--- a/scripts/ci/sounds-music.sh
+++ b/scripts/ci/sounds-music.sh
@@ -16,7 +16,7 @@ basedir=$(pwd);
 
 if [ ! -d "$basedir/../freeswitch-sounds" ]; then
         cd $basedir/..
-        git clone https://freeswitch.org/stash/scm/fs/freeswitch-sounds.git
+        git clone https://github.com/freeswitch/freeswitch-sounds.git
 else
         cd $basedir/../freeswitch-sounds
         git pull

diff --git a/scripts/ci/sounds-ru-ru-elena.sh b/scripts/ci/sounds-ru-ru-elena.sh
index 5a763febd2687973eb1b4a769fbdc8bfb3be6d6b..47f8835d7e88f61b3b36b5cd651eee005a356904 100755 (executable)
--- a/scripts/ci/sounds-ru-ru-elena.sh
+++ b/scripts/ci/sounds-ru-ru-elena.sh
@@ -12,7 +12,7 @@ fi
 
 if [ ! -d "$basedir/../freeswitch-sounds" ]; then
         cd $basedir/..
-        git clone https://freeswitch.org/stash/scm/fs/freeswitch-sounds.git
+        git clone https://github.com/freeswitch/freeswitch-sounds.git
 else
         cd $basedir/../freeswitch-sounds
         git clean -fdx

diff --git a/scripts/freeswitch.pkg_deps.sh b/scripts/freeswitch.pkg_deps.sh
index 64cdc445a0d99946dd6c280a10b813839c70c0d0..d057083993373a1b517ca790e827296244f5749b 100755 (executable)
--- a/scripts/freeswitch.pkg_deps.sh
+++ b/scripts/freeswitch.pkg_deps.sh
@@ -7,14 +7,14 @@ wget -c http://svn.freeswitch.org/downloads/libs/mpg123.tar.gz
 wget -c http://svn.freeswitch.org/downloads/libs/openldap-2.4.11.tar.gz
 wget -c http://svn.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-latest.tar.gz
 wget -c http://svn.freeswitch.org/downloads/libs/sphinxbase-0.4.99-latest.tar.gz
-wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-8000-1.0.8.tar.gz
-wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-16000-1.0.8.tar.gz
-wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-32000-1.0.8.tar.gz
-wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-48000-1.0.8.tar.gz
-wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-8000-1.0.11.tar.gz
-wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-16000-1.0.11.tar.gz
-wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-32000-1.0.11.tar.gz
-wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-48000-1.0.11.tar.gz
+wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-8000-1.0.52.tar.gz
+wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-16000-1.0.52.tar.gz
+wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-32000-1.0.52.tar.gz
+wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-48000-1.0.52.tar.gz
+wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-8000-1.0.53.tar.gz
+wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-16000-1.0.53.tar.gz
+wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-32000-1.0.53.tar.gz
+wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-48000-1.0.53.tar.gz
 wget -c http://svn.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
 
 

diff --git a/w32/Setup/Sounds/Setup.Sounds.2017.wixproj b/w32/Setup/Sounds/Setup.Sounds.2017.wixproj
index cab4848c40c961f243dad7aa90ea62ae1363fd2c..bc563fc42dbbbdb59870e087041ae01e83437d41 100644 (file)
--- a/w32/Setup/Sounds/Setup.Sounds.2017.wixproj
+++ b/w32/Setup/Sounds/Setup.Sounds.2017.wixproj
@@ -108,7 +108,7 @@
 \r
        extractto: Folder to extract an archive to\r
    -->\r
-    <DownloadPackageTask package="http://files.freeswitch.org/releases/sounds/$(SoundFileName)" expectfileordirectory="$(BaseDir)libs\download-always" outputfolder="" outputfilename="" extractto="$(BaseDir)libs\sounds\$(SoundSuffix)\" />\r
+    <DownloadPackageTask package="https://github.com/freeswitch/freeswitch-sounds/releases/download/$(SoundPrimaryName)-$(SoundVersion)/$(SoundFileName)" expectfileordirectory="$(BaseDir)libs\download-always" outputfolder="" outputfilename="" extractto="$(BaseDir)libs\sounds\$(SoundSuffix)\" />\r
   </Target>\r
   <Target Name="AfterBuild">\r
     <Copy SourceFiles="$(OutputPath)$(OutputName).msi" DestinationFiles="$(DestinationFileName)" />\r

diff --git a/w32/Setup/inno_setup/freeswitch_1.0.4.iss b/w32/Setup/inno_setup/freeswitch_1.0.4.iss
index 70f9e52570757565c47adf8a8b0838c2e8178b77..9ad9a54c51af582720ffd22be59aa269be6a2a35 100644 (file)
--- a/w32/Setup/inno_setup/freeswitch_1.0.4.iss
+++ b/w32/Setup/inno_setup/freeswitch_1.0.4.iss
@@ -81,17 +81,17 @@ Filename: {app}\freeswitch.exe; Description: Launch FreeSWITCH now; Flags: shell
 \r
 Filename: {app}\create_freepbx.bat; Description: Create FreePBX MySQL user; Flags: runhidden; Components: FreePBX_WAMP; Parameters: {app}; WorkingDir: {app}\r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-8000-1.0.11.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}\r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-8000-1.0.8.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-8000-1.0.53.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}\r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-8000-1.0.52.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-16000-1.0.11.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-16000-1.0.8.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-16000-1.0.53.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-16000-1.0.52.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-32000-1.0.11.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-32000-1.0.8.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-32000-1.0.53.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-32000-1.0.52.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-48000-1.0.11.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-48000-1.0.8.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-48000-1.0.53.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-48000-1.0.52.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
 [UninstallDelete]\r
 Type: filesandordirs; Name: {app}\sounds\r
@@ -111,15 +111,15 @@ Filename: {app}\wamp\uninstall_services.bat; Components: FreePBX_WAMP; Flags: ru
 Filename: {app}\freeswitch.exe; Flags: runhidden; Parameters: -stop; WorkingDir: {app}\r
 \r
 [_ISToolDownload]\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-8000-1.0.11.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-8000-1.0.11.tar.gz; Components: sound_files_8khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-16000-1.0.11.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-16000-1.0.11.tar.gz; Components: sound_files_16khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-32000-1.0.11.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-32000-1.0.11.tar.gz; Components: sound_files_32khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-48000-1.0.11.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-48000-1.0.11.tar.gz; Components: sound_files_48khz\r
-\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-8000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-8000-1.0.8.tar.gz; Components: sound_files_8khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-16000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-16000-1.0.8.tar.gz; Components: sound_files_16khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-32000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-32000-1.0.8.tar.gz; Components: sound_files_32khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-48000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-48000-1.0.8.tar.gz; Components: sound_files_48khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-8000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-8000-1.0.53.tar.gz; Components: sound_files_8khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-16000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-16000-1.0.53.tar.gz; Components: sound_files_16khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-32000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-32000-1.0.53.tar.gz; Components: sound_files_32khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-48000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-48000-1.0.53.tar.gz; Components: sound_files_48khz\r
+\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-8000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-8000-1.0.52.tar.gz; Components: sound_files_8khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-16000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-16000-1.0.52.tar.gz; Components: sound_files_16khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-32000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-32000-1.0.52.tar.gz; Components: sound_files_32khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-48000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-48000-1.0.52.tar.gz; Components: sound_files_48khz\r
 \r
 Source: http://files.freeswitch.org/downloads/win32/7za.exe; DestDir: {tmp}; DestName: 7za.exe; Components: sound_files_8khz\r
 [Components]\r

diff --git a/w32/Setup/inno_setup/freeswitch_freepbx.iss b/w32/Setup/inno_setup/freeswitch_freepbx.iss
index af849556c4fbb96b7455b6ac28591eca38005bc2..2a936266aace2d525862bea8add698d09e3a2576 100644 (file)
--- a/w32/Setup/inno_setup/freeswitch_freepbx.iss
+++ b/w32/Setup/inno_setup/freeswitch_freepbx.iss
@@ -117,17 +117,17 @@ Filename: {app}\freeswitch.exe; Description: Launch FreeSWITCH now; Flags: shell
 \r
 Filename: {app}\create_freepbx.bat; Description: Create FreePBX MySQL user; Flags: runhidden; Components: FreePBX_WAMP; Parameters: {app}; WorkingDir: {app}\r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-8000-1.0.11.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}\r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-8000-1.0.8.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-8000-1.0.53.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}\r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-8000-1.0.52.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-16000-1.0.11.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-16000-1.0.8.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-16000-1.0.53.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-16000-1.0.52.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-32000-1.0.11.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-32000-1.0.8.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-32000-1.0.53.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-32000-1.0.52.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-48000-1.0.11.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-48000-1.0.8.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-48000-1.0.53.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-48000-1.0.52.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
 [UninstallDelete]\r
 Type: filesandordirs; Name: {app}\sounds\r
@@ -147,15 +147,15 @@ Filename: {app}\wamp\uninstall_services.bat; Components: FreePBX_WAMP; Flags: ru
 Filename: {app}\freeswitch.exe; Flags: runhidden; Parameters: -stop; WorkingDir: {app}\r
 \r
 [_ISToolDownload]\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-8000-1.0.12.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-8000-1.0.11.tar.gz; Components: sound_files_8khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-16000-1.0.12.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-16000-1.0.11.tar.gz; Components: sound_files_16khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-32000-1.0.12.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-32000-1.0.11.tar.gz; Components: sound_files_32khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-48000-1.0.12.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-48000-1.0.11.tar.gz; Components: sound_files_48khz\r
-\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-8000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-8000-1.0.8.tar.gz; Components: sound_files_8khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-16000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-16000-1.0.8.tar.gz; Components: sound_files_16khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-32000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-32000-1.0.8.tar.gz; Components: sound_files_32khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-48000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-48000-1.0.8.tar.gz; Components: sound_files_48khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-8000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-8000-1.0.53.tar.gz; Components: sound_files_8khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-16000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-16000-1.0.53.tar.gz; Components: sound_files_16khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-32000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-32000-1.0.53.tar.gz; Components: sound_files_32khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-48000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-48000-1.0.53.tar.gz; Components: sound_files_48khz\r
+\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-8000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-8000-1.0.52.tar.gz; Components: sound_files_8khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-16000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-16000-1.0.52.tar.gz; Components: sound_files_16khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-32000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-32000-1.0.52.tar.gz; Components: sound_files_32khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-48000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-48000-1.0.52.tar.gz; Components: sound_files_48khz\r
 \r
 Source: http://files.freeswitch.org/downloads/win32/7za.exe; DestDir: {tmp}; DestName: 7za.exe; Components: sound_files_8khz sound_files_16khz sound_files_32khz sound_files_48khz\r
 [Components]\r

diff --git a/w32/Setup/inno_setup/freeswitch_fusionpbx.iss b/w32/Setup/inno_setup/freeswitch_fusionpbx.iss
index 1f0fadfc561bb91bd0b6270c0b6ced26c4db28c3..d3459be8ada2c25a852dba8c06f9a931d0fed257 100644 (file)
--- a/w32/Setup/inno_setup/freeswitch_fusionpbx.iss
+++ b/w32/Setup/inno_setup/freeswitch_fusionpbx.iss
@@ -117,17 +117,17 @@ Filename: {app}\freeswitch.exe; Description: Launch FreeSWITCH now; Flags: shell
 \r
 Filename: {app}\create_fusionpbx.bat; Description: Create FusionPBX MySQL user; Flags: runhidden; Components: FusionPBX_WAMP; Parameters: {app}; WorkingDir: {app}\r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-8000-1.0.11.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}\r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-8000-1.0.8.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-8000-1.0.53.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}\r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-8000-1.0.52.tar.gz; Components: sound_files_8khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-16000-1.0.11.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-16000-1.0.8.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-16000-1.0.53.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-16000-1.0.52.tar.gz; Components: sound_files_16khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-32000-1.0.11.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-32000-1.0.8.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-32000-1.0.53.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-32000-1.0.52.tar.gz; Components: sound_files_32khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-48000-1.0.11.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
-Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-48000-1.0.8.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-en-us-callie-48000-1.0.53.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
+Filename: {app}\expsound.bat; Parameters: {tmp} {app} freeswitch-sounds-music-48000-1.0.52.tar.gz; Components: sound_files_48khz; WorkingDir: {tmp}; Tasks: ; Languages: \r
 \r
 [UninstallDelete]\r
 Type: filesandordirs; Name: {app}\sounds\r
@@ -147,15 +147,15 @@ Filename: {app}\wamp\uninstall_services.bat; Components: FusionPBX_WAMP; Flags:
 Filename: {app}\freeswitch.exe; Flags: runhidden; Parameters: -stop; WorkingDir: {app}\r
 \r
 [_ISToolDownload]\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-8000-1.0.12.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-8000-1.0.11.tar.gz; Components: sound_files_8khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-16000-1.0.12.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-16000-1.0.11.tar.gz; Components: sound_files_16khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-32000-1.0.12.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-32000-1.0.11.tar.gz; Components: sound_files_32khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-en-us-callie-48000-1.0.12.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-48000-1.0.11.tar.gz; Components: sound_files_48khz\r
-\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-8000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-8000-1.0.8.tar.gz; Components: sound_files_8khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-16000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-16000-1.0.8.tar.gz; Components: sound_files_16khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-32000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-32000-1.0.8.tar.gz; Components: sound_files_32khz\r
-Source: http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-48000-1.0.8.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-48000-1.0.8.tar.gz; Components: sound_files_48khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-8000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-8000-1.0.53.tar.gz; Components: sound_files_8khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-16000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-16000-1.0.53.tar.gz; Components: sound_files_16khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-32000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-32000-1.0.53.tar.gz; Components: sound_files_32khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-48000-1.0.53.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-en-us-callie-48000-1.0.53.tar.gz; Components: sound_files_48khz\r
+\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-8000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-8000-1.0.52.tar.gz; Components: sound_files_8khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-16000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-16000-1.0.52.tar.gz; Components: sound_files_16khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-32000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-32000-1.0.52.tar.gz; Components: sound_files_32khz\r
+Source: https://github.com/freeswitch/freeswitch-sounds/releases/download/music-1.0.52/freeswitch-sounds-music-48000-1.0.52.tar.gz; DestDir: {tmp}; DestName: freeswitch-sounds-music-48000-1.0.52.tar.gz; Components: sound_files_48khz\r
 \r
 Source: http://files.freeswitch.org/downloads/win32/7za.exe; DestDir: {tmp}; DestName: 7za.exe; Components: sound_files_8khz\r
 [Components]\r

diff --git a/w32/download_sounds.props b/w32/download_sounds.props
index 1c17ae9350663e258f500712484b6c7d1df2264f..bda131213873f8947e35ef83915708484ed4b91e 100644 (file)
--- a/w32/download_sounds.props
+++ b/w32/download_sounds.props
@@ -15,10 +15,11 @@
           SoundQuality="$(SoundQuality)"
       >         
            <Output PropertyName="SoundFileName" TaskParameter="SoundFileName" /> 
+           <Output PropertyName="SoundVersion" TaskParameter="SoundVersion" />
       </GetSoundFileNameTask>         
       <Message Importance="High" Text="SoundFileName is set to: $(SoundFileName)"/> 
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/releases/sounds/$(SoundFileName)"
+           package="https://github.com/freeswitch/freeswitch-sounds/releases/download/$(SoundPrimaryName)-$(SoundVersion)/$(SoundFileName)"
            expectfileordirectory="$(SoundsDir)\$(ExpectRelative)" 
            outputfolder=""
            outputfilename="" 

diff --git a/w32/sound_tools.props b/w32/sound_tools.props
index f45d682a101c488a3322e653a9c4be51a08f31fc..b1defb0201e71d0826d57c3e47bf19bca0a84943 100644 (file)
--- a/w32/sound_tools.props
+++ b/w32/sound_tools.props
@@ -61,6 +61,7 @@ using Microsoft.Build.Framework;
                 <SoundPrimaryName Required="true" />
                 <SoundQuality Required="true" />
                 <SoundFileName ParameterType="System.String" Output="True"/>   
+                <SoundVersion ParameterType="System.String" Output="True"/>
              </ParameterGroup>  
              <Task>  
                 <Reference Include="Microsoft.Build" />
@@ -80,9 +81,12 @@ using Microsoft.Build.Framework;
         [Output]        
         public string SoundFileName { get; set; }
 
+        [Output]
+        public string SoundVersion { get; set; }
+
         public override bool Execute()
         {
-            string SoundVersion = "";
+            SoundVersion = "";
 
             string SoundVersionFile = "";
             if (SoundPrimaryName == "music") {