2009-05-26 Mike Kestner <mkestner@novell.com>

	* modules/mono-cairo-lib/mono-cairo-lib.wxs: a little rework of the
	directory naming for the installed libraries.
	* modules/mono-posix-lib/*: initial version of a Mono.Posix msm.

svn path=/trunk/win32-installers/; revision=134774

ChangeLog

@@ -1,3 +1,9 @@
+2009-05-26  Mike Kestner  <mkestner@novell.com>
+
+	* modules/mono-cairo-lib/mono-cairo-lib.wxs: a little rework of the
+	directory naming for the installed libraries.
+	* modules/mono-posix-lib/*: initial version of a Mono.Posix msm.
+
 2009-02-03  Mike Kestner  <mkestner@novell.com>
 
 	* modules/gtk+-2.0-lib/gtk+-2.0-lib.wxs: update custom action for

configure.ac

@@ -29,6 +29,7 @@ modules/gtk+-2.0-dev/Makefile
 modules/gtk+-2.0-lib/Makefile
 modules/mono-cairo-dev/Makefile
 modules/mono-cairo-lib/Makefile
+modules/mono-posix-lib/Makefile
 modules/poppler-lib/Makefile
 modules/vte-lib/Makefile
 modules/vte-sharp-dev/Makefile

modules/Makefile.am

@@ -6,6 +6,7 @@ SUBDIRS = \
 	gtk+-2.0-lib/ \
 	mono-cairo-dev/ \
 	mono-cairo-lib/ \
+	mono-posix-lib/ \
 	poppler-lib/ \
 	vte-lib/ \
 	vte-sharp-dev/ \

modules/mono-cairo-lib/mono-cairo-lib.wxs

@@ -7,7 +7,7 @@
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="MergeRedirectFolder">
-        <Directory Id="lib" Name="lib">
+        <Directory Id="lib1" Name="lib1">
           <!-- The following is not a real directory - it is created only for
 	       the purposes of GACing assemblies, and will never be created on
                a host system -->
@@ -31,7 +31,7 @@
           </Directory>
 
         </Directory>
-        <Directory Id="lib2" Name="lib2">
+        <Directory Id="lib" Name="lib">
           <Directory Id="GAC2">
             <!--<Directory Id="monocairo20" Name="Mono.Cairo">-->
               <Component Id="monocairo20_dll" Guid="310fffcc-8520-11dd-bea1-001a92982a42">

modules/mono-posix-lib/Makefile.am

@@ -0,0 +1,13 @@
+MODULE = mono-posix-lib
+CANDLE_FLAGS = 
+LIGHT_FLAGS = 
+
+noinst_DATA = $(MODULE).msm
+
+$(MODULE).msm: $(MODULE).wxs
+	candle $(CANDLE_FLAGS) $(MODULE).wxs
+	light $(LIGHT_FLAGS) $(MODULE).wixobj
+
+CLEANFILES = \
+	$(MODULES).wixobj \
+	$(MODULES).msm

modules/mono-posix-lib/mono-posix-lib.wxs

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+  <Module Id="mono_posix_lib" Language="1033" Version="1.0.5000.0">
+    <Package Id="66B46D3B-1B0F-4ce0-8D8B-C225AF3B2D36" Manufacturer="Mono Project"
+             InstallerVersion="200" />
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="MergeRedirectFolder">
+        <Directory Id="bin" Name="bin">
+          <Component Id="monoposixhelper_inst" Guid="367274e3-83ed-4f4b-800f-b44f054d67a0">
+            <File Id="monoposixhelperdll" Name="MonoPosixHelper.dll" Source="source/bin/MonoPosixHelper.dll" KeyPath="yes" Vital="yes" />
+          </Component>
+        </Directory>
+        <Directory Id="gac">
+	  <!-- not an explicit directory, Assembly=".net" GACs the assemblies -->
+          <Component Id="MonoPosix_gac" Guid="c7f75a65-89c6-4f0f-b9fc-db52fc2587b4">
+            <File Id="MonoPosixdll" Name="Mono.Posix.dll" Assembly=".net" KeyPath="yes" Source="source\lib\Mono.Posix.dll" Vital="yes" />
+          </Component>
+        </Directory>
+        <Directory Id="lib" Name="lib">
+          <Directory Id="MonoPosix" Name="Mono.Posix">
+	    <!-- Installs GACd assemblies to an addressable location - see http://blogs.msdn.com/astebner/archive/2007/06/21/3450539.aspx -->
+            <Component Id="instassembly" Guid="f846a63c-d97a-4b30-ab27-d2bd4ac1e8b3">
+              <File Id="MonoPosixdll_inst" Name="Mono.Posix.dll" Source="source\lib\Mono.Posix.dll" Vital="yes" />
+            </Component>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+  </Module>
+</Wix>