From 0bdd607c948fd0eb1125bc5b49d39a4270406386 Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Thu, 22 Jun 2017 01:51:46 +0300 Subject: [PATCH] FS-9717 [Build-System] Fix missing mods in msi packages. Fix x64 release build on a clean tree on windows. --- Freeswitch.2015.sln | 2 + w32/Setup/Setup.2015.wixproj | 334 ++++++++++++++++++++++++++++++++--- 2 files changed, 308 insertions(+), 28 deletions(-) diff --git a/Freeswitch.2015.sln b/Freeswitch.2015.sln index 65b0aa0d81..cb508d7db4 100644 --- a/Freeswitch.2015.sln +++ b/Freeswitch.2015.sln @@ -2894,9 +2894,11 @@ Global {583D8CEA-4171-4493-9025-B63265F408D8}.Debug|Win32.ActiveCfg = Debug|Win32 {583D8CEA-4171-4493-9025-B63265F408D8}.Debug|Win32.Build.0 = Debug|Win32 {583D8CEA-4171-4493-9025-B63265F408D8}.Debug|x64.ActiveCfg = Debug|Win32 + {583D8CEA-4171-4493-9025-B63265F408D8}.Debug|x64.Build.0 = Debug|Win32 {583D8CEA-4171-4493-9025-B63265F408D8}.Release|Win32.ActiveCfg = Release|Win32 {583D8CEA-4171-4493-9025-B63265F408D8}.Release|Win32.Build.0 = Release|Win32 {583D8CEA-4171-4493-9025-B63265F408D8}.Release|x64.ActiveCfg = Release|Win32 + {583D8CEA-4171-4493-9025-B63265F408D8}.Release|x64.Build.0 = Release|Win32 {87933C2D-0159-46F7-B326-E1B6E982C21E}.All|Win32.ActiveCfg = Release|Win32 {87933C2D-0159-46F7-B326-E1B6E982C21E}.All|Win32.Build.0 = Release|Win32 {87933C2D-0159-46F7-B326-E1B6E982C21E}.All|x64.ActiveCfg = Release|x64 diff --git a/w32/Setup/Setup.2015.wixproj b/w32/Setup/Setup.2015.wixproj index 4c2dc0c9c2..3c3261171f 100644 --- a/w32/Setup/Setup.2015.wixproj +++ b/w32/Setup/Setup.2015.wixproj @@ -57,6 +57,54 @@ Binaries;Content;Satellites INSTALLFOLDER + + 8khz + {7a8d8174-b355-4114-afc1-04777cb9de0a} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + 8khz music + {d1abe208-6442-4fb4-9aad-1677e41bc870} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_abstraction + {60c542ee-6882-4ea2-8c21-5ab6db1ba73f} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_avmd + {990baa76-89d3-4e38-8479-c7b28784efc8} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_blacklist + {50aac2ce-bfc9-4912-87cc-c6381850d735} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_callcenter + {47886a6c-cca6-4f9f-a7d4-f97d06fb2b1a} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_commands {30a5b29c-983e-4580-9fd0-d647ccdcc7eb} @@ -97,6 +145,14 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_distributor + {5c2b4d88-3bea-4fe0-90df-fa9836099d5f} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_dptools {b5881a85-fe70-4f64-8607-2caae52669c6} @@ -105,6 +161,14 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_easyroute + {329fd5b0-ef28-4606-86d0-f6ea21cf8e36} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_enum {71a967d5-0e99-4cef-a587-98836ee6f2ef} @@ -113,6 +177,22 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_esf + {3850d93a-5f24-4922-bc1c-74d08c37c256} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_expr + {65a6273d-fcab-4c55-b09e-65100141a5d4} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_fifo {75df7f29-2fbf-47f7-b5af-5b4952dc1abd} @@ -121,6 +201,14 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_fsv + {e3246d17-e29b-4ab5-962a-c69b0c5837bb} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_hash {2e250296-0c08-4342-9c8a-bcbdd0e7df65} @@ -137,6 +225,38 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_http_cache + {87933c2d-0159-46f7-b326-e1b6e982c21e} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_lcr + {1a3793d1-05d1-4b57-9b0f-5af3e79dc439} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_nibblebill + {3c977801-fe88-48f2-83d3-fa2ebff6688e} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_snom + {2a3d00c6-588d-4e86-81ac-9ef5ede86e03} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_spandsp {1e21afe0-6fdb-41d2-942d-863607c24b91} @@ -145,6 +265,14 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_vmd + {14e4a972-9cfb-436d-b0a5-4943f3f80d47} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_voicemail {d7f1e3f2-a3f4-474c-8555-15122571af52} @@ -153,6 +281,38 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_flite + {66444aee-554c-11dd-a9f0-8c5d56d89593} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_pocketsphinx + {2286da73-9fc5-45bc-a508-85994c3317ab} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_amr + {8deb383c-4091-4f42-a56f-c9e46d552d79} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_bv + {d5c87b19-150d-4ef3-a671-96589bd2d14a} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_g723_1 {fea1eef7-876f-48de-88bf-c0e3e606d758} @@ -177,6 +337,22 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_ilbc + {d3ec0aff-76fc-4210-a825-9a17410660a3} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_iSAC + {7f1610f1-dd5a-4cf7-8610-30ab12c60add} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_opus {64e99cca-3c6f-4aeb-9fa3-cfac711257bb} @@ -185,6 +361,30 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_siren + {0b6c905b-142e-4999-b39d-92ff7951e921} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_dialplan_asterisk + {e7bc026c-7cc5-45a3-bc7c-3b88eef01f24} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_dialplan_directory + {a27cca23-1541-4337-81a4-f0a6413078a0} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_dialplan_xml {07113b25-d3af-4e04-ba77-4cd1171f022c} @@ -193,6 +393,22 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_ldap + {ec3e5c7f-ee09-47e2-80fe-546363d14a98} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_dingaling + {ffaa4c52-3a53-4f99-90c1-d59d1f0427f3} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_loopback {b3f424ec-3d8f-417c-b244-3919d5e1a577} @@ -209,6 +425,30 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_rtmp + {48414740-c693-4968-9846-ee058020c64f} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_skinny + {cc1dd008-9406-448d-a0ad-33c3186cfadb} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_skypopen + {c6e78a4c-db1e-47f4-9b63-4dc27d86343f} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_sofia {0df3abd0-ddc0-4265-b778-07c66780979b} @@ -233,6 +473,14 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_event_multicast + {784113ef-44d9-4949-835d-7065d3c7ad08} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_event_socket {05515420-16de-4e63-be73-85be85ba5142} @@ -257,6 +505,14 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_png + {fbc7e2a4-b989-4289-ba7f-68f440e9ef8b} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_shout {38fe0559-9910-43a8-9e45-3e5004c27692} @@ -281,6 +537,30 @@ Binaries;Content;Satellites INSTALLFOLDER + + mod_lua + {7b077e7f-1be7-4291-ab86-55e527b25cac} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_managed + {7b42bda1-72c0-4378-a9b6-5c530f8cd61e} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + + + mod_v8 + {9b9d2551-d6bd-4f20-8be5-de30e154a064} + True + True + Binaries;Content;Satellites + INSTALLFOLDER + mod_console {1c453396-d912-4213-89fd-9b489162b7b5} @@ -424,36 +704,34 @@ "$(WixToolPath)\heat.exe" dir "$(SolutionDir)x64\$(Configuration)\sounds" -cg FreeSWITCHSoundFiles8 -gg -scom -sreg -sfrag -srd -dr SOUNDLOCATION -var var.FreeSWITCHSoundFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHSoundFiles8.wxs" "$(WixToolPath)\heat.exe" dir "$(SolutionDir)x64\$(Configuration)" -t $(ProjectDir)filter.xslt -cg FreeSWITCHBaseFiles -gg -scom -sreg -sfrag -srd -dr INSTALLLOCATION -var var.FreeSWITCHBaseDir -out "$(ProjectDir)Fragments\FreeSWITCHBaseFiles.wxs" - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + \ No newline at end of file