Project "FreeSWITCH user-contributed scripts, etc" received a push.

branch: master updated

       via: 44e02296787e6776b62d528872eed216c8835fc6 (commit)
       via: c79712dc7b6516c7cf866566558bd90a8b3019f8 (commit)
       via: 3fda7b4ada645ac361dac8e55ac7cafe94ae7287 (commit)
       via: 3d9d46652b597fd6360129de9c986491a58c5610 (commit)
       via: 12801e42e4655416b73cb7a206c60e5c66d34e10 (commit)
       via: 0405d1fb7209050a0fa1cc0718c0aeee61191a95 (commit)
      from: 577fc9ba2ce176c24897eac5382d4c8239f204f0 (commit)
= COMMIT LOG =========================================================== 
committer: Mitch Capper
comments: 
merged setup changes

diff --cc mitchcapper/FSClient/Setup/Product.wxs
index 4cbf2a3,0ab94b7..bb93a12
--- a/mitchcapper/FSClient/Setup/Product.wxs
+++ b/mitchcapper/FSClient/Setup/Product.wxs
@@@ -11,10 -11,9 +11,10 @@@
  <?endif ?>
  
  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
 +	 xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
                xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 -	<Product Id="f20f4348-01f9-457f-9112-60edb77761f4" Name="$(var.ProductName)" Language="1033" Version="1.0.0.0" Manufacturer="FreeSWITCH" UpgradeCode="7668faef-2ab3-4079-a986-07a33739b42e">
 +	<Product Id="*" Name="$(var.ProductName)" Language="1033" Version="1.0.1.0" Manufacturer="FreeSWITCH" UpgradeCode="7668FAEF-2AB3-4079-A986-07A33739B42E">
- 		<Package InstallerVersion="200" Compressed="yes" />
+ 		<Package InstallerVersion="300" Compressed="yes" />
  
  		<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
  
@@@ -28,85 -27,64 +28,85 @@@
  				<Directory Id="INSTALLLOCATION" Name="FSClient">
  					<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
  					<!-- <Component Id="ProductComponent" Guid="594203af-235a-4a7d-aff8-045997f872ec"> -->
- 					<!-- TODO: Insert files, registry keys, and other resources here. -->
+ 						<!-- TODO: Insert files, registry keys, and other resources here. -->
  					<!-- </Component> -->
- 					<Directory Id="MODLOCATION" Name="Mod">
- 					</Directory>
- 					<Directory Id="CONFLOCATION" Name="Conf">
- 					</Directory>
- 					<Directory Id="PLUGINLOCATION" Name="Plugins">
- 					</Directory>
+           <Directory Id="MODLOCATION" Name="Mod">
+           </Directory>
+           <Directory Id="CONFLOCATION" Name="Conf">
+           </Directory>
+           <Directory Id="PLUGINLOCATION" Name="Plugins">
+           </Directory>
  				</Directory>
  			</Directory>
- 			<?if $(var.Platform) != x64 ?>
- 			<Merge Id="CrtFiles_x86"
- 			SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm"
- 			DiskId="1"
- 			Language="1033"/>
- 			<?endif ?>
- 			<?if $(var.Platform) = x64 ?>
- 			<Merge Id="CrtFiles_x64"
- 			SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x64.msm"
- 			DiskId="1"
- 			Language="1033"/>
- 			<?endif ?>
- 			<Directory Id="ProgramMenuFolder">
- 				<Directory Id="ApplicationProgramsFolder" Name="FSClient"/>
- 			</Directory>
+       <?if $(var.Platform) != x64 ?>
+       <Merge Id="CrtFiles_x86"
+       SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm"
+       DiskId="1"
+       Language="1033"/>
+       <?endif ?>
+       <?if $(var.Platform) = x64 ?>
+       <Merge Id="CrtFiles_x64"
+       SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x64.msm"
+       DiskId="1"
+       Language="1033"/>
+       <?endif ?>
+       <Directory Id="ProgramMenuFolder">
+         <Directory Id="ApplicationProgramsFolder" Name="FSClient"/>
+       </Directory>
  		</Directory>
  
- 		<DirectoryRef Id="ApplicationProgramsFolder">
- 			<Component Id="ApplicationShortcut" Guid="20BC8446-684B-44F5-A1E3-AF6010EAF37C">
- 				<Shortcut Id="ApplicationStartMenuShortcut"
- 									 Name="FSClient"
- 									 Description="FreeSWITCH Windows Phone"
- 									 Target="[INSTALLLOCATION]FSClient.exe"
- 									 WorkingDirectory="INSTALLLOCATION"/>
+     <DirectoryRef Id="ApplicationProgramsFolder">
+       <Component Id="ApplicationShortcut" Guid="20BC8446-684B-44F5-A1E3-AF6010EAF37C">
+         <Shortcut Id="ApplicationStartMenuShortcut"
+ 							 Name="FSClient"
+ 							 Description="FreeSWITCH Windows Phone"
+ 							 Target="[INSTALLLOCATION]FSClient.exe"
+ 							 WorkingDirectory="INSTALLLOCATION"/>
 +				<util:InternetShortcut Id="OnlineDocumentationShortcut"
 +									Name="Online Documentation"
 +									Target="http://wiki.freeswitch.com/wiki/FSClient"/>
 +				<Shortcut Id="UninstallProduct"
 +									  Name="Uninstall FSClient"
 +									  Target="[SystemFolder]msiexec.exe"
 +									  Arguments="/x [ProductCode]"
 +									  Description="Uninstalls FSClient" />
 +
- 				<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
- 				<RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FSClient" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
- 			</Component>
- 		</DirectoryRef>
+         <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
+         <RegistryValue Root="HKCU" Key="Software\FreeSWITCH\FSClient" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+       </Component>
+     </DirectoryRef>
  
  		<Feature Id="ProductFeature" Title="FSClient Core" Level="1">
  			<!-- TODO: Remove the comments around this ComponentRef element and the Component above in order to add resources to this installer. -->
- 			<!-- <ComponentRef Id="ProductComponent" /> -->
- 			<ComponentGroupRef Id="FSCoreComp"/>
- 			<ComponentGroupRef Id="FSCoreModComp"/>
- 			<ComponentRef Id="FSCoreConfComp"/>
- 			<ComponentGroupRef Id="FSClientComp"/>
- 			<ComponentRef Id="ApplicationShortcut" />
- 
+       <!-- <ComponentRef Id="ProductComponent" /> -->
+       <ComponentGroupRef Id="FSCoreComp"/>
+       <ComponentGroupRef Id="FSCoreModComp"/>
+       <ComponentRef Id="FSCoreConfComp"/>
+       <ComponentGroupRef Id="FSClientComp"/>
+       <ComponentRef Id="ApplicationShortcut" />
+ 			
  			<!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->
  			<ComponentGroupRef Id="Product.Generated" />
- 			<?if $(var.Platform) != x64 ?>
- 			<MergeRef Id="CrtFiles_x86"/>
- 			<?endif ?>
- 			<?if $(var.Platform) = x64 ?>
- 			<MergeRef Id="CrtFiles_x64"/>
- 			<?endif ?>
+       <?if $(var.Platform) != x64 ?>
+       <MergeRef Id="CrtFiles_x86"/>
+       <?endif ?>
+       <?if $(var.Platform) = x64 ?>
+       <MergeRef Id="CrtFiles_x64"/>
+       <?endif ?>
  		</Feature>
- 		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
- 		<UIRef Id="WixUI_InstallDir" />
+     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
+     <UIRef Id="WixUI_InstallDir" />
 +		<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch FSClient" />
 +		<Property Id="WixShellExecTarget" Value="[INSTALLLOCATION]FSClient.exe" />
 +		<CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
 +		<UI>
 +			<Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
 +		</UI>
 +		<WixVariable Id="WixUIBannerBmp" Value="Banner.bmp" />
 +		<WixVariable Id="WixUIDialogBmp" Value="Dialog.bmp" />
 +		<Icon Id="icon.ico" SourceFile="../phone.ico"/>
 +		<Property Id="ARPPRODUCTICON" Value="icon.ico" />
 +		<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." AllowSameVersionUpgrades="yes"  />
 +
- 		</Product>
+ 	</Product>
  </Wix>

committer: Raymond Chandler
comments: 
test

diff --git a/file.txt b/file.txt
index a6d581e..41f89d6 100644
--- a/file.txt
+++ b/file.txt
@@ -1,3 +1,4 @@
 blaaaaaah
 blaaaaaah
 blaaaaaah
+blaaaaaah

committer: Raymond Chandler
comments: 
Merge branch 'master' of git.freeswitch.org:freeswitch-contrib

committer: Raymond Chandler
comments: 
test

diff --git a/file.txt b/file.txt
index 56ec127..a6d581e 100644
--- a/file.txt
+++ b/file.txt
@@ -1,2 +1,3 @@
 blaaaaaah
 blaaaaaah
+blaaaaaah

committer: Raymond Chandler
comments: 
test

diff --git a/file.txt b/file.txt
new file mode 100644
index 0000000..56ec127
--- /dev/null
+++ b/file.txt
@@ -0,0 +1,2 @@
+blaaaaaah
+blaaaaaah

committer: Jeff Lenk
comments: 
change version of installer required

diff --git a/mitchcapper/FSClient/Setup/Product.wxs b/mitchcapper/FSClient/Setup/Product.wxs
index 073c9f0..0ab94b7 100644
--- a/mitchcapper/FSClient/Setup/Product.wxs
+++ b/mitchcapper/FSClient/Setup/Product.wxs
@@ -13,7 +13,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
               xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 	<Product Id="f20f4348-01f9-457f-9112-60edb77761f4" Name="$(var.ProductName)" Language="1033" Version="1.0.0.0" Manufacturer="FreeSWITCH" UpgradeCode="7668faef-2ab3-4079-a986-07a33739b42e">
-		<Package InstallerVersion="200" Compressed="yes" />
+		<Package InstallerVersion="300" Compressed="yes" />
 
 		<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
========================================================================

Summary of changes:
 file.txt                               |    4 +
 mitchcapper/FSClient/Setup/Product.wxs |  110 ++++++++++++++++----------------
 2 files changed, 59 insertions(+), 55 deletions(-)
 create mode 100644 file.txt

this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email
For more info, see http://blog.chomperstomp.com/?p=630 --
FreeSWITCH user-contributed scripts, etc