[gnumeric] win32: installer improvements.

[Morten Welinder <mortenw src gnome org>]

commit 313c6080a6c30d45dad31a7271ce4eea08f51a99
Author: Morten Welinder <terra gnome org>
Date:   Wed Oct 9 14:13:05 2013 -0400

    win32: installer improvements.
    
    1. Install more locale; ignore missing goffice translations.
    
    2. Handle "share" better.  nsis' "file /r" copy is _weird_.

 tools/win32/gnumeric.nsi.in |   47 ++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/tools/win32/gnumeric.nsi.in b/tools/win32/gnumeric.nsi.in
index 6aedcaa..4aa2654 100644
--- a/tools/win32/gnumeric.nsi.in
+++ b/tools/win32/gnumeric.nsi.in
@@ -76,6 +76,11 @@ ShowUnInstDetails    show
 
 !define GNM_ROOT       "$INSTDIR\${GNM_VERSION}"
 
+!macro CopyDir THEDIR
+    SetOutPath "${GNM_ROOT}\${THEDIR}"
+    File /r "${THEDIR}\*"
+!macroend
+
 Section "Gnumeric (required)" SEC01
     SectionIn 1 2 3 RO
 
@@ -86,7 +91,7 @@ Section "Gnumeric (required)" SEC01
     File "bin\ssgrep.exe"
     File "bin\ssdiff.exe"
     File "bin\gsf.exe"
-    File "bin\gsf-vba-dump.exe"
+    ;File "bin\gsf-vba-dump.exe"
     File "bin\gtk-update-icon-cache.exe"
     File "bin\gdk-pixbuf-query-loaders.exe"
     File "bin\pango-querymodules.exe"
@@ -95,20 +100,16 @@ Section "Gnumeric (required)" SEC01
     File "bin\gspawn-win32-helper-console.exe"
     File "bin\gspawn-win32-helper.exe"
 
-    SetOutPath "${GNM_ROOT}"
-    File /r etc
-    File /r /x "*.a" /x "*.la" /x "*.lib" /x "*.def" /x "pkgconfig" /x "include" /x "Python2.7" lib
-
-    SetOutPath "${GNM_ROOT}\share"
-    File /r "share\themes"
-    ;File /r "share\goffice"
-    File /r /x C "share\gnumeric"
-    File /r "share\libthai"
-    ;File /r "share\libgda-4.0"
-    ;File /r "share\libgda-4.1"
-    ;File /r /x "demo" "share\gnome-db-3.0"
-    File /r "share\pixmaps"
-    File /r "share\icons"
+    SetOutPath "${GNM_ROOT}\lib"
+    File /r /x "*.a" /x "*.la" /x "*.lib" /x "*.def" /x "pkgconfig" /x "include" /x "Python2.7" /x 
"*Conf.sh" "lib\*"
+
+    !insertmacro CopyDir "etc"
+    !insertmacro CopyDir "share\themes"
+    !insertmacro CopyDir "share\gnumeric"
+    !insertmacro CopyDir "share\libthai"
+    !insertmacro CopyDir "share\pixmaps"
+    !insertmacro CopyDir "share\icons"
+    !insertmacro CopyDir "share\glib-2.0\schemas"
 
     SetOutPath "${GNM_ROOT}\${GNM_HELP_DIR}"
     File "${GNM_HELP}"
@@ -255,7 +256,7 @@ Section "${LOCALE} Translation"
     SetOutPath "${GNM_ROOT}\share\locale\${LOCALE}\LC_MESSAGES"
     File "share\locale\${LOCALE}\LC_MESSAGES\gtk30.mo"
     File "share\locale\${LOCALE}\LC_MESSAGES\glib20.mo"
-    File "share\locale\${LOCALE}\LC_MESSAGES\goffice-${GOFFICE_VERSION}.mo"
+    File /nonfatal "share\locale\${LOCALE}\LC_MESSAGES\goffice-${GOFFICE_VERSION}.mo"
     File "share\locale\${LOCALE}\LC_MESSAGES\gnumeric-${GNM_VERSION}.mo"
     File "share\locale\${LOCALE}\LC_MESSAGES\gnumeric-${GNM_VERSION}-functions.mo"
 SectionEnd
@@ -272,7 +273,7 @@ SectionGroup "Translations"
     !insertmacro Locale "cs"
     !insertmacro Locale "da"
     !insertmacro Locale "de"
-    ;!insertmacro Locale "dz"
+    !insertmacro Locale "dz"
     !insertmacro Locale "el"
     !insertmacro Locale "en_CA"
     !insertmacro Locale "en_GB"
@@ -284,23 +285,23 @@ SectionGroup "Translations"
     !insertmacro Locale "fr"
     !insertmacro Locale "ga"
     !insertmacro Locale "gl"
-    ;!insertmacro Locale "gu"
+    !insertmacro Locale "gu"
     !insertmacro Locale "he"
     !insertmacro Locale "hr"
     !insertmacro Locale "hu"
     !insertmacro Locale "id"
     !insertmacro Locale "it"
     !insertmacro Locale "ja"
-    ;!insertmacro Locale "kk"
+    !insertmacro Locale "kk"
     !insertmacro Locale "ko"
     !insertmacro Locale "lt"
     !insertmacro Locale "lv"
-    ;!insertmacro Locale "mk"
+    !insertmacro Locale "mk"
     !insertmacro Locale "ml"
     !insertmacro Locale "mr"
     !insertmacro Locale "ms"
     !insertmacro Locale "nb"
-    ;!insertmacro Locale "ne"
+    !insertmacro Locale "ne"
     !insertmacro Locale "nl"
     !insertmacro Locale "nn"
     !insertmacro Locale "oc"
@@ -309,13 +310,13 @@ SectionGroup "Translations"
     !insertmacro Locale "pt_BR"
     !insertmacro Locale "ro"
     !insertmacro Locale "ru"
-    ;!insertmacro Locale "rw"
+    !insertmacro Locale "rw"
     !insertmacro Locale "sk"
     !insertmacro Locale "sl"
     !insertmacro Locale "sr"
     !insertmacro Locale "sr latin"
     !insertmacro Locale "sv"
-    ;!insertmacro Locale "te"
+    !insertmacro Locale "te"
     !insertmacro Locale "tr"
     !insertmacro Locale "uk"
     !insertmacro Locale "vi"