git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16591 d0543943-73ff-0310...

diff --git a/w32/Setup/inno_setup/create_fusionpbx.sql b/w32/Setup/inno_setup/create_fusionpbx.sql
index 9bad59b82a367325f43329723566fc91557d7e07..b6c2e38d055cea0a12887f33b821130c16db236c 100644 (file)
--- a/w32/Setup/inno_setup/create_fusionpbx.sql
+++ b/w32/Setup/inno_setup/create_fusionpbx.sql
@@ -1,3 +1,3 @@
 CREATE USER 'fusionpbx'@'localhost' IDENTIFIED BY 'fusionpbx';\r
 GRANT ALL ON *.* TO 'fusionpbx'@'localhost';\r
-create DATABASE fusionpbx\r
+\r

diff --git a/w32/Setup/inno_setup/freeswitch_freepbx.iss b/w32/Setup/inno_setup/freeswitch_freepbx.iss
index 4060f689a540262bc3c7464d659bc558252f93ab..e84cee484ab1d1c711d6c0b751ff8df23319a161 100644 (file)
--- a/w32/Setup/inno_setup/freeswitch_freepbx.iss
+++ b/w32/Setup/inno_setup/freeswitch_freepbx.iss
@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)\r
 ;AppId={{088C2C50-0D5F-4276-8771-FF54CAA14E70}\r
 AppName=FreeSWITCH\r
-AppVerName=FreeSWITCH svn 16235\r
+AppVerName=FreeSWITCH svn 16456\r
 AppPublisher=FreeSWITCH\r
 AppPublisherURL=http://www.freeswitch.org\r
 AppSupportURL=http://www.freeswitch.org\r
@@ -157,7 +157,7 @@ Source: http://files.freeswitch.org/freeswitch-sounds-music-16000-1.0.8.tar.gz;
 Source: http://files.freeswitch.org/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/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
 \r
-Source: http://files.freeswitch.org/downloads/win32/7za.exe; DestDir: {tmp}; DestName: 7za.exe; Components: sound_files_8khz\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
 Name: FreeSWITCH; Description: FreeSWITCH core components; Flags: fixed; Types: custom compact full; Languages: \r
 Name: FreePBX_WAMP; Description: FreePBX interface along with Apache, Mysql and PHP; Types: custom full\r

diff --git a/w32/Setup/inno_setup/freeswitch_fusionpbx.iss b/w32/Setup/inno_setup/freeswitch_fusionpbx.iss
index 54dbd96e7838e445f54f2778f34f644ab5fa0cfd..9b91fe7c605b21bdf61b20f936b14457967e1b53 100644 (file)
--- a/w32/Setup/inno_setup/freeswitch_fusionpbx.iss
+++ b/w32/Setup/inno_setup/freeswitch_fusionpbx.iss
@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)\r
 ;AppId={{088C2C50-0D5F-4276-8771-FF54CAA14E70}\r
 AppName=FreeSWITCH\r
-AppVerName=FreeSWITCH svn 16235\r
+AppVerName=FreeSWITCH svn 16287\r
 AppPublisher=FreeSWITCH\r
 AppPublisherURL=http://www.freeswitch.org\r
 AppSupportURL=http://www.freeswitch.org\r

diff --git a/w32/Setup/inno_setup/fscomm.iss b/w32/Setup/inno_setup/fscomm.iss
index 47ad27b5af1b8400218df82fd7a91ef1d89eacdd..8f82782151ec3315a8ab40e7b0d097f37d67ee17 100644 (file)
--- a/w32/Setup/inno_setup/fscomm.iss
+++ b/w32/Setup/inno_setup/fscomm.iss
@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)\r
 ;AppId={{ED55656F-D567-4B3D-A0B9-617CAB13D519}\r
 AppName=FSComm\r
-AppVerName=FSComm svn 16235\r
+AppVerName=FSComm svn 16568\r
 AppPublisherURL=http://wiki.freeswitch.org/wiki/FSComm\r
 AppSupportURL=http://wiki.freeswitch.org/wiki/FSComm\r
 AppUpdatesURL=http://wiki.freeswitch.org/wiki/FSComm\r
@@ -29,7 +29,7 @@ ArchitecturesInstallIn64BitMode=x64
 #define FreeSWITCH_32bit "..\..\..\release"\r
 #define FreeSWITCH_64bit "..\..\..\x64\release"\r
 \r
-#define FSComm_32bit "..\..\..\fscomm\release"\r
+#define FSComm_32bit "..\..\..\fscomm\win32\release"\r
 #define FSComm_64bit "..\..\..\fscomm\x64\release"\r
 \r
 [Languages]\r
@@ -47,7 +47,7 @@ Source: vcredist_x64.exe; Flags: 64bit; DestDir: {tmp}; Check: Is64BitInstallMod
 Source: freeswitch.ico; DestDir: {app}\r
 Source: {#FSComm_32bit}\fscomm.exe; DestDir: {app}; Flags: 32bit ignoreversion; Check: not Is64BitInstallMode\r
 Source: {#FreeSWITCH_32bit}\fs_cli.exe; DestDir: {app}; Flags: 32bit ignoreversion; Check: not Is64BitInstallMode\r
-Source: {#FSComm_32bit}\..\conf\*; DestDir: {app}\conf; Flags: 32bit ignoreversion  onlyifdoesntexist recursesubdirs; Check: not Is64BitInstallMode\r
+Source: ..\..\..\fscomm\conf\*; DestDir: {app}\conf; Flags: 32bit ignoreversion  onlyifdoesntexist recursesubdirs; Check: not Is64BitInstallMode\r
 \r
 ; 32 bit QT libraries\r
 Source: {#QT32Bit_Build}\QtCore4.dll; DestDir: {app}; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
@@ -73,6 +73,7 @@ Source: {#FreeSWITCH_32bit}\mod\mod_sofia.dll; DestDir: {app}\mod; Flags: 32bit
 Source: {#FreeSWITCH_32bit}\mod\mod_speex.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
 Source: {#FreeSWITCH_32bit}\mod\mod_tone_stream.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
 Source: {#FreeSWITCH_32bit}\mod\mod_voipcodecs.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
+Source: {#FreeSWITCH_32bit}\mod\mod_celt.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
 \r
 ; required FreeSWICTCH dlls for 32bit build\r
 Source: {#FreeSWITCH_32bit}\pthreadVC2.dll; DestDir: {app}; Flags: 32bit ignoreversion  onlyifdoesntexist; Check: not Is64BitInstallMode\r
@@ -87,7 +88,7 @@ Source: {#FreeSWITCH_32bit}\FreeSwitch.dll; DestDir: {app}; Flags: 32bit ignorev
 Source: freeswitch.ico; DestDir: {app}\r
 Source: {#FSComm_64bit}\fscomm.exe; DestDir: {app}; Flags: 64bit ignoreversion; Check: Is64BitInstallMode\r
 Source: {#FreeSWITCH_64bit}\fs_cli.exe; DestDir: {app}; Flags: 64bit ignoreversion; Check: Is64BitInstallMode\r
-Source: {#FSComm_32bit}\..\conf\*; DestDir: {app}\conf; Flags: 64bit ignoreversion onlyifdoesntexist recursesubdirs; Check: Is64BitInstallMode\r
+Source: ..\..\..\fscomm\conf\*; DestDir: {app}\conf; Flags: 64bit ignoreversion onlyifdoesntexist recursesubdirs; Check: Is64BitInstallMode\r
 \r
 ; 64 bit QT libraries\r
 Source: {#QT64Bit_Build}\QtCore4.dll; DestDir: {app}; Flags: 64bit ignoreversion  onlyifdoesntexist; Check: Is64BitInstallMode\r
@@ -113,6 +114,7 @@ Source: {#FreeSWITCH_64bit}\mod\mod_sofia.dll; DestDir: {app}\mod; Flags: 64bit
 Source: {#FreeSWITCH_64bit}\mod\mod_speex.dll; DestDir: {app}\mod; Flags: 64bit ignoreversion  onlyifdoesntexist; Check: Is64BitInstallMode\r
 Source: {#FreeSWITCH_64bit}\mod\mod_tone_stream.dll; DestDir: {app}\mod; Flags: 64bit ignoreversion  onlyifdoesntexist; Check: Is64BitInstallMode\r
 Source: {#FreeSWITCH_64bit}\mod\mod_voipcodecs.dll; DestDir: {app}\mod; Flags: 64bit ignoreversion  onlyifdoesntexist; Check: Is64BitInstallMode\r
+Source: {#FreeSWITCH_64bit}\mod\mod_celt.dll; DestDir: {app}\mod; Flags: 64bit ignoreversion  onlyifdoesntexist; Check: Is64BitInstallMode\r
 \r
 ; required FreeSWICTCH dlls for 64bit build\r
 Source: {#FreeSWITCH_64bit}\pthreadVC2.dll; DestDir: {app}; Flags: 64bit ignoreversion  onlyifdoesntexist; Check: Is64BitInstallMode\r

diff --git a/w32/Setup/inno_setup/fsgui.iss b/w32/Setup/inno_setup/fsgui.iss
index 61c6eb235b3b12ecb567c7412433f326ca7b1bb9..dda6a506b22580692e9db0c9e9a2f0a9ec174562 100644 (file)
--- a/w32/Setup/inno_setup/fsgui.iss
+++ b/w32/Setup/inno_setup/fsgui.iss
@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)\r
 ;AppId={{ED55656F-D567-4B3D-A0B9-617CAB13D519}\r
 AppName=FsGui\r
-AppVerName=FsGui svn 15668\r
+AppVerName=FsGui svn 16045\r
 AppPublisherURL=http://wiki.freeswitch.org/wiki/Fsgui\r
 AppSupportURL=http://wiki.freeswitch.org/wiki/Fsgui\r
 AppUpdatesURL=http://wiki.freeswitch.org/wiki/Fsgui\r