From 90cfb26e582bd713216199645b7c8b7b985c9807 Mon Sep 17 00:00:00 2001 From: "Carlos J. Talbot" Date: Tue, 9 Feb 2010 15:58:36 +0000 Subject: [PATCH] git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16591 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- w32/Setup/inno_setup/create_fusionpbx.sql | 2 +- w32/Setup/inno_setup/freeswitch_freepbx.iss | 4 ++-- w32/Setup/inno_setup/freeswitch_fusionpbx.iss | 2 +- w32/Setup/inno_setup/fscomm.iss | 10 ++++++---- w32/Setup/inno_setup/fsgui.iss | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/w32/Setup/inno_setup/create_fusionpbx.sql b/w32/Setup/inno_setup/create_fusionpbx.sql index 9bad59b82a..b6c2e38d05 100644 --- 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'; GRANT ALL ON *.* TO 'fusionpbx'@'localhost'; -create DATABASE fusionpbx + diff --git a/w32/Setup/inno_setup/freeswitch_freepbx.iss b/w32/Setup/inno_setup/freeswitch_freepbx.iss index 4060f689a5..e84cee484a 100644 --- 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.) ;AppId={{088C2C50-0D5F-4276-8771-FF54CAA14E70} AppName=FreeSWITCH -AppVerName=FreeSWITCH svn 16235 +AppVerName=FreeSWITCH svn 16456 AppPublisher=FreeSWITCH AppPublisherURL=http://www.freeswitch.org AppSupportURL=http://www.freeswitch.org @@ -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 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 -Source: http://files.freeswitch.org/downloads/win32/7za.exe; DestDir: {tmp}; DestName: 7za.exe; Components: sound_files_8khz +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 [Components] Name: FreeSWITCH; Description: FreeSWITCH core components; Flags: fixed; Types: custom compact full; Languages: Name: FreePBX_WAMP; Description: FreePBX interface along with Apache, Mysql and PHP; Types: custom full diff --git a/w32/Setup/inno_setup/freeswitch_fusionpbx.iss b/w32/Setup/inno_setup/freeswitch_fusionpbx.iss index 54dbd96e78..9b91fe7c60 100644 --- 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.) ;AppId={{088C2C50-0D5F-4276-8771-FF54CAA14E70} AppName=FreeSWITCH -AppVerName=FreeSWITCH svn 16235 +AppVerName=FreeSWITCH svn 16287 AppPublisher=FreeSWITCH AppPublisherURL=http://www.freeswitch.org AppSupportURL=http://www.freeswitch.org diff --git a/w32/Setup/inno_setup/fscomm.iss b/w32/Setup/inno_setup/fscomm.iss index 47ad27b5af..8f82782151 100644 --- 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.) ;AppId={{ED55656F-D567-4B3D-A0B9-617CAB13D519} AppName=FSComm -AppVerName=FSComm svn 16235 +AppVerName=FSComm svn 16568 AppPublisherURL=http://wiki.freeswitch.org/wiki/FSComm AppSupportURL=http://wiki.freeswitch.org/wiki/FSComm AppUpdatesURL=http://wiki.freeswitch.org/wiki/FSComm @@ -29,7 +29,7 @@ ArchitecturesInstallIn64BitMode=x64 #define FreeSWITCH_32bit "..\..\..\release" #define FreeSWITCH_64bit "..\..\..\x64\release" -#define FSComm_32bit "..\..\..\fscomm\release" +#define FSComm_32bit "..\..\..\fscomm\win32\release" #define FSComm_64bit "..\..\..\fscomm\x64\release" [Languages] @@ -47,7 +47,7 @@ Source: vcredist_x64.exe; Flags: 64bit; DestDir: {tmp}; Check: Is64BitInstallMod Source: freeswitch.ico; DestDir: {app} Source: {#FSComm_32bit}\fscomm.exe; DestDir: {app}; Flags: 32bit ignoreversion; Check: not Is64BitInstallMode Source: {#FreeSWITCH_32bit}\fs_cli.exe; DestDir: {app}; Flags: 32bit ignoreversion; Check: not Is64BitInstallMode -Source: {#FSComm_32bit}\..\conf\*; DestDir: {app}\conf; Flags: 32bit ignoreversion onlyifdoesntexist recursesubdirs; Check: not Is64BitInstallMode +Source: ..\..\..\fscomm\conf\*; DestDir: {app}\conf; Flags: 32bit ignoreversion onlyifdoesntexist recursesubdirs; Check: not Is64BitInstallMode ; 32 bit QT libraries Source: {#QT32Bit_Build}\QtCore4.dll; DestDir: {app}; Flags: 32bit ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode @@ -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 Source: {#FreeSWITCH_32bit}\mod\mod_tone_stream.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode Source: {#FreeSWITCH_32bit}\mod\mod_voipcodecs.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode +Source: {#FreeSWITCH_32bit}\mod\mod_celt.dll; DestDir: {app}\mod; Flags: 32bit ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode ; required FreeSWICTCH dlls for 32bit build Source: {#FreeSWITCH_32bit}\pthreadVC2.dll; DestDir: {app}; Flags: 32bit ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode @@ -87,7 +88,7 @@ Source: {#FreeSWITCH_32bit}\FreeSwitch.dll; DestDir: {app}; Flags: 32bit ignorev Source: freeswitch.ico; DestDir: {app} Source: {#FSComm_64bit}\fscomm.exe; DestDir: {app}; Flags: 64bit ignoreversion; Check: Is64BitInstallMode Source: {#FreeSWITCH_64bit}\fs_cli.exe; DestDir: {app}; Flags: 64bit ignoreversion; Check: Is64BitInstallMode -Source: {#FSComm_32bit}\..\conf\*; DestDir: {app}\conf; Flags: 64bit ignoreversion onlyifdoesntexist recursesubdirs; Check: Is64BitInstallMode +Source: ..\..\..\fscomm\conf\*; DestDir: {app}\conf; Flags: 64bit ignoreversion onlyifdoesntexist recursesubdirs; Check: Is64BitInstallMode ; 64 bit QT libraries Source: {#QT64Bit_Build}\QtCore4.dll; DestDir: {app}; Flags: 64bit ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode @@ -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 Source: {#FreeSWITCH_64bit}\mod\mod_tone_stream.dll; DestDir: {app}\mod; Flags: 64bit ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode Source: {#FreeSWITCH_64bit}\mod\mod_voipcodecs.dll; DestDir: {app}\mod; Flags: 64bit ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode +Source: {#FreeSWITCH_64bit}\mod\mod_celt.dll; DestDir: {app}\mod; Flags: 64bit ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode ; required FreeSWICTCH dlls for 64bit build Source: {#FreeSWITCH_64bit}\pthreadVC2.dll; DestDir: {app}; Flags: 64bit ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode diff --git a/w32/Setup/inno_setup/fsgui.iss b/w32/Setup/inno_setup/fsgui.iss index 61c6eb235b..dda6a506b2 100644 --- 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.) ;AppId={{ED55656F-D567-4B3D-A0B9-617CAB13D519} AppName=FsGui -AppVerName=FsGui svn 15668 +AppVerName=FsGui svn 16045 AppPublisherURL=http://wiki.freeswitch.org/wiki/Fsgui AppSupportURL=http://wiki.freeswitch.org/wiki/Fsgui AppUpdatesURL=http://wiki.freeswitch.org/wiki/Fsgui