2008-10-13 Brad Taylor <brad@getcoded.net>

* Makefile.am:
	* configure.in.in:
	* gtk-sharp-2.0-lib.wxs.in:
	* gtk-sharp-2.0-dev.wxs.in: Replace version numbers in wxs files,
	  import gtk-sharp-2.0-dev.wxs.


svn path=/trunk/gtk-sharp/; revision=115669
This commit is contained in:
Brad Taylor 2008-10-13 16:36:33 +00:00
commit 1f4a79a925
5 changed files with 127 additions and 1 deletions

View file

@ -1,3 +1,11 @@
2008-10-13 Brad Taylor <brad@getcoded.net>
* Makefile.am:
* configure.in.in:
* gtk-sharp-2.0-lib.wxs.in:
* gtk-sharp-2.0-dev.wxs.in: Replace version numbers in wxs files,
import gtk-sharp-2.0-dev.wxs.
2008-10-13 Mike Kestner <mkestner@novell.com> 2008-10-13 Mike Kestner <mkestner@novell.com>
* Makefile.am: installer target * Makefile.am: installer target

View file

@ -17,3 +17,5 @@ configure.in: bootstrap.status configure.in.in
win32-installer: all win32-installer: all
candle.exe gtk-sharp-2.0-lib.wxs candle.exe gtk-sharp-2.0-lib.wxs
light.exe gtk-sharp-2.0-lib.wixobj light.exe gtk-sharp-2.0-lib.wixobj
candle.exe gtk-sharp-2.0-dev.wxs
light.exe gtk-sharp-2.0-dev.wixobj

View file

@ -215,6 +215,8 @@ AC_OUTPUT([
AssemblyInfo.cs AssemblyInfo.cs
Makefile Makefile
policy.config policy.config
gtk-sharp-2.0-lib.wxs
gtk-sharp-2.0-dev.wxs
sources/Makefile sources/Makefile
parser/Makefile parser/Makefile
parser/gapi-2.0.pc parser/gapi-2.0.pc

114
gtk-sharp-2.0-dev.wxs.in Normal file
View file

@ -0,0 +1,114 @@
<?xml version="1.0" ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="gtk__2_0_dev" Language="1033" Version="@VERSION@">
<Package Id="4667c06a-0a48-11dd-9af8-001a6bce76fb" InstallerVersion="200" Manufacturer="Mono Project"/>
<!-- Detect Visual Studio 2003/2008 -->
<Property Id="VS2003INSTALLED">
<RegistrySearch Id="VS2008RegistrySearch" Root="HKLM" Type="raw"
Key="SOFTWARE\Microsoft\VisualStudio\7.1\Projects\{FAE04EC0-301F-11d3-BF4B-00C04F79EFBC}"
Name="ProjectTemplatesDir" />
</Property>
<Property Id="VS2008INSTALLED">
<RegistrySearch Id="VS2003RegistrySearch" Root="HKLM" Type="raw"
Key="SOFTWARE\Microsoft\VisualStudio\SxS\VS7\8.0" />
</Property>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="MergeRedirectFolder">
<!-- Install Assembly references into Visual Studio 2003 -->
<Component Id="vs2003_references" Guid="c0ac0c22-0a53-11dd-9af8-001a6bce76fb">
<!-- If the condition is true, install component -->
<!-- Install if Visual Studio 2003 is installed -->
<!-- (Un)install if already installed
(catches the case where Visual Studio was uninstalled first) -->
<Condition><![CDATA[VS2003INSTALLED <> "" OR Installed]]></Condition>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\VisualStudio\7.1\AssemblyFolders\atk-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\atk" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\VisualStudio\7.1\AssemblyFolders\gdk-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\gdk" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\VisualStudio\7.1\AssemblyFolders\glade-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\glade" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\VisualStudio\7.1\AssemblyFolders\glib-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\glib" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\VisualStudio\7.1\AssemblyFolders\gtk-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\gtk" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\VisualStudio\7.1\AssemblyFolders\gtk-dotnet">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\gtk-dotnet" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\VisualStudio\7.1\AssemblyFolders\pango-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\pango" />
</RegistryKey>
</Component>
<!-- Install Assembly references into Visual Studio 2008 -->
<Component Id="vs2008_references" Guid="287a7bec-0a5c-11dd-9af8-001a6bce76fb">
<!-- If the condition is true, install component -->
<!-- Install if Visual Studio 2008 is installed -->
<!-- (Un)install if already installed
(catches the case where Visual Studio was uninstalled first) -->
<Condition><![CDATA[VS2008INSTALLED <> "" OR Installed]]></Condition>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\atk-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\atk" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\gdk-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\gdk" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\glade-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\glade" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\glib-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\glib" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\gtk-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\gtk" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\gtk-dotnet">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\gtk-dotnet" />
</RegistryKey>
<RegistryKey Root="HKLM" Action="createAndRemoveOnUninstall"
Key="SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\pango-sharp">
<RegistryValue Type="string" Value="[MergeRedirectFolder]lib\gtk-sharp-2.0\pango" />
</RegistryKey>
</Component>
</Directory>
</Directory>
</Module>
</Wix>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Module Id="gtk_sharp_2_0_lib" Language="1033" Version="2.10.4"> <Module Id="gtk_sharp_2_0_lib" Language="1033" Version="@VERSION@">
<Package Id="73de9db7-8bfc-4419-8eae-c9aedbfc7e3a" Manufacturer="Mono Project" <Package Id="73de9db7-8bfc-4419-8eae-c9aedbfc7e3a" Manufacturer="Mono Project"
InstallerVersion="200"/> InstallerVersion="200"/>