update freeswitch setup.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1890 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/w32/Setup/Setup.vdproj b/w32/Setup/Setup.vdproj
index c5869dbc51d6d46ec135e344ac9c2ca0980187f0..3e94fd2e8a27e4b9d84adbff03bf735474e9f222 100644 (file)
--- a/w32/Setup/Setup.vdproj
+++ b/w32/Setup/Setup.vdproj
@@ -21,6 +21,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_0A2A2813738E4157B2CC6A4EF2A303BB"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_10A983E896C14286A47AAB6A8570EE6D"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -153,12 +159,6 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_2BF556351045DED0C85B527171346CCD"\r
-        "OwnerKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
         "MsmKey" = "8:_2D09AB81AB8D45FF97E9DFA4DAC3465D"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -291,6 +291,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_A40E3F2045F44C60A8509FDFE47E6C45"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_A55F680EDBCDA3F18A46EF6CFC14A1D5"\r
         "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -550,12 +556,12 @@
             "IsDependency" = "11:TRUE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1273F63008CF585CA0E063E436B4646F"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0A2A2813738E4157B2CC6A4EF2A303BB"\r
             {\r
-            "SourcePath" = "8:iphlpapi.dll"\r
-            "TargetName" = "8:iphlpapi.dll"\r
+            "SourcePath" = "8:..\\..\\AUTHORS"\r
+            "TargetName" = "8:AUTHORS"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_06036160035041E38F4179E6DB6380C5"\r
+            "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -566,16 +572,16 @@
             "SharedLegacy" = "11:FALSE"\r
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
-            "Exclude" = "11:TRUE"\r
-            "IsDependency" = "11:TRUE"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1BD78CCD666E4BB5BE1168302E9613A2"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1273F63008CF585CA0E063E436B4646F"\r
             {\r
-            "SourcePath" = "8:..\\..\\libs\\apr-iconv\\Release\\libapriconv-1.dll"\r
-            "TargetName" = "8:libapriconv-1.dll"\r
+            "SourcePath" = "8:iphlpapi.dll"\r
+            "TargetName" = "8:iphlpapi.dll"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"\r
+            "Folder" = "8:_06036160035041E38F4179E6DB6380C5"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -586,14 +592,14 @@
             "SharedLegacy" = "11:FALSE"\r
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
-            "Exclude" = "11:FALSE"\r
-            "IsDependency" = "11:FALSE"\r
+            "Exclude" = "11:TRUE"\r
+            "IsDependency" = "11:TRUE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2BF556351045DED0C85B527171346CCD"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1BD78CCD666E4BB5BE1168302E9613A2"\r
             {\r
-            "SourcePath" = "8:libpcre.dll"\r
-            "TargetName" = "8:libpcre.dll"\r
+            "SourcePath" = "8:..\\..\\libs\\apr-iconv\\Release\\libapriconv-1.dll"\r
+            "TargetName" = "8:libapriconv-1.dll"\r
             "Tag" = "8:"\r
             "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"\r
             "Condition" = "8:"\r
@@ -607,7 +613,7 @@
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
             "Exclude" = "11:FALSE"\r
-            "IsDependency" = "11:TRUE"\r
+            "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_36D88C9590054DCA8F6ABAE6F05C2FD6"\r
@@ -730,6 +736,26 @@
             "IsDependency" = "11:TRUE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A40E3F2045F44C60A8509FDFE47E6C45"\r
+            {\r
+            "SourcePath" = "8:..\\..\\COPYING"\r
+            "TargetName" = "8:COPYING"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A55F680EDBCDA3F18A46EF6CFC14A1D5"\r
             {\r
             "SourcePath" = "8:sqlite.dll"\r
@@ -901,14 +927,14 @@
         "Name" = "8:Microsoft Visual Studio"\r
         "ProductName" = "8:Freeswitch"\r
         "ProductCode" = "8:{317A9CC0-40DC-4803-A13E-5937F05F9D2E}"\r
-        "PackageCode" = "8:{5010843A-818C-4EA9-8C62-3433E128CC5D}"\r
+        "PackageCode" = "8:{F5FFEAA8-6C32-4FFC-9DA5-FC799FDB8B8F}"\r
         "UpgradeCode" = "8:{8080E3A5-7ADD-4173-8913-BDA439D1C8DD}"\r
         "RestartWWWService" = "11:FALSE"\r
         "RemovePreviousVersions" = "11:FALSE"\r
         "DetectNewerInstalledVersion" = "11:TRUE"\r
         "InstallAllUsers" = "11:FALSE"\r
         "ProductVersion" = "8:1.0.0"\r
-        "Manufacturer" = "8:Freeswitch"\r
+        "Manufacturer" = "8:Freeswitch.org"\r
         "ARPHELPTELEPHONE" = "8:"\r
         "ARPHELPLINK" = "8:"\r
         "Title" = "8:Freeswitch"\r
@@ -916,7 +942,7 @@
         "ARPCONTACT" = "8:"\r
         "Keywords" = "8:"\r
         "ARPCOMMENTS" = "8:"\r
-        "ARPURLINFOABOUT" = "8:"\r
+        "ARPURLINFOABOUT" = "8:http://www.freeswitch.org"\r
         "ARPPRODUCTICON" = "8:"\r
         "ARPIconIndex" = "3:0"\r
         "SearchPath" = "8:"\r
@@ -953,6 +979,14 @@
                                 }\r
                                 "Values"\r
                                 {\r
+                                    "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_C59781825E5B4A9AA93BDAA5A88B7390"\r
+                                    {\r
+                                    "Name" = "8:[ProductName]"\r
+                                    "Condition" = "8:"\r
+                                    "Transitive" = "11:FALSE"\r
+                                    "ValueTypes" = "3:1"\r
+                                    "Value" = "8:"\r
+                                    }\r
                                 }\r
                             }\r
                         }\r
@@ -1167,6 +1201,53 @@
                             }\r
                         }\r
                     }\r
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E8A0FD168FA4401FBF582E01DA819A71"\r
+                    {\r
+                    "Sequence" = "3:210"\r
+                    "DisplayName" = "8:License Agreement"\r
+                    "UseDynamicProperties" = "11:TRUE"\r
+                    "IsDependency" = "11:FALSE"\r
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdAdminLicenseDlg.wid"\r
+                        "Properties"\r
+                        {\r
+                            "BannerBitmap"\r
+                            {\r
+                            "Name" = "8:BannerBitmap"\r
+                            "DisplayName" = "8:#1001"\r
+                            "Description" = "8:#1101"\r
+                            "Type" = "3:8"\r
+                            "ContextData" = "8:Bitmap"\r
+                            "Attributes" = "3:4"\r
+                            "Setting" = "3:1"\r
+                            "UsePlugInResources" = "11:TRUE"\r
+                            }\r
+                            "EulaText"\r
+                            {\r
+                            "Name" = "8:EulaText"\r
+                            "DisplayName" = "8:#1008"\r
+                            "Description" = "8:#1108"\r
+                            "Type" = "3:6"\r
+                            "ContextData" = "8:"\r
+                            "Attributes" = "3:0"\r
+                            "Setting" = "3:2"\r
+                            "Value" = "8:_A40E3F2045F44C60A8509FDFE47E6C45"\r
+                            "UsePlugInResources" = "11:TRUE"\r
+                            }\r
+                            "Sunken"\r
+                            {\r
+                            "Name" = "8:Sunken"\r
+                            "DisplayName" = "8:#1007"\r
+                            "Description" = "8:#1107"\r
+                            "Type" = "3:5"\r
+                            "ContextData" = "8:4;True=4;False=0"\r
+                            "Attributes" = "3:0"\r
+                            "Setting" = "3:0"\r
+                            "Value" = "3:4"\r
+                            "DefaultValue" = "3:4"\r
+                            "UsePlugInResources" = "11:TRUE"\r
+                            }\r
+                        }\r
+                    }\r
                 }\r
             }\r
             "{DF760B10-853B-4699-99F2-AFF7185B4A62}:_9237AC900FC7421096FC1C1F479A57D9"\r
@@ -1268,9 +1349,56 @@
                             }\r
                         }\r
                     }\r
-                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_3106DA132FA54E148478AB6CBA658548"\r
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_1229F6668E004795AE90C753D37CA881"\r
                     {\r
                     "Sequence" = "3:300"\r
+                    "DisplayName" = "8:License Agreement"\r
+                    "UseDynamicProperties" = "11:TRUE"\r
+                    "IsDependency" = "11:FALSE"\r
+                    "SourcePath" = "8:<VsdDialogDir>\\VsdLicenseDlg.wid"\r
+                        "Properties"\r
+                        {\r
+                            "BannerBitmap"\r
+                            {\r
+                            "Name" = "8:BannerBitmap"\r
+                            "DisplayName" = "8:#1001"\r
+                            "Description" = "8:#1101"\r
+                            "Type" = "3:8"\r
+                            "ContextData" = "8:Bitmap"\r
+                            "Attributes" = "3:4"\r
+                            "Setting" = "3:1"\r
+                            "UsePlugInResources" = "11:TRUE"\r
+                            }\r
+                            "EulaText"\r
+                            {\r
+                            "Name" = "8:EulaText"\r
+                            "DisplayName" = "8:#1008"\r
+                            "Description" = "8:#1108"\r
+                            "Type" = "3:6"\r
+                            "ContextData" = "8:"\r
+                            "Attributes" = "3:0"\r
+                            "Setting" = "3:2"\r
+                            "Value" = "8:_A40E3F2045F44C60A8509FDFE47E6C45"\r
+                            "UsePlugInResources" = "11:TRUE"\r
+                            }\r
+                            "Sunken"\r
+                            {\r
+                            "Name" = "8:Sunken"\r
+                            "DisplayName" = "8:#1007"\r
+                            "Description" = "8:#1107"\r
+                            "Type" = "3:5"\r
+                            "ContextData" = "8:4;True=4;False=0"\r
+                            "Attributes" = "3:0"\r
+                            "Setting" = "3:0"\r
+                            "Value" = "3:4"\r
+                            "DefaultValue" = "3:4"\r
+                            "UsePlugInResources" = "11:TRUE"\r
+                            }\r
+                        }\r
+                    }\r
+                    "{688940B3-5CA9-4162-8DEE-2993FA9D8CBC}:_E4748A502E1E4F89B72F6B70E40E6954"\r
+                    {\r
+                    "Sequence" = "3:400"\r
                     "DisplayName" = "8:Confirm Installation"\r
                     "UseDynamicProperties" = "11:TRUE"\r
                     "IsDependency" = "11:FALSE"\r
@@ -1439,7 +1567,7 @@
                 {\r
                 }\r
             "LanguageId" = "3:0"\r
-            "Exclude" = "11:FALSE"\r
+            "Exclude" = "11:TRUE"\r
             "Folder" = "8:"\r
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
@@ -1453,7 +1581,7 @@
                 {\r
                 }\r
             "LanguageId" = "3:0"\r
-            "Exclude" = "11:FALSE"\r
+            "Exclude" = "11:TRUE"\r
             "Folder" = "8:"\r
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r

diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln
index c63b74d3cdbe415b255eec7b064466dd328d7e25..ab8c14e14b092130dc0fa663afc18e24b211665c 100644 (file)
--- a/w32/vsnet/Freeswitch.sln
+++ b/w32/vsnet/Freeswitch.sln
@@ -201,8 +201,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "..\..\src\mo
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
        EndProjectSection\r
 EndProject\r
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{99D6D74B-32A8-4441-A417-551B0E0A4510}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "..\..\src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r