GNOME.org
 

[gtkmm] Add missing files to installer, warn about paths containing space characters

commit 2f9d3a3d3e1c3fd9ef820e676dbeaf76add2085a
Author: Armin Burgmeier <armin arbur net>
Date:   Wed Dec 16 23:37:36 2009 +0100

    Add missing files to installer, warn about paths containing space characters
    
    2009-12-16  Armin Burgmeier  <armin arbur net>
    
    	* win32_installer/translations/english.nsh:
    	* win32_installer/translations/french.nsh:
    	* win32_installer/translations/simpchinese.nsh: Added a new string
    	recommending to choose a path not containing spaces for pkg-config to
    	work.
    
    	* win32_installer/gtkmm-installer.nsi.in: Show that string on the
    	installation directory page. Also remove libxml2 and libgail-util
    	documentation shortcuts from start menu on uninstall, and added
    	pangommconfig.h and fontconfig.pc to the installer.

 ChangeLog                                    |   13 +++++++++
 win32_installer/gtkmm-installer.nsi.in       |   38 ++++++++++++++++---------
 win32_installer/translations/english.nsh     |    3 ++
 win32_installer/translations/french.nsh      |    4 +++
 win32_installer/translations/simpchinese.nsh |    4 +++
 5 files changed, 48 insertions(+), 14 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2dfdbeb..394f9c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-16  Armin Burgmeier  <armin arbur net>
+
+	* win32_installer/translations/english.nsh:
+	* win32_installer/translations/french.nsh:
+	* win32_installer/translations/simpchinese.nsh: Added a new string
+	recommending to choose a path not containing spaces for pkg-config to
+	work.
+
+	* win32_installer/gtkmm-installer.nsi.in: Show that string on the
+	installation directory page. Also remove libxml2 and libgail-util
+	documentation shortcuts from start menu on uninstall, and added
+	pangommconfig.h and fontconfig.pc to the installer.
+
 2009-12-10  Krzesimir Nowak  <qdlacz gmail com>
 
 	* gdk/src/window.hg: Remove extra colons at offscreen methods
diff --git a/win32_installer/gtkmm-installer.nsi.in b/win32_installer/gtkmm-installer.nsi.in
index 51e51b7..84540a1 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
@@ -141,6 +141,7 @@ Var USE_GTKDIR
 !insertmacro MUI_PAGE_LICENSE "lgpl.txt"
 Page custom CustomPageSetContext
 !define MUI_PAGE_CUSTOMFUNCTION_PRE CustomSetTargetDirectory
+!define MUI_DIRECTORYPAGE_TEXT_TOP  "$(GTKMM_DIRECTORYPAGE_HINT)"
 !insertmacro MUI_PAGE_DIRECTORY
 Page custom CustomPagePathQuestion
 !ifndef RUNTIME_ONLY
@@ -178,7 +179,10 @@ Page custom CustomPagePathQuestion
 
 Name "${PRODUCT_FULLNAME} ${PRODUCT_VERSION}"
 OutFile "${INSTALLER_NAME}"
-InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
+;InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
+; Use a default path which has no spaces in it, pkg-config fails otherwise.
+; see http://lists.freedesktop.org/archives/pkg-config/2007-September/000224.html
+InstallDir "C:\${PRODUCT_NAME}"
 ; Get installation folder from registry if available
 InstallDirRegKey HKLM Software\${PRODUCT_NAME}\${PRODUCT_API_VERSION} "Path"
 
@@ -257,10 +261,10 @@ Section "Runtime" SecGTKRuntime
   ; TODO: Add others... libiconv, fontconfig, libxml2, tiff... however note
   ; that some contain devel-only things.
   SetOutPath $INSTDIR\share\doc
-  File /r share\doc\glib-2.22.2
+  File /r share\doc\glib-2.22.3
   File /r share\doc\cairo_1.8.8-3_win32
-  File /r share\doc\pango-1.26.0
-  File /r share\doc\gtk+-2.18.3
+  File /r share\doc\pango-1.26.1
+  File /r share\doc\gtk+-2.18.5
 
   SetOutPath $INSTDIR\share
   File /r share\locale
@@ -445,6 +449,7 @@ Section "Development" SecGTKDevelopment
   File lib\pkgconfig\libpng.pc
   File lib\pkgconfig\libpng12.pc
   File lib\pkgconfig\freetype2.pc
+  File lib\pkgconfig\fontconfig.pc
   File lib\pkgconfig\glib-2.0.pc
   File lib\pkgconfig\gmodule-2.0.pc
   File lib\pkgconfig\gmodule-no-export-2.0.pc
@@ -472,9 +477,9 @@ Section "Development" SecGTKDevelopment
   File lib\pkgconfig\gail.pc
 
   SetOutPath $INSTDIR\share\doc
-  File /r share\doc\glib-dev-2.22.2
-  File /r share\doc\pango-dev-1.26.0
-  File /r share\doc\gtk+-dev-2.18.3
+  File /r share\doc\glib-dev-2.22.3
+  File /r share\doc\pango-dev-1.26.1
+  File /r share\doc\gtk+-dev-2.18.5
 
   SetOutPath $INSTDIR\share\xml
   File /r share\xml\libglade
@@ -752,6 +757,7 @@ Section "Development" SecPangommDevelopment
 
   SetOutPath $INSTDIR\lib
   File lib\libpangomm-1.4.dll.a
+  File /r lib\pangomm-1.4
   
   File MSVC\pangomm-vc80-1_4.lib
   File MSVC\pangomm-vc90-1_4.lib
@@ -1240,6 +1246,7 @@ continue:
   Delete "$SMPROGRAMS\$ICONS_GROUP\Read Me.lnk"
 
 !ifndef RUNTIME_ONLY
+  Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation\libxml2 Reference Manual.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation\glib Reference Manual.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation\gobject Reference Manual.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation\cairo Reference Manual.lnk"
@@ -1248,6 +1255,7 @@ continue:
   Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation\gdk-pixbuf Reference Manual.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation\GTK+ Reference Manual.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation\libglade Reference Manual.lnk"
+  Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation\libgail-util Reference Manual.lnk"
 
   Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation\libsigc++ Reference Manual.lnk"
   Delete "$SMPROGRAMS\$ICONS_GROUP\Documentation\glibmm Reference Manual.lnk"
@@ -1409,6 +1417,7 @@ continue:
   RMDir /r $INSTDIR\lib\sigc++-2.0
   RMDir /r $INSTDIR\lib\glibmm-2.4
   RMDir /r $INSTDIR\lib\giomm-2.4
+  RMDir /r $INSTDIR\lib\pangomm-1.4
   RMDir /r $INSTDIR\lib\gdkmm-2.4
   RMDir /r $INSTDIR\lib\gtkmm-2.4
   RMDir /r $INSTDIR\lib\libglademm-2.4
@@ -1510,6 +1519,7 @@ continue:
   Delete $INSTDIR\lib\pkgconfig\libpng.pc
   Delete $INSTDIR\lib\pkgconfig\libpng12.pc
   Delete $INSTDIR\lib\pkgconfig\freetype2.pc
+  Delete $INSTDIR\lib\pkgconfig\fontconfig.pc
   Delete $INSTDIR\lib\pkgconfig\glib-2.0.pc
   Delete $INSTDIR\lib\pkgconfig\gmodule-2.0.pc
   Delete $INSTDIR\lib\pkgconfig\gmodule-no-export-2.0.pc
@@ -1552,9 +1562,9 @@ continue:
 
   RMDir /r $INSTDIR\share\doc\libiconv
 
-  RMDir /r $INSTDIR\share\doc\glib-dev-2.22.2
-  RMDir /r $INSTDIR\share\doc\pango-dev-1.26.0
-  RMDir /r $INSTDIR\share\doc\gtk+-dev-2.18.3
+  RMDir /r $INSTDIR\share\doc\glib-dev-2.22.3
+  RMDir /r $INSTDIR\share\doc\pango-dev-1.26.1
+  RMDir /r $INSTDIR\share\doc\gtk+-dev-2.18.5
 
   RMDir /r $INSTDIR\share\xml\libglade
   RMDir $INSTDIR\share\xml
@@ -1722,10 +1732,10 @@ continue:
   RMDir $INSTDIR\bin
   
   ; share (non-development files)
-  RMDir /r $INSTDIR\share\doc\glib-2.22.2
+  RMDir /r $INSTDIR\share\doc\glib-2.22.3
   RMDir /r $INSTDIR\share\doc\cairo_1.8.8-3_win32
-  RMDir /r $INSTDIR\share\doc\pango-1.26.0
-  RMDir /r $INSTDIR\share\doc\gtk+-2.18.3
+  RMDir /r $INSTDIR\share\doc\pango-1.26.1
+  RMDir /r $INSTDIR\share\doc\gtk+-2.18.5
   RMDir $INSTDIR\share\doc
 
   RMdir /r $INSTDIR\share\locale
diff --git a/win32_installer/translations/english.nsh b/win32_installer/translations/english.nsh
index e88f079..bd1b8d0 100644
--- a/win32_installer/translations/english.nsh
+++ b/win32_installer/translations/english.nsh
@@ -27,6 +27,9 @@ LangString GTKMM_ADD_PATH               ${LANG_ENGLISH} \
 LangString GTKMM_NEWER                  ${LANG_ENGLISH} \
 "${PRODUCT_NAME} ($R1) is already installed on your system, and is newer than this distribution (${PRODUCT_VERSION}-${PRODUCT_VERSION_INSTALLER})."
 
+LangString GTKMM_DIRECTORYPAGE_HINT     ${LANG_ENGLISH} \
+"Setup will install ${PRODUCT_FULLNAME} ${PRODUCT_VERSION} in the following folder. To install in a different folder, click Browse and select another folder. Click Next to continue.$\r$\n$\r$\nIf you intend to use MinGW, then it is not recommended to use a path that has space characters in it because this will break pkg-config."
+
 LangString GTKMM_RIGHTS_INSTALL               ${LANG_ENGLISH} \
 "Install for"
 LangString GTKMM_RIGHTS_ANYONE               ${LANG_ENGLISH} \
diff --git a/win32_installer/translations/french.nsh b/win32_installer/translations/french.nsh
index 1d88cb4..3056107 100644
--- a/win32_installer/translations/french.nsh
+++ b/win32_installer/translations/french.nsh
@@ -28,6 +28,10 @@ LangString GTKMM_NEWER                  ${LANG_FRENCH} \
 LangString GTKMM_ADD_PATH               ${LANG_FRENCH} \
 "Ajouter le repertoire racine de gtkmm à la variable PATH"
 
+;; TODO: This needs to be translated!
+LangString GTKMM_DIRECTORYPAGE_HINT     ${LANG_FRENCH} \
+"Setup will install ${PRODUCT_FULLNAME} ${PRODUCT_VERSION} in the following folder. To install in a different folder, click Browse and select another folder. Click Next to continue.$\r$\n$\r$\nIf you intend to use MinGW, then it is not recommended to use a path that has space characters in it because this will break pkg-config."
+
 LangString GTKMM_RIGHTS_INSTALL         ${LANG_FRENCH} \
 "Installer pour"
 LangString GTKMM_RIGHTS_ANYONE          ${LANG_FRENCH} \
diff --git a/win32_installer/translations/simpchinese.nsh b/win32_installer/translations/simpchinese.nsh
index fdabdbf..cec1e0c 100644
--- a/win32_installer/translations/simpchinese.nsh
+++ b/win32_installer/translations/simpchinese.nsh
@@ -25,6 +25,10 @@ LangString GTKMM_ADD_PATH               ${LANG_SIMPCHINESE} \
 LangString GTKMM_NEWER                  ${LANG_SIMPCHINESE} \
 "${PRODUCT_NAME} ($R1) ÒѾ­ÔÚÄúµÄϵͳÉÏ°²×°ÁË£¬²¢ÇÒÐÂÓÚ±¾·¢²¼°æ±¾(${PRODUCT_VERSION}-${PRODUCT_VERSION_INSTALLER})."
 
+;; TODO: This needs to be translated!
+LangString GTKMM_DIRECTORYPAGE_HINT     ${LANG_SIMPCHINESE} \
+"Setup will install ${PRODUCT_FULLNAME} ${PRODUCT_VERSION} in the following folder. To install in a different folder, click Browse and select another folder. Click Next to continue.$\r$\n$\r$\nIf you intend to use MinGW, then it is not recommended to use a path that has space characters in it because this will break pkg-config."
+
 LangString GTKMM_RIGHTS_INSTALL               ${LANG_SIMPCHINESE} \
 "°²×°ÓÚ"
 LangString GTKMM_RIGHTS_ANYONE               ${LANG_SIMPCHINESE} \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]