[gtkmm/gtkmm-2-22] Add missing files to the installer

[Armin Burgmeier <arminb src gnome org>]

commit f611b09c4d33e09a816e6e32653d7520b3f4fd5c
Author: Armin Burgmeier <armin arbur net>
Date:   Tue Nov 9 23:56:00 2010 +0100

    Add missing files to the installer
    
    2010-11-09  Armin Burgmeier  <armin arbur net>
    
    	* win32_installer/build-installer.sh: Make sure libintl-8.dll gets
    	cleaned up correctly on uninstall.
    
    	* win32_installer/gtkmm-installer.nsi.in: Add the lib\cairomm-1.0
    	directory to the installed files.

 ChangeLog                              |    8 ++++++++
 win32_installer/build-installer.sh     |    2 +-
 win32_installer/gtkmm-installer.nsi.in |    4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f43ea74..b15a7a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-09  Armin Burgmeier  <armin arbur net>
+
+	* win32_installer/build-installer.sh: Make sure libintl-8.dll gets
+	cleaned up correctly on uninstall.
+
+	* win32_installer/gtkmm-installer.nsi.in: Add the lib\cairomm-1.0
+	directory to the installed files.
+
 2010-11-05  José Alburquerque  <jaalburqu svn gnome org>
 
 	Style: Fix the clone_vfunc() implementation.
diff --git a/win32_installer/build-installer.sh b/win32_installer/build-installer.sh
index 869032d..9b2f702 100644
--- a/win32_installer/build-installer.sh
+++ b/win32_installer/build-installer.sh
@@ -142,7 +142,7 @@ echo "Creating installer..."
 
 # Prepare installer script for 64 bit
 if test $platform = 'win64'; then
-	perl -pe 's/PRODUCT_PLATFORM_NAME "gtkmm"/PRODUCT_PLATFORM_NAME "gtkmm64"/; s/PRODUCT_FULLNAME "gtkmm Development Environment"/PRODUCT_FULLNAME "gtkmm Development Environment (x64)"/; s/PRODUCT_FULLNAME "gtkmm Runtime Environment"/PRODUCT_FULLNAME "gtkmm Runtime Environment (x64)"/; s/win32-runtime/win64-runtime/; s/win32-devel/win64-devel/; s/MUI_STARTMENUPAGE_DEFAULTFOLDER "Gtkmm"/MUI_STARTMENUPAGE "Gtkmm (x64)"/; s/PRODUCT_SMNAME "Gtkmm"/PRODUCT_SMNAME "Gtkmm (x64)"/; s/\$ICONS_GROUP "Gtkmm"/\$ICONS_GROUP "Gtkmm (x64)"/; s/\$PROGRAMFILES/\$PROGRAMFILES64/; s/GTKMM_BASEPATH/GTKMM64_BASEPATH/g; s/bin\\intl.dll/bin\\libintl-8.dll/; s/freetype6.dll/libfreetype-6.dll/; s/gspawn-win32-helper.exe/gspawn-win64-helper.exe/; s/gspawn-win32-helper-console.exe/gspawn-win64-helper-console.exe/; s/cairo_1.10.0-1_win32/cairo_1.10.0-1_win64/' gtkmm-installer.nsi > gtkmm-installer.nsi.run || exit 1
+	perl -pe 's/PRODUCT_PLATFORM_NAME "gtkmm"/PRODUCT_PLATFORM_NAME "gtkmm64"/; s/PRODUCT_FULLNAME "gtkmm Development Environment"/PRODUCT_FULLNAME "gtkmm Development Environment (x64)"/; s/PRODUCT_FULLNAME "gtkmm Runtime Environment"/PRODUCT_FULLNAME "gtkmm Runtime Environment (x64)"/; s/win32-runtime/win64-runtime/; s/win32-devel/win64-devel/; s/MUI_STARTMENUPAGE_DEFAULTFOLDER "Gtkmm"/MUI_STARTMENUPAGE "Gtkmm (x64)"/; s/PRODUCT_SMNAME "Gtkmm"/PRODUCT_SMNAME "Gtkmm (x64)"/; s/\$ICONS_GROUP "Gtkmm"/\$ICONS_GROUP "Gtkmm (x64)"/; s/\$PROGRAMFILES/\$PROGRAMFILES64/; s/GTKMM_BASEPATH/GTKMM64_BASEPATH/g; s/intl.dll$/libintl-8.dll/; s/freetype6.dll/libfreetype-6.dll/; s/gspawn-win32-helper.exe/gspawn-win64-helper.exe/; s/gspawn-win32-helper-console.exe/gspawn-win64-helper-console.exe/; s/cairo_1.10.0-1_win32/cairo_1.10.0-1_win64/' gtkmm-installer.nsi > gtkmm-installer.nsi.run || exit 1
 else
 	cp gtkmm-installer.nsi gtkmm-installer.nsi.run
 fi
diff --git a/win32_installer/gtkmm-installer.nsi.in b/win32_installer/gtkmm-installer.nsi.in
index 2a5177c..4329cce 100644
--- a/win32_installer/gtkmm-installer.nsi.in
+++ b/win32_installer/gtkmm-installer.nsi.in
@@ -34,7 +34,7 @@
 !define PRODUCT_VERSION_MICRO "@GTKMM_MICRO_VERSION@"
 !endif
 !ifndef PRODUCT_VERSION_INSTALLER
-!define PRODUCT_VERSION_INSTALLER "1"
+!define PRODUCT_VERSION_INSTALLER "2"
 !endif
 
 !ifdef PRODUCT_API_VERSION
@@ -630,6 +630,7 @@ Section "Development" SecCairommDevelopment
   File /r include\cairomm-1.0
 
   SetOutPath $INSTDIR\lib
+  File /r lib\cairomm-1.0
   File lib\libcairomm-1.0.dll.a
   File MSVC\cairomm-vc80-1_0.lib
   File MSVC\cairomm-vc90-1_0.lib
@@ -1488,6 +1489,7 @@ continue:
   RMDir $INSTDIR\lib\glib-2.0
 
   RMDir /r $INSTDIR\lib\sigc++-2.0
+  RMDir /r $INSTDIR\lib\cairomm-1.0
   RMDir /r $INSTDIR\lib\glibmm-2.4
   RMDir /r $INSTDIR\lib\giomm-2.4
   RMDir /r $INSTDIR\lib\atkmm-1.6