windows installer tweaks.. not quite there yet still.

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

diff --git a/w32/Setup/Setup.vdproj b/w32/Setup/Setup.vdproj
index 4008dc2208f5ff02bfb7597aff082a6e88c52cc8..4c3de447d575b2ae9c77310f38e57d533aff10e9 100644 (file)
--- a/w32/Setup/Setup.vdproj
+++ b/w32/Setup/Setup.vdproj
@@ -87,26 +87,26 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_413E616556854689B457A68A06830A82"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_3F927D72DFA53DCF09A9D5F6EB00333D"\r
+        "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128"\r
+        "MsmKey" = "8:_413E616556854689B457A68A06830A82"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_53150E807A66E04034BACF0B4D81105A"\r
-        "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E"\r
+        "MsmKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_53150E807A66E04034BACF0B4D81105A"\r
-        "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF"\r
+        "MsmKey" = "8:_4F16AA4E02A545BEA97556AC80AAB7C0"\r
+        "OwnerKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -147,132 +147,108 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_83062AA0528B40A59202BC7668F7132A"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_83C1B93AD71B4F8F9E074F9607B60DF1"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_87768631363249B2B301143C193612F7"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_1CFB1AB04E024FC993E0EB4859DF8408"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_EF14CB99F3414BB689D0CB0E6D6B8AB8"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
-        "OwnerKey" = "8:_EE46A936D4054F7286909355BF2AE5D7"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_D1269F1E49D442CF8EAC96C23E60325D"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_B20769E090034897B32E3EA4EC1BA8A0"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_A0D5F714A0F94250A1C39603B699AB82"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_83C1B93AD71B4F8F9E074F9607B60DF1"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
-        "OwnerKey" = "8:_6753CE9F969E43A2A50ADEC0245F58A4"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_4A285D260C3748A4BEFA6E5A9004D128"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_318FCC99E8D143D6B4F9F534E63009B3"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_2F2FEC549F02436EB87961BD1B9E5783"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+        "MsmKey" = "8:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
         "OwnerKey" = "8:_2814E641538B42EFA83525986A9D5AC1"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
-        "OwnerKey" = "8:_1F21CF104E90499E8F6BBD2136A52884"\r
+        "MsmKey" = "8:_83062AA0528B40A59202BC7668F7132A"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_9A293E8A356A4959BB6E541B7DC213CD"\r
+        "MsmKey" = "8:_83C1B93AD71B4F8F9E074F9607B60DF1"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_9B01D8B92FE15ACCAAD5F4F4C7681FD6"\r
-        "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E"\r
+        "MsmKey" = "8:_87768631363249B2B301143C193612F7"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_A044EB8034E3CED402BF9A7DB7CC4550"\r
+        "MsmKey" = "8:_95DF1AC815283888345057940530D1C0"\r
         "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_9A293E8A356A4959BB6E541B7DC213CD"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_A0D5F714A0F94250A1C39603B699AB82"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -285,6 +261,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_A55F680EDBCDA3F18A46EF6CFC14A1D5"\r
+        "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_AD2EB44FE6D548F2A8DA4F9F2CE817AC"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -303,20 +285,26 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_C105055EE271471A999CE7022E617EB7"\r
-        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmKey" = "8:_B4DB166A7F41DC9EF58E277B90CC68AB"\r
+        "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F"\r
+        "MsmKey" = "8:_B4DB166A7F41DC9EF58E277B90CC68AB"\r
+        "OwnerKey" = "8:_F0B800E719294692A02518CFD8CBAEFF"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
+        "MsmKey" = "8:_C105055EE271471A999CE7022E617EB7"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_CD7DAA5960C15D1769787DCAC200919C"\r
-        "OwnerKey" = "8:_E72980C058C646E0A7FAF423EB57EA6E"\r
+        "MsmKey" = "8:_C81AC700C1BC4A55B98DF12C0CBAFD6F"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
         }\r
         "Entry"\r
@@ -345,12 +333,6 @@
         }\r
         "Entry"\r
         {\r
-        "MsmKey" = "8:_DDC345A5D8F3411B871108AAD163F920"\r
-        "OwnerKey" = "8:_8FC4214A35474C90B4FFD16CA8F225D4"\r
-        "MsmSig" = "8:_UNDEFINED"\r
-        }\r
-        "Entry"\r
-        {\r
         "MsmKey" = "8:_E4BCD553B2054B0F8BC67428E1A11674"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -654,12 +636,12 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_413E616556854689B457A68A06830A82"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3F927D72DFA53DCF09A9D5F6EB00333D"\r
             {\r
-            "SourcePath" = "8:..\\..\\src\\mod\\languages\\mod_perl\\freeswitch.pm"\r
-            "TargetName" = "8:freeswitch.pm"\r
+            "SourcePath" = "8:libaprutil-1.dll"\r
+            "TargetName" = "8:libaprutil-1.dll"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_27A96C279A6A44E8A2FDF8D51CD86E29"\r
+            "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -671,15 +653,15 @@
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
             "Exclude" = "11:FALSE"\r
-            "IsDependency" = "11:FALSE"\r
+            "IsDependency" = "11:TRUE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_53150E807A66E04034BACF0B4D81105A"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_413E616556854689B457A68A06830A82"\r
             {\r
-            "SourcePath" = "8:libapr-1.dll"\r
-            "TargetName" = "8:libapr-1.dll"\r
+            "SourcePath" = "8:..\\..\\src\\mod\\languages\\mod_perl\\freeswitch.pm"\r
+            "TargetName" = "8:freeswitch.pm"\r
             "Tag" = "8:"\r
-            "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"\r
+            "Folder" = "8:_27A96C279A6A44E8A2FDF8D51CD86E29"\r
             "Condition" = "8:"\r
             "Transitive" = "11:FALSE"\r
             "Vital" = "11:TRUE"\r
@@ -691,7 +673,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}:_83062AA0528B40A59202BC7668F7132A"\r
@@ -714,10 +696,10 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9B01D8B92FE15ACCAAD5F4F4C7681FD6"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_95DF1AC815283888345057940530D1C0"\r
             {\r
-            "SourcePath" = "8:libaprutil-1.dll"\r
-            "TargetName" = "8:libaprutil-1.dll"\r
+            "SourcePath" = "8:FreeSwitch.dll"\r
+            "TargetName" = "8:FreeSwitch.dll"\r
             "Tag" = "8:"\r
             "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"\r
             "Condition" = "8:"\r
@@ -734,10 +716,10 @@
             "IsDependency" = "11:TRUE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A044EB8034E3CED402BF9A7DB7CC4550"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A40E3F2045F44C60A8509FDFE47E6C45"\r
             {\r
-            "SourcePath" = "8:FreeSwitch.dll"\r
-            "TargetName" = "8:FreeSwitch.dll"\r
+            "SourcePath" = "8:..\\..\\COPYING"\r
+            "TargetName" = "8:COPYING"\r
             "Tag" = "8:"\r
             "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"\r
             "Condition" = "8:"\r
@@ -750,14 +732,14 @@
             "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}:_A40E3F2045F44C60A8509FDFE47E6C45"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A55F680EDBCDA3F18A46EF6CFC14A1D5"\r
             {\r
-            "SourcePath" = "8:..\\..\\COPYING"\r
-            "TargetName" = "8:COPYING"\r
+            "SourcePath" = "8:sqlite.dll"\r
+            "TargetName" = "8:sqlite.dll"\r
             "Tag" = "8:"\r
             "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"\r
             "Condition" = "8:"\r
@@ -771,13 +753,13 @@
             "PackageAs" = "3:1"\r
             "Register" = "3:1"\r
             "Exclude" = "11:FALSE"\r
-            "IsDependency" = "11:FALSE"\r
+            "IsDependency" = "11:TRUE"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CD7DAA5960C15D1769787DCAC200919C"\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4DB166A7F41DC9EF58E277B90CC68AB"\r
             {\r
-            "SourcePath" = "8:sqlite.dll"\r
-            "TargetName" = "8:sqlite.dll"\r
+            "SourcePath" = "8:libapr-1.dll"\r
+            "TargetName" = "8:libapr-1.dll"\r
             "Tag" = "8:"\r
             "Folder" = "8:_04AC783F1C9F41AEB4E947C46CE9C9FF"\r
             "Condition" = "8:"\r
@@ -1536,30 +1518,30 @@
         }\r
         "MergeModule"\r
         {\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_8FC4214A35474C90B4FFD16CA8F225D4"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_4F16AA4E02A545BEA97556AC80AAB7C0"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm"\r
+            "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r
             "LanguageId" = "3:0"\r
-            "Exclude" = "11:TRUE"\r
+            "Exclude" = "11:FALSE"\r
             "Folder" = "8:"\r
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
             }\r
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_DDC345A5D8F3411B871108AAD163F920"\r
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_7BE928D7D9AD4CC3A3D85B1AA764FEB0"\r
             {\r
             "UseDynamicProperties" = "11:TRUE"\r
             "IsDependency" = "11:TRUE"\r
-            "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm"\r
+            "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm"\r
                 "Properties"\r
                 {\r
                 }\r
             "LanguageId" = "3:0"\r
-            "Exclude" = "11:TRUE"\r
+            "Exclude" = "11:FALSE"\r
             "Folder" = "8:"\r
             "Feature" = "8:"\r
             "IsolateTo" = "8:"\r
@@ -2437,7 +2419,7 @@
             }\r
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_EE46A936D4054F7286909355BF2AE5D7"\r
             {\r
-            "SourcePath" = "8:..\\vsnet\\Debug\\perl\\fs_perl.dll"\r
+            "SourcePath" = "8:..\\vsnet\\debug\\perl\\fs_perl.dll"\r
             "TargetName" = "8:"\r
             "Tag" = "8:"\r
             "Folder" = "8:_27A96C279A6A44E8A2FDF8D51CD86E29"\r