[Freeswitch-trunk] [freeswitch-contrib] FreeSWITCH user-contributed scripts, etc branch master updated. java-esl-client-0.9.2-391-g75bbd88

[git at svn.freeswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FreeSWITCH user-contributed scripts, etc".

The branch, master has been updated
       via  75bbd885eb1eef0bcfea9b5371557823ca584522 (commit)
      from  274a7dd627ab98012ebf26c68c0ed5f440fa9033 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 75bbd885eb1eef0bcfea9b5371557823ca584522
Author: Jeff Lenk <jeff at jefflenk.com>
Date:   Wed Feb 2 14:10:08 2011 -0600

    try to fix the localization install fail again

diff --git a/mitchcapper/FSClient/Setup/FSCore.wxs b/mitchcapper/FSClient/Setup/FSCore.wxs
index b59f5f8..2e95778 100644
--- a/mitchcapper/FSClient/Setup/FSCore.wxs
+++ b/mitchcapper/FSClient/Setup/FSCore.wxs
@@ -18,7 +18,7 @@
           <Component Id="cmp3900B358BC2FB69DF2C42DDE35C5BBB2" Guid="*">
             <File Id="fil322A57E96A97A8179B75065ABF94F809" KeyPath="yes" Source="$(var.FSClient.TargetDir)\FreeSwitch.dll" />
             <CreateFolder Directory="INSTALLLOCATION">
-              <Permission User="Users" GenericAll="yes" />
+              <PermissionEx User="Users" GenericRead="yes" GenericWrite="yes" CreateFile="yes" xmlns="http://schemas.microsoft.com/wix/UtilExtension"/>
             </CreateFolder>
           </Component>
           <Component Id="cmp3CD83BDDE0C679AC83F36ABCCC44B85F" Guid="*">
diff --git a/mitchcapper/FSClient/Setup/Setup.wixproj b/mitchcapper/FSClient/Setup/Setup.wixproj
index 62c873c..7fea603 100644
--- a/mitchcapper/FSClient/Setup/Setup.wixproj
+++ b/mitchcapper/FSClient/Setup/Setup.wixproj
@@ -72,6 +72,10 @@
     </BootstrapperFile>
   </ItemGroup>
   <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
     <WixExtension Include="WixNetFxExtension">
       <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
       <Name>WixNetFxExtension</Name>

-----------------------------------------------------------------------

Summary of changes:
 mitchcapper/FSClient/Setup/FSCore.wxs    |    2 +-
 mitchcapper/FSClient/Setup/Setup.wixproj |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
FreeSWITCH user-contributed scripts, etc