Skip to content
This repository has been archived by the owner on Oct 1, 2024. It is now read-only.

Gtk sharp 2 msi improvements #115

Open
wants to merge 5 commits into
base: gtk-sharp-2-12-branch
Choose a base branch
from
Open

Gtk sharp 2 msi improvements #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dea45ad
No need to rename glue-dlls. - already have the correct name
Sep 5, 2014
9fbbe68
Include gtk-sharp pdb file in msi installer
Sep 5, 2014
519cee3
Add binaries for msi installer to repo and amend WiX installer defini…
Sep 5, 2014
279649e
Adjust WiX install definition to include Mono.Cairo directly
Sep 6, 2014
e0ae5b2
Update binaries
Apr 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions msi/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
gtk-sharp-2.0.wxs

!source/bin/
!source/bin/MonoPosixHelper.dll
!source/lib/
!source/lib/2.0/Mono.Posix.dll
!source/lib/4.0/Mono.Posix.dll
6 changes: 0 additions & 6 deletions msi/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@ gtk-sharp-2.0.msi: gtk-sharp-2.0.wxs
cp $(top_builddir)/$$a/*.pdb binaries/$$a; \
cp $(top_builddir)/$$a/policy.*.config binaries/$$a; \
done
mv binaries/libatksharpglue-2.dll binaries/atksharpglue-2.dll
mv binaries/libgdksharpglue-2.dll binaries/gdksharpglue-2.dll
mv binaries/libgladesharpglue-2.dll binaries/gladesharpglue-2.dll
mv binaries/libglibsharpglue-2.dll binaries/glibsharpglue-2.dll
mv binaries/libgtksharpglue-2.dll binaries/gtksharpglue-2.dll
mv binaries/libpangosharpglue-2.dll binaries/pangosharpglue-2.dll

echo $(GTKSHARP_GUID) $(UPDATEINFO) > updateinfo
cp $(top_builddir)/sample/GtkDemo/GtkDemo.exe binaries
Expand Down
61 changes: 51 additions & 10 deletions msi/gtk-sharp-2.0.wxs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
</Component>
<Directory Id="INSTALLLOCATION" Name="2.12">
<Merge Id="unmanaged" Language="1033" SourceFile="unmanaged\unmanaged.msm" DiskId="1" />
<Merge Id="mono-cairo-lib" Language="1033" SourceFile="mono-cairo-lib.msm" DiskId="1" />
<Merge Id="mono-posix-lib" Language="1033" SourceFile="mono-posix-lib.msm" DiskId="1" />
<Directory Id="bin" Name="bin">
<Component Id="glibsharp_glue" Guid="9AFADFAB-0BD8-449e-B121-C9DB71EBECDC">
<File Id="glibsharpglue" Name="glibsharpglue-2.dll" Source="binaries/glibsharpglue-2.dll" KeyPath="yes" Vital="yes" />
Expand All @@ -43,6 +41,9 @@
<Component Id="gladesharp_glue" Guid="8D6464FB-CCD1-4f65-9756-554A61E46135">
<File Id="gladesharpglue" Name="gladesharpglue-2.dll" Source="binaries/gladesharpglue-2.dll" KeyPath="yes" Vital="yes" />
</Component>
<Component Id="monoposixhelper_inst" Guid="367274e3-83ed-4f4b-800f-b44f054d67a0">
<File Id="monoposixhelper" Name="MonoPosixHelper.dll" Source="source/bin/MonoPosixHelper.dll" KeyPath="yes" Vital="yes" />
</Component>
</Directory>
<Directory Id="lib" Name="lib">
<Directory Id="GAC">
Expand Down Expand Up @@ -174,6 +175,9 @@
</Component>
</Directory>
<Directory Id="gac_cairo" Name="cairo">
<Component Id="MonoCairo_dll" Guid="805c65fb-1df8-453e-ba05-2047d844bfb3">
<File Id="MonoCairodll" Name="Mono.Cairo.dll" Assembly=".net" KeyPath="yes" Source="binaries\cairo\Mono.Cairo.dll" Vital="yes" />
</Component>
<Component Id="Mono.Cairo_policy.1.0" Guid="fa3b6bae-ca3f-41b6-b90c-79ac895fd10f">
<File Id="policy.1.0.Mono.Cairo.dll" Name="policy.1.0.Mono.Cairo.dll" Assembly=".net" KeyPath="yes" Source="binaries/cairo/policy.1.0.Mono.Cairo.dll" Vital="no" />
<File Id="policy.1.0.Mono.Cairo.config" Name="policy.1.0.config" CompanionFile="policy.1.0.Mono.Cairo.dll" Source="binaries/cairo/policy.1.0.config" Vital="no" />
Expand Down Expand Up @@ -204,6 +208,16 @@
<File Id="policy.2.10.gladesharp.config" Name="policy.2.10.config" CompanionFile="policy.2.10.gladesharp.dll" Source="binaries/glade/policy.2.10.config" Vital="no" />
</Component>
</Directory>
<Directory Id="gac_posix2" Name="posix2">
<Component Id="MonoPosix_2_dll" Guid="c7f75a65-89c6-4f0f-b9fc-db52fc2587b4">
<File Id="MonoPosix2dll" Name="Mono.Posix.dll" Assembly=".net" KeyPath="yes" Source="source/lib/2.0/Mono.Posix.dll" Vital="yes" />
</Component>
</Directory>
<Directory Id="gac_posix4" Name="posix4">
<Component Id="MonoPosix_4_dll" Guid="0d5368c4-bba7-4d79-a5f9-0bc58e893978">
<File Id="MonoPosix4dll" Name="Mono.Posix.dll" Assembly=".net" KeyPath="yes" Source="source/lib/4.0/Mono.Posix.dll" Vital="yes" />
</Component>
</Directory>
</Directory>
<Directory Id="gtksharp20" Name="gtk-sharp-2.0">
<!-- Installs GACd assemblies to an addressable location - see http://blogs.msdn.com/astebner/archive/2007/06/21/3450539.aspx -->
Expand All @@ -214,12 +228,6 @@
<RegistryKey Root='HKLM' Key='SOFTWARE\Microsoft\.NetFramework\v4.0.30319\AssemblyFoldersEx\GtkSharp' Action="createAndRemoveOnUninstall">
<RegistryValue Type="string" Value="[INSTALLLOCATION]lib\gtk-sharp-2.0" />
</RegistryKey>
<RegistryKey Root='HKLM' Key='SOFTWARE\Microsoft\.NetFramework\v4.0.30319\AssemblyFoldersEx\MonoPosix' Action="createAndRemoveOnUninstall">
<RegistryValue Type="string" Value="[INSTALLLOCATION]lib\Mono.Posix" />
</RegistryKey>
<RegistryKey Root='HKLM' Key='SOFTWARE\Microsoft\.NetFramework\v4.0.30319\AssemblyFoldersEx\MonoCairo' Action="createAndRemoveOnUninstall">
<RegistryValue Type="string" Value="[INSTALLLOCATION]lib\Mono.Cairo" />
</RegistryKey>
<RegistryKey Root='HKLM' Key='SOFTWARE\Xamarin\GtkSharp\InstallFolder' Action="createAndRemoveOnUninstall">
<RegistryValue Type="string" Value="[INSTALLLOCATION]" />
</RegistryKey>
Expand All @@ -232,21 +240,48 @@
<File Id="gdksharpdll_inst" Name="gdk-sharp.dll" Source="binaries/gdk/gdk-sharp.dll" Vital="yes" />
<File Id="gdksharppdb" Name="gdk-sharp.pdb" Source="binaries/gdk/gdk-sharp.pdb" Vital="no" />
<File Id="gtksharpdll_inst" Name="gtk-sharp.dll" Source="binaries/gtk/gtk-sharp.dll" Vital="yes" />
<File Id="gtksharppdb" Name="gtk-sharp.pdb" Source="binaries/gtk/gtk-sharp.pdb" Vital="no" />
<File Id="gladesharpdll_inst" Name="glade-sharp.dll" Source="binaries/glade/glade-sharp.dll" Vital="yes" />
<File Id="gladesharppdb" Name="glade-sharp.pdb" Source="binaries/glade/glade-sharp.pdb" Vital="no" />
<File Id="gtkdotnetdll_inst" Name="gtk-dotnet.dll" Source="binaries/gtkdotnet/gtk-dotnet.dll" Vital="yes" />
<File Id="gtkdotnetpdb" Name="gtk-dotnet.pdb" Source="binaries/gtkdotnet/gtk-dotnet.pdb" Vital="no" />
</Component>
</Directory>
<Directory Id="MonoCairo" Name="Mono.Cairo">
<Component Id="monocairoinstassembly" Guid="e028bf1c-8d89-4b72-8111-946bba04e643">
<RegistryKey Root='HKLM' Key='SOFTWARE\Microsoft\.NetFramework\v4.0.30319\AssemblyFoldersEx\MonoCairo' Action="createAndRemoveOnUninstall">
<RegistryValue Type="string" Value="[INSTALLLOCATION]lib\Mono.Cairo" />
</RegistryKey>
<File Id="MonoCairodll_inst" Name="Mono.Cairo.dll" KeyPath="yes" Source="binaries/cairo/Mono.Cairo.dll" Vital="yes" />
<File Id="MonoCairopdb" Name="Mono.Cairo.pdb" Source="binaries/cairo/Mono.Cairo.pdb" Vital="no" />
</Component>
</Directory>
<Directory Id="MonoPosix" Name="Mono.Posix">
<Directory Id="MonoPosix2" Name="2.0">
<Component Id="monoposix2instassembly" Guid="f846a63c-d97a-4b30-ab27-d2bd4ac1e8b3">
<RegistryKey Root='HKLM' Key='SOFTWARE\Microsoft\.NetFramework\v2.0.50727\AssemblyFoldersEx\MonoPosix' Action="createAndRemoveOnUninstall">
<RegistryValue Type="string" Value="[INSTALLLOCATION]lib\Mono.Posix\2.0" />
</RegistryKey>
<File Id="MonoPosix2dll_inst" Name="Mono.Posix.dll" Source="source/lib/2.0/Mono.Posix.dll" Vital="yes" />
</Component>
</Directory>
<Directory Id="MonoPosix4" Name="4.0">
<Component Id="monoposix4instassembly" Guid="06fc48c7-b205-4b47-9129-2ce63def7b76">
<RegistryKey Root='HKLM' Key='SOFTWARE\Microsoft\.NetFramework\v4.0.30319\AssemblyFoldersEx\MonoPosix' Action="createAndRemoveOnUninstall">
<RegistryValue Type="string" Value="[INSTALLLOCATION]lib\Mono.Posix\4.0" />
</RegistryKey>
<File Id="MonoPosix4dll_inst" Name="Mono.Posix.dll" Source="source/lib/4.0/Mono.Posix.dll" Vital="yes" />
</Component>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
<Feature Id="Default" Title="Default" Level="1">
<MergeRef Id="unmanaged" />
<MergeRef Id="mono-cairo-lib" />
<MergeRef Id="mono-posix-lib" />
<ComponentRef Id="MonoCairo_dll" />
<ComponentRef Id="Mono.Cairo_policy.1.0" />
<ComponentRef Id="Mono.Cairo_policy.2.0" />
<ComponentRef Id="glibsharp_glue" />
Expand All @@ -255,6 +290,7 @@
<ComponentRef Id="gdksharp_glue" />
<ComponentRef Id="gtksharp_glue" />
<ComponentRef Id="gladesharp_glue" />
<ComponentRef Id="monoposixhelper_inst" />
<ComponentRef Id="glibsharp_dll" />
<ComponentRef Id="glibsharp_policy.2.4" />
<ComponentRef Id="glibsharp_policy.2.6" />
Expand Down Expand Up @@ -290,7 +326,12 @@
<ComponentRef Id="gtkdotnet_policy.2.6" />
<ComponentRef Id="gtkdotnet_policy.2.8" />
<ComponentRef Id="gtkdotnet_policy.2.10" />
<ComponentRef Id="MonoPosix_2_dll" />
<ComponentRef Id="MonoPosix_4_dll" />
<ComponentRef Id="gtksharpinstassembly" />
<ComponentRef Id="monocairoinstassembly" />
<ComponentRef Id="monoposix2instassembly" />
<ComponentRef Id="monoposix4instassembly" />
<ComponentRef Id="updateinfo" />
</Feature>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
Expand Down
Binary file added msi/source/bin/MonoPosixHelper.dll
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions msi/source/bin/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
MonoPosixHelper.dll has been taken from the bin/ folder of the mono-3.12.1 Windows binary release:
http://download.mono-project.com/archive/3.12.1/windows-installer/mono-3.12.1-gtksharp-2.12.26-win32-0.msi
The original file was named "libMonoPosixHelper.dll" and was just renamed to "MonoPosixHelper.dll".
Binary file added msi/source/lib/2.0/Mono.Posix.dll
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions msi/source/lib/2.0/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Mono.Posix.dll has been taken from the lib\mono\2.0 directory in the mono-3.12.1 Windows binary release:
http://download.mono-project.com/archive/3.12.1/windows-installer/mono-3.12.1-gtksharp-2.12.26-win32-0.msi

Although newer mono releases exist, this was the last release with properly strong named Mono.Posix DLLs.
Since the msi installer installs those DLLs into the GAC they need to be strong named.
Binary file added msi/source/lib/4.0/Mono.Posix.dll
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions msi/source/lib/4.0/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Mono.Posix.dll has been taken from the lib\mono\4.0 directory in the mono-3.12.1 Windows binary release:
http://download.mono-project.com/archive/3.12.1/windows-installer/mono-3.12.1-gtksharp-2.12.26-win32-0.msi

Although newer mono releases exist, this was the last release with properly strong named Mono.Posix DLLs.
Since the msi installer installs those DLLs into the GAC they need to be strong named.