[grisbi-cvs] [SCM] grisbi branch, master, updated. 4cac3c65a92c1ae96f295ef95e9eff5dcbecb6bc
Gunee
nobody at users.sourceforge.net
Fri Jun 18 12:07:48 CEST 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".
The branch, master has been updated
via 4cac3c65a92c1ae96f295ef95e9eff5dcbecb6bc (commit)
via 3ac73145b9c50c3a34819444611418268c16dfcb (commit)
from c6677e8eeb1340881765d9222e4041417e4031e8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4cac3c65a92c1ae96f295ef95e9eff5dcbecb6bc
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Fri Jun 18 12:06:26 2010 +0200
Made the prepare.cmd script explicitely 32-bit specific
commit 3ac73145b9c50c3a34819444611418268c16dfcb
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Fri Jun 18 11:12:26 2010 +0200
Moved Windows-specific files to a more appropriate directory
-----------------------------------------------------------------------
Changes:
diff --git a/installer_strings.nsh b/installer_strings.nsh
deleted file mode 100644
index e0b9643..0000000
--- a/installer_strings.nsh
+++ /dev/null
@@ -1,118 +0,0 @@
-LangString ProgFiles ${LANG_FRENCH} "Fichiers programme de Grisbi"
-LangString ProgFiles ${LANG_ENGLISH} "Grisbi program files"
-LangString ProgFiles ${LANG_GERMAN} "Grisbi program files"
-LangString ProgFiles ${LANG_SPANISH} "Archivios del programma Grisbi"
-LangString ProgFiles ${LANG_TRADCHINESE} "Grisbi program files"
-LangString ProgFiles ${LANG_ITALIAN} "Grisbi program files"
-LangString ProgFiles ${LANG_DUTCH} "Grisbi program files"
-LangString ProgFiles ${LANG_DANISH} "Grisbi program files"
-LangString ProgFiles ${LANG_GREEK} "Grisbi program files"
-LangString ProgFiles ${LANG_RUSSIAN} "Grisbi program files"
-LangString ProgFiles ${LANG_PORTUGUESEBR} "Grisbi program files"
-LangString ProgFiles ${LANG_POLISH} "Grisbi program files"
-LangString ProgFiles ${LANG_CZECH} "Soubory programu Grisbi"
-LangString ProgFiles ${LANG_ROMANIAN} "Grisbi program files"
-LangString ProgFiles ${LANG_FARSI} "Grisbi program files"
-LangString ProgFiles ${LANG_HEBREW} "Grisbi program files"
-
-LangString GTK ${LANG_FRENCH} "Bibliothèque GTK2+"
-LangString GTK ${LANG_ENGLISH} "GTK2+ libraries"
-LangString GTK ${LANG_GERMAN} "GTK2+ libraries"
-LangString GTK ${LANG_SPANISH} "Biblioteca GTK"
-LangString GTK ${LANG_TRADCHINESE} "GTK2+ libraries"
-LangString GTK ${LANG_ITALIAN} "GTK2+ libraries"
-LangString GTK ${LANG_DUTCH} "GTK2+ libraries"
-LangString GTK ${LANG_DANISH} "GTK2+ libraries"
-LangString GTK ${LANG_GREEK} "GTK2+ libraries"
-LangString GTK ${LANG_RUSSIAN} "GTK2+ libraries"
-LangString GTK ${LANG_PORTUGUESEBR} "GTK2+ libraries"
-LangString GTK ${LANG_POLISH} "GTK2+ libraries"
-LangString GTK ${LANG_CZECH} "Knihovny GTK2+"
-LangString GTK ${LANG_ROMANIAN} "GTK2+ libraries"
-LangString GTK ${LANG_FARSI} "GTK2+ libraries"
-LangString GTK ${LANG_HEBREW} "GTK2+ libraries"
-
-LangString OFXplug ${LANG_FRENCH} "Plugin OFX d'importation"
-LangString OFXplug ${LANG_ENGLISH} "OFX files import"
-LangString OFXplug ${LANG_GERMAN} "OFX files import"
-LangString OFXplug ${LANG_SPANISH} "OFX import"
-LangString OFXplug ${LANG_TRADCHINESE} "OFX files import"
-LangString OFXplug ${LANG_ITALIAN} "OFX files import"
-LangString OFXplug ${LANG_DUTCH} "OFX files import"
-LangString OFXplug ${LANG_DANISH} "OFX files import"
-LangString OFXplug ${LANG_GREEK} "OFX files import"
-LangString OFXplug ${LANG_RUSSIAN} "OFX files import"
-LangString OFXplug ${LANG_PORTUGUESEBR} "OFX files import"
-LangString OFXplug ${LANG_POLISH} "OFX files import"
-LangString OFXplug ${LANG_CZECH} "Plugin pro import OFX"
-LangString OFXplug ${LANG_ROMANIAN} "OFX files import"
-LangString OFXplug ${LANG_FARSI} "OFX files import"
-LangString OFXplug ${LANG_HEBREW} "OFX files import"
-
-LangString GnuCashPlugin ${LANG_FRENCH} "Plugin d'importation GnuCash"
-LangString GnuCashPlugin ${LANG_ENGLISH} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_GERMAN} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_SPANISH} "Archivios del programma Grisbi"
-LangString GnuCashPlugin ${LANG_TRADCHINESE} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_ITALIAN} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_DUTCH} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_DANISH} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_GREEK} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_RUSSIAN} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_PORTUGUESEBR} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_POLISH} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_CZECH} "Plugin pro import GnuCash"
-LangString GnuCashPlugin ${LANG_ROMANIAN} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_FARSI} "GnuCash files import"
-LangString GnuCashPlugin ${LANG_HEBREW} "GnuCash files import"
-
-LangString OpenSSLplug ${LANG_FRENCH} "Plugin de cryptage OpenSSL"
-LangString OpenSSLplug ${LANG_ENGLISH} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_GERMAN} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_SPANISH} "Archivios del programma Grisbi"
-LangString OpenSSLplug ${LANG_TRADCHINESE} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_ITALIAN} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_DUTCH} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_DANISH} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_GREEK} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_RUSSIAN} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_PORTUGUESEBR} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_POLISH} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_CZECH} "Plugin pro ifrování OpenSSL"
-LangString OpenSSLplug ${LANG_ROMANIAN} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_FARSI} "OpenSSL encryption"
-LangString OpenSSLplug ${LANG_HEBREW} "OpenSSL encryption"
-
-LangString Shortcut ${LANG_FRENCH} "Raccourcis du menu démarrer"
-LangString Shortcut ${LANG_ENGLISH} "Start menu shortcuts"
-LangString Shortcut ${LANG_GERMAN} "Start menu shortcuts"
-LangString Shortcut ${LANG_SPANISH} "Archivios del programma Grisbi"
-LangString Shortcut ${LANG_TRADCHINESE} "Start menu shortcuts"
-LangString Shortcut ${LANG_ITALIAN} "Start menu shortcuts"
-LangString Shortcut ${LANG_DUTCH} "Start menu shortcuts"
-LangString Shortcut ${LANG_DANISH} "Start menu shortcuts"
-LangString Shortcut ${LANG_GREEK} "Start menu shortcuts"
-LangString Shortcut ${LANG_RUSSIAN} "Start menu shortcuts"
-LangString Shortcut ${LANG_PORTUGUESEBR} "Start menu shortcuts"
-LangString Shortcut ${LANG_POLISH} "Start menu shortcuts"
-LangString Shortcut ${LANG_CZECH} "Zástupci v nabídce Start"
-LangString Shortcut ${LANG_ROMANIAN} "Start menu shortcuts"
-LangString Shortcut ${LANG_FARSI} "Start menu shortcuts"
-LangString Shortcut ${LANG_HEBREW} "Start menu shortcuts"
-
-LangString ErrorMsg ${LANG_FRENCH} "Les fichiers redistribuables de Microsoft Visual C++ 2008 SP1 n'ont pas été correctement installés. Ils sont pourant nécessaires au bon fonctionnement de Grisbi. S'ils ne sont pas déjà installés, Grisbi peut ne pas fontionner correctement. Dans ce cas, installez les fichier manuellement, ou relancez l'installateur de Grisbi."
-LangString ErrorMsg ${LANG_ENGLISH} "Microsoft Visual C++ 2008 SP1 redistribuables installation failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_GERMAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer"
-LangString ErrorMsg ${LANG_SPANISH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_TRADCHINESE} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_ITALIAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_DUTCH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_DANISH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_GREEK} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_RUSSIAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_PORTUGUESEBR} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_POLISH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_CZECH} "Instalace balíèku Microsoft Visual C++ 2008 SP1 redistributable se nezdaøila. Tato komponenta je nezbytná pro sputìní Grisbi. Pokud ji døíve nebyla nainstalována, Grisbi nemusí fungovat. V takovém pøípadì prosím komponentu nainstalujte ruènì, nebo znovu spuste instalaèní soubor."
-LangString ErrorMsg ${LANG_ROMANIAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_FARSI} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_HEBREW} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
\ No newline at end of file
diff --git a/win32-msvc/installer_strings.nsh b/win32-msvc/installer_strings.nsh
new file mode 100644
index 0000000..e0b9643
--- /dev/null
+++ b/win32-msvc/installer_strings.nsh
@@ -0,0 +1,118 @@
+LangString ProgFiles ${LANG_FRENCH} "Fichiers programme de Grisbi"
+LangString ProgFiles ${LANG_ENGLISH} "Grisbi program files"
+LangString ProgFiles ${LANG_GERMAN} "Grisbi program files"
+LangString ProgFiles ${LANG_SPANISH} "Archivios del programma Grisbi"
+LangString ProgFiles ${LANG_TRADCHINESE} "Grisbi program files"
+LangString ProgFiles ${LANG_ITALIAN} "Grisbi program files"
+LangString ProgFiles ${LANG_DUTCH} "Grisbi program files"
+LangString ProgFiles ${LANG_DANISH} "Grisbi program files"
+LangString ProgFiles ${LANG_GREEK} "Grisbi program files"
+LangString ProgFiles ${LANG_RUSSIAN} "Grisbi program files"
+LangString ProgFiles ${LANG_PORTUGUESEBR} "Grisbi program files"
+LangString ProgFiles ${LANG_POLISH} "Grisbi program files"
+LangString ProgFiles ${LANG_CZECH} "Soubory programu Grisbi"
+LangString ProgFiles ${LANG_ROMANIAN} "Grisbi program files"
+LangString ProgFiles ${LANG_FARSI} "Grisbi program files"
+LangString ProgFiles ${LANG_HEBREW} "Grisbi program files"
+
+LangString GTK ${LANG_FRENCH} "Bibliothèque GTK2+"
+LangString GTK ${LANG_ENGLISH} "GTK2+ libraries"
+LangString GTK ${LANG_GERMAN} "GTK2+ libraries"
+LangString GTK ${LANG_SPANISH} "Biblioteca GTK"
+LangString GTK ${LANG_TRADCHINESE} "GTK2+ libraries"
+LangString GTK ${LANG_ITALIAN} "GTK2+ libraries"
+LangString GTK ${LANG_DUTCH} "GTK2+ libraries"
+LangString GTK ${LANG_DANISH} "GTK2+ libraries"
+LangString GTK ${LANG_GREEK} "GTK2+ libraries"
+LangString GTK ${LANG_RUSSIAN} "GTK2+ libraries"
+LangString GTK ${LANG_PORTUGUESEBR} "GTK2+ libraries"
+LangString GTK ${LANG_POLISH} "GTK2+ libraries"
+LangString GTK ${LANG_CZECH} "Knihovny GTK2+"
+LangString GTK ${LANG_ROMANIAN} "GTK2+ libraries"
+LangString GTK ${LANG_FARSI} "GTK2+ libraries"
+LangString GTK ${LANG_HEBREW} "GTK2+ libraries"
+
+LangString OFXplug ${LANG_FRENCH} "Plugin OFX d'importation"
+LangString OFXplug ${LANG_ENGLISH} "OFX files import"
+LangString OFXplug ${LANG_GERMAN} "OFX files import"
+LangString OFXplug ${LANG_SPANISH} "OFX import"
+LangString OFXplug ${LANG_TRADCHINESE} "OFX files import"
+LangString OFXplug ${LANG_ITALIAN} "OFX files import"
+LangString OFXplug ${LANG_DUTCH} "OFX files import"
+LangString OFXplug ${LANG_DANISH} "OFX files import"
+LangString OFXplug ${LANG_GREEK} "OFX files import"
+LangString OFXplug ${LANG_RUSSIAN} "OFX files import"
+LangString OFXplug ${LANG_PORTUGUESEBR} "OFX files import"
+LangString OFXplug ${LANG_POLISH} "OFX files import"
+LangString OFXplug ${LANG_CZECH} "Plugin pro import OFX"
+LangString OFXplug ${LANG_ROMANIAN} "OFX files import"
+LangString OFXplug ${LANG_FARSI} "OFX files import"
+LangString OFXplug ${LANG_HEBREW} "OFX files import"
+
+LangString GnuCashPlugin ${LANG_FRENCH} "Plugin d'importation GnuCash"
+LangString GnuCashPlugin ${LANG_ENGLISH} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_GERMAN} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_SPANISH} "Archivios del programma Grisbi"
+LangString GnuCashPlugin ${LANG_TRADCHINESE} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_ITALIAN} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_DUTCH} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_DANISH} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_GREEK} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_RUSSIAN} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_PORTUGUESEBR} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_POLISH} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_CZECH} "Plugin pro import GnuCash"
+LangString GnuCashPlugin ${LANG_ROMANIAN} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_FARSI} "GnuCash files import"
+LangString GnuCashPlugin ${LANG_HEBREW} "GnuCash files import"
+
+LangString OpenSSLplug ${LANG_FRENCH} "Plugin de cryptage OpenSSL"
+LangString OpenSSLplug ${LANG_ENGLISH} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_GERMAN} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_SPANISH} "Archivios del programma Grisbi"
+LangString OpenSSLplug ${LANG_TRADCHINESE} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_ITALIAN} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_DUTCH} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_DANISH} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_GREEK} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_RUSSIAN} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_PORTUGUESEBR} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_POLISH} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_CZECH} "Plugin pro ifrování OpenSSL"
+LangString OpenSSLplug ${LANG_ROMANIAN} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_FARSI} "OpenSSL encryption"
+LangString OpenSSLplug ${LANG_HEBREW} "OpenSSL encryption"
+
+LangString Shortcut ${LANG_FRENCH} "Raccourcis du menu démarrer"
+LangString Shortcut ${LANG_ENGLISH} "Start menu shortcuts"
+LangString Shortcut ${LANG_GERMAN} "Start menu shortcuts"
+LangString Shortcut ${LANG_SPANISH} "Archivios del programma Grisbi"
+LangString Shortcut ${LANG_TRADCHINESE} "Start menu shortcuts"
+LangString Shortcut ${LANG_ITALIAN} "Start menu shortcuts"
+LangString Shortcut ${LANG_DUTCH} "Start menu shortcuts"
+LangString Shortcut ${LANG_DANISH} "Start menu shortcuts"
+LangString Shortcut ${LANG_GREEK} "Start menu shortcuts"
+LangString Shortcut ${LANG_RUSSIAN} "Start menu shortcuts"
+LangString Shortcut ${LANG_PORTUGUESEBR} "Start menu shortcuts"
+LangString Shortcut ${LANG_POLISH} "Start menu shortcuts"
+LangString Shortcut ${LANG_CZECH} "Zástupci v nabídce Start"
+LangString Shortcut ${LANG_ROMANIAN} "Start menu shortcuts"
+LangString Shortcut ${LANG_FARSI} "Start menu shortcuts"
+LangString Shortcut ${LANG_HEBREW} "Start menu shortcuts"
+
+LangString ErrorMsg ${LANG_FRENCH} "Les fichiers redistribuables de Microsoft Visual C++ 2008 SP1 n'ont pas été correctement installés. Ils sont pourant nécessaires au bon fonctionnement de Grisbi. S'ils ne sont pas déjà installés, Grisbi peut ne pas fontionner correctement. Dans ce cas, installez les fichier manuellement, ou relancez l'installateur de Grisbi."
+LangString ErrorMsg ${LANG_ENGLISH} "Microsoft Visual C++ 2008 SP1 redistribuables installation failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_GERMAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer"
+LangString ErrorMsg ${LANG_SPANISH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_TRADCHINESE} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_ITALIAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_DUTCH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_DANISH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_GREEK} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_RUSSIAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_PORTUGUESEBR} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_POLISH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_CZECH} "Instalace balíèku Microsoft Visual C++ 2008 SP1 redistributable se nezdaøila. Tato komponenta je nezbytná pro sputìní Grisbi. Pokud ji døíve nebyla nainstalována, Grisbi nemusí fungovat. V takovém pøípadì prosím komponentu nainstalujte ruènì, nebo znovu spuste instalaèní soubor."
+LangString ErrorMsg ${LANG_ROMANIAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_FARSI} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_HEBREW} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
\ No newline at end of file
diff --git a/win32-msvc/prepare.cmd b/win32-msvc/prepare.cmd
deleted file mode 100644
index 6666cb1..0000000
--- a/win32-msvc/prepare.cmd
+++ /dev/null
@@ -1,99 +0,0 @@
- at echo off
-:: Change the next lines to choose which gtk+ version you download.
-:: Choose runtime version posterior to dev version
-:: Get this file name from http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/
-:: Specify the BUNDLE file
-:: Don't include the extension
-SET GTK_DEV_FILE=gtk+-bundle_2.18.7-20100213_win32
-:: Get this file name from http://sourceforge.net/projects/gtk-win/files
-:: Include the .exe extension
-REM SET GTK_BIN_FILE=gtk2-runtime-2.16.5-2009-08-06-ash.exe
-
-:: The rest of the script should do the rest
-
-SET CURRENT_DIR=%CD%
-IF NOT EXIST target MKDIR target
-SET TARGET_DIR=%CURRENT_DIR%\target
-IF NOT EXIST downloads MKDIR downloads
-SET DOWNLOADS_DIR=%CURRENT_DIR%\downloads
-
-echo Downloads directory : %DOWNLOADS_DIR%
-echo Target directory : %TARGET_DIR%
-
-REM PAUSE
-
-:: Download and install the GTK runtime
-REM cd %DOWNLOADS_DIR%
-REM wget -nc -c "http://sourceforge.net/projects/gtk-win/files/GTK+ Runtime Environment/GTK+ 2.16/%GTK_BIN_FILE%/download"
-REM .\%GTK_BIN_FILE%
-
-:: Download and unzip libxml2 dev and bin files
-cd %DOWNLOADS_DIR%
-wget -nc -c ftp://ftp.zlatkovic.com/libxml/libxml2-2.7.6.win32.zip
-cd %TARGET_DIR%
-unzip -uo %DOWNLOADS_DIR%\libxml2-2.7.6.win32.zip -d plugins-dev
-IF EXIST plugins-dev\libxml2 RMDIR /S /Q plugins-dev\libxml2
-MOVE plugins-dev\libxml2-2.7.6.win32 plugins-dev\libxml2
-PAUSE
-
-:: Download and unzip iconv dev and bin files
-cd %DOWNLOADS_DIR%
-wget -nc -c ftp://ftp.zlatkovic.com/libxml/iconv-1.9.2.win32.zip
-cd %TARGET_DIR%
-unzip -uo %DOWNLOADS_DIR%\iconv-1.9.2.win32.zip -d plugins-dev
-IF EXIST plugins-dev\iconv RMDIR /S /Q plugins-dev\iconv
-MOVE plugins-dev\iconv-1.9.2.win32 plugins-dev\iconv
-PAUSE
-
-:: Download and install openssl, copy the required files in the right place
-cd %DOWNLOADS_DIR%
-wget -nc -c http://www.slproweb.com/download/Win32OpenSSL-0_9_8n.exe
-ECHO ***** ATTENTION: Do not modify the default installation path for OpenSSL otherwise you will have trouble compiling *****
-.\Win32OpenSSL-0_9_8n.exe
-cd %TARGET_DIR%
-if not exist plugins-dev\openssl mkdir plugins-dev\openssl
-if not exist plugins-dev\openssl\lib mkdir plugins-dev\openssl\lib
-xcopy /Y C:\OpenSSL\lib\libeay32.lib plugins-dev\openssl\lib\.
-xcopy /Y C:\OpenSSL\lib\ssleay32.lib plugins-dev\openssl\lib\.
-IF NOT EXIST plugins-dev\openssl\include mkdir plugins-dev\openssl\include
-xcopy /YICD C:\OpenSSL\include\openssl\* plugins-dev\openssl\include\openssl
-xcopy /YICD C:\OpenSSL\*.dll plugins-dev\openssl\bin
-
-:: Download and unzip libofx dev and bin files
-cd %DOWNLOADS_DIR%
-wget -nc -c https://sourceforge.net/projects/grisbi/files/dependancies/0.6/libofx.zip/download
-cd %TARGET_DIR%
-unzip -uo %DOWNLOADS_DIR%\libofx.zip -d plugins-dev
-
-cd %DOWNLOADS_DIR%
-wget -nc -c http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/%GTK_DEV_FILE%.zip
-:: Checking if already unzipped
-:: If the readme file exists for this version, update the unzip
-cd %TARGET_DIR%
-IF NOT EXIST gtk-dev (
- echo GTK+ development files not present.
- echo Unzipping the archive now...
- unzip %DOWNLOADS_DIR%\%GTK_DEV_FILE% -d gtk-dev
- echo Done unzipping archive!
-)
-IF EXIST gtk-dev\%GTK_DEV_FILE%.README.txt (
- echo Found gtk-dev directory with the same gtk+ version.
- echo Updating the files...
- unzip -uo %DOWNLOADS_DIR%\%GTK_DEV_FILE% -d gtk-dev
- echo Done updating the files in gtk-dev!
-)
-:: If the readme file for the current version does not exist, remove the dir, and unzip again
-IF NOT EXIST gtk-dev\%GTK_DEV_FILE%.README.txt (
- echo Found gtk-dev directory with a different gtk+ version.
- echo Deleting gtk-dev for compatibility reasons...
- rmdir /S /Q gtk-dev
- echo Done deleting gtk-dev directory!
- echo Unzipping downloaded archive...
- unzip %DOWNLOADS_DIR%\%GTK_DEV_FILE% -d gtk-dev
- echo Done unzipping archive!
-)
-SET GTK_DEV_FILE=
-cd %CURRENT_DIR%
-call generate.cmd
-
-PAUSE
\ No newline at end of file
diff --git a/win32-msvc/prepare_Win32.cmd b/win32-msvc/prepare_Win32.cmd
new file mode 100644
index 0000000..1a83bd6
--- /dev/null
+++ b/win32-msvc/prepare_Win32.cmd
@@ -0,0 +1,109 @@
+ at echo off
+:: Change the next lines to choose which gtk+ version you download.
+:: Choose runtime version posterior to dev version
+:: Get this file name from http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/
+:: Specify the BUNDLE file
+:: Don't include the extension
+SET GTK_DEV_FILE_BASENAME=gtk+-bundle_2.18.7-20100213_win32
+
+:: The rest of the script should do the rest
+
+SET CURRENT_DIR=%CD%
+IF NOT EXIST target MKDIR target
+IF NOT EXIST target\Win32 MKDIR target\Win32
+SET TARGET_DIR=%CURRENT_DIR%\target\Win32
+IF NOT EXIST downloads MKDIR downloads
+SET DOWNLOADS_DIR=%CURRENT_DIR%\downloads
+
+echo Downloads directory : %DOWNLOADS_DIR%
+echo Target directory : %TARGET_DIR%
+
+REM PAUSE
+
+:: Download and install the GTK runtime
+REM cd %DOWNLOADS_DIR%
+REM wget -nc -c "http://sourceforge.net/projects/gtk-win/files/GTK+ Runtime Environment/GTK+ 2.16/%GTK_BIN_FILE%/download"
+REM .\%GTK_BIN_FILE%
+
+:: Download and unzip libxml2 dev and bin files
+SET LIBXML_FILE_BASENAME=libxml2-2.7.6.win32
+cd %DOWNLOADS_DIR%
+wget -nc -c ftp://ftp.zlatkovic.com/libxml/%LIBXML_FILE_BASENAME%.zip
+cd %TARGET_DIR%
+unzip -uo %DOWNLOADS_DIR%\%LIBXML_FILE_BASENAME%.zip -d plugins-dev
+IF EXIST plugins-dev\libxml2 RMDIR /S /Q plugins-dev\libxml2
+MOVE plugins-dev\%LIBXML_FILE_BASENAME% plugins-dev\libxml2
+PAUSE
+
+:: Download and unzip iconv dev and bin files
+SET ICONV_FILE_BASENAME=iconv-1.9.2.win32
+cd %DOWNLOADS_DIR%
+wget -nc -c ftp://ftp.zlatkovic.com/libxml/%ICONV_FILE_BASENAME%.zip
+cd %TARGET_DIR%
+unzip -uo %DOWNLOADS_DIR%\%ICONV_FILE_BASENAME%.zip -d plugins-dev
+IF EXIST plugins-dev\iconv RMDIR /S /Q plugins-dev\iconv
+MOVE plugins-dev\%ICONV_FILE_BASENAME% plugins-dev\iconv
+PAUSE
+
+:: Download and install openssl, copy the required files in the right place
+SET OPENSSL_FILE_BASENAME=Win32OpenSSL-0_9_8o
+cd %DOWNLOADS_DIR%
+wget -nc -c http://www.slproweb.com/download/%OPENSSL_FILE_BASENAME%.exe
+IF NOT EXIST "C:\OpenSSL\readme.txt" (
+ IF EXIST %OPENSSL_FILE_BASENAME%.exe (
+ ECHO ***** ATTENTION: Do not modify the default installation path for OpenSSL otherwise you will have trouble compiling *****
+ PAUSE
+ START %OPENSSL_FILE_BASENAME%.exe
+ EXIT /B 0) ELSE (
+ ECHO OpenSSL package not downloaded. Please edit the script with correct filename and re-run.
+ CD %CURRENT_DIR%
+ EXIT /B 1) ) ELSE (
+ ECHO OpenSSL already installed. Please check version.)
+cd %TARGET_DIR%
+if not exist plugins-dev\openssl mkdir plugins-dev\openssl
+if not exist plugins-dev\openssl\lib mkdir plugins-dev\openssl\lib
+xcopy /Y C:\OpenSSL\lib\libeay32.lib plugins-dev\openssl\lib\.
+xcopy /Y C:\OpenSSL\lib\ssleay32.lib plugins-dev\openssl\lib\.
+IF NOT EXIST plugins-dev\openssl\include mkdir plugins-dev\openssl\include
+xcopy /YICD C:\OpenSSL\include\openssl\* plugins-dev\openssl\include\openssl
+IF NOT EXIST plugins-dev\openssl\bin mkdir plugins-dev\openssl\bin
+xcopy /YICD C:\OpenSSL\*.dll plugins-dev\openssl\bin
+
+:: Download and unzip libofx dev and bin files
+cd %DOWNLOADS_DIR%
+wget -nc -c https://sourceforge.net/projects/grisbi/files/dependancies/0.6/libofx_Win32.zip/download
+cd %TARGET_DIR%
+unzip -uo %DOWNLOADS_DIR%\libofx_Win32.zip -d plugins-dev
+
+cd %DOWNLOADS_DIR%
+wget -nc -c http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/%GTK_DEV_FILE_BASENAME%.zip
+:: Checking if already unzipped
+:: If the readme file exists for this version, update the unzip
+cd %TARGET_DIR%
+IF NOT EXIST gtk-dev (
+ echo GTK+ development files not present.
+ echo Unzipping the archive now...
+ unzip %DOWNLOADS_DIR%\%GTK_DEV_FILE_BASENAME% -d gtk-dev
+ echo Done unzipping archive!
+)
+IF EXIST gtk-dev\%GTK_DEV_FILE_BASENAME%.README.txt (
+ echo Found gtk-dev directory with the same gtk+ version.
+ echo Updating the files...
+ unzip -uo %DOWNLOADS_DIR%\%GTK_DEV_FILE_BASENAME% -d gtk-dev
+ echo Done updating the files in gtk-dev!
+)
+:: If the readme file for the current version does not exist, remove the dir, and unzip again
+IF NOT EXIST gtk-dev\%GTK_DEV_FILE_BASENAME%.README.txt (
+ echo Found gtk-dev directory with a different gtk+ version.
+ echo Deleting gtk-dev for compatibility reasons...
+ rmdir /S /Q gtk-dev
+ echo Done deleting gtk-dev directory!
+ echo Unzipping downloaded archive...
+ unzip %DOWNLOADS_DIR%\%GTK_DEV_FILE_BASENAME% -d gtk-dev
+ echo Done unzipping archive!
+)
+SET GTK_DEV_FILE_BASENAME=
+cd %CURRENT_DIR%
+call generate.cmd
+
+PAUSE
\ No newline at end of file
diff --git a/win32-msvc/windows_installer.nsi b/win32-msvc/windows_installer.nsi
new file mode 100644
index 0000000..a207b6f
--- /dev/null
+++ b/win32-msvc/windows_installer.nsi
@@ -0,0 +1,295 @@
+;NSIS Modern User Interface
+;Multilingual Example Script
+;Written by Joost Verburg
+
+;--------------------------------
+;Include Modern UI
+
+ !include "MUI2.nsh"
+
+;--------------------------------
+;Include Env Vars modification function
+;available at http://nsis.sourceforge.net/Environmental_Variables:_append,_prepend,_and_remove_entries
+
+ ;!include "EnvVarUpdate.nsh"
+
+
+;-----------------------
+;Defining useful parameters
+
+!define PRODUCT "Grisbi" ;Name of the project
+!define MAJOR "0" ;Major version number
+!define MINOR "6" ;Minor version number
+!define PATCH "0" ;Patch version number
+!define STAGE "release" ;Developement stage id (RC, beta, alpha)
+!define SMALL_STAGE "rel" ;Small dev stage id without spaces
+!define EXE_PATH "target\Win32\Release" ;Path to the exe file you want to pack
+!define PLUGINS_DEV_PATH "target\Win32\plugins-dev" ;Path to the plugins-dev generated by prepare.cmd
+!define GTK_DEV_PATH "target\Win32\gtk-dev" ;Path to the gtk-dev generated by prepare.cmd
+!define GNUWIN32_PATH "C:\Program Files (x86)\GnuWin32\bin" ;Path to the GnuWin32 root (must have libxml and openssl)
+;!define GTK_INSTALL_PATH "." ; Path to the GTK installer file to pack
+;!define GTK_INSTALL_FILE "gtk2-runtime-2.16.5-2009-08-06-ash.exe" ;Filename of the GTK installer
+
+;Automatically defined parameters
+!define BRANCH "${MAJOR}.${MINOR}.${PATCH}"
+!define VER "${BRANCH} ${STAGE}"
+!define SMALL_VER "${BRANCH}_${SMALL_STAGE}"
+!define FULLNAME "${PRODUCT} ${VER}"
+!define SHORTNAME "${PRODUCT}_${SMALL_VER}"
+
+;--------------------------------
+;General
+
+ ;Name and file
+ Name "${FULLNAME}"
+ !define MUI_ICON "../win32/grisbi.ico"
+ !define MUI_UNICON "../win32/grisbi.ico"
+ !define MUI_COMPONENTSPAGE_NODESC "true"
+ OutFile "${SHORTNAME}.exe"
+
+ SetCompressor /SOLID lzma
+
+ ;Default installation folder
+ InstallDir "$PROGRAMFILES32\${FULLNAME}"
+
+ ;Get installation folder from registry if available
+ InstallDirRegKey HKLM "Software\${FULLNAME}" ""
+
+ ;Request application privileges for Windows Vista
+ RequestExecutionLevel admin
+
+;--------------------------------
+;Interface Settings
+
+ !define MUI_ABORTWARNING
+
+;--------------------------------
+;Language Selection Dialog Settings
+
+ ;Remember the installer language
+ !define MUI_LANGDLL_REGISTRY_ROOT "HKLM"
+ !define MUI_LANGDLL_REGISTRY_KEY "Software\${FULLNAME}"
+ !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
+
+;--------------------------------
+;Pages
+
+ !insertmacro MUI_PAGE_LICENSE "COPYING"
+ !insertmacro MUI_PAGE_COMPONENTS
+ !insertmacro MUI_PAGE_DIRECTORY
+ !insertmacro MUI_PAGE_INSTFILES
+
+ !insertmacro MUI_UNPAGE_CONFIRM
+ !insertmacro MUI_UNPAGE_INSTFILES
+
+!ifndef NOINSTTYPES ; only if not defined
+ InstType "Full (recommended)"
+ InstType "Full (without GTK)"
+ InstType "Grisbi only (no plugins)"
+ ;InstType /NOCUSTOM
+ ;InstType /COMPONENTSONLYONCUSTOM
+!endif
+
+
+;--------------------------------
+;Languages
+
+ !insertmacro MUI_LANGUAGE "English" ;first language is the default language
+ !insertmacro MUI_LANGUAGE "French"
+ !insertmacro MUI_LANGUAGE "German"
+ !insertmacro MUI_LANGUAGE "Spanish"
+ !insertmacro MUI_LANGUAGE "TradChinese"
+ !insertmacro MUI_LANGUAGE "Italian"
+ !insertmacro MUI_LANGUAGE "Dutch"
+ !insertmacro MUI_LANGUAGE "Danish"
+ !insertmacro MUI_LANGUAGE "Greek"
+ !insertmacro MUI_LANGUAGE "Russian"
+ !insertmacro MUI_LANGUAGE "PortugueseBR"
+ !insertmacro MUI_LANGUAGE "Polish"
+ !insertmacro MUI_LANGUAGE "Czech"
+ !insertmacro MUI_LANGUAGE "Romanian"
+ !insertmacro MUI_LANGUAGE "Farsi"
+ !insertmacro MUI_LANGUAGE "Hebrew"
+
+;--------------------------------
+;Reserve Files
+
+ ;If you are using solid compression, files that are required before
+ ;the actual installation should be stored first in the data block,
+ ;because this will make your installer start faster.
+
+ !insertmacro MUI_RESERVEFILE_LANGDLL
+
+
+ !include "installer_strings.nsh"
+
+;--------------------------------
+;Installer Sections
+
+Section $(ProgFiles)
+
+ SectionIn 1 2 3 RO
+
+ SetOutPath "$TEMP"
+ File "vcredist_x86.exe"
+ ExecWait "vcredist_x86.exe"
+ IfErrors 0 +2
+ MessageBox MB_OK $(ErrorMsg)
+
+ SetOutPath "$INSTDIR"
+
+ File /r /x "plugin" /x "dtd" /x "*.dll" /x "Makefile.am" /x ".gitignore" /x ".git" /x "*.exp" /x "*.idb" /x "*.lib" /x "Release" "${EXE_PATH}\*.*"
+ File "..\win32\grisbi.ico"
+
+ ;Store installation folder
+ WriteRegStr HKLM "Software\${FULLNAME}" "" $INSTDIR
+
+ ; File extension keys
+ WriteRegStr HKCR ".gsb" "" "gsb_account_file"
+ WriteRegExpandStr HKCR "gsb_account_file\Shell\open\command" "" "$INSTDIR\grisbi.exe"
+ WriteRegExpandStr HKCR "gsb_account_file\DefaultIcon" "" "$INSTDIR\grisbi.ico"
+
+ ;Create uninstaller
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "DisplayName" "${FULLNAME}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "NoRepair" 1
+ WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+SectionEnd
+
+Section $(GTK)
+
+ SectionIn 1
+
+ SetOutPath "$INSTDIR"
+ File /r "${GTK_DEV_PATH}\bin\*.dll" ;"${GTK_INSTALL_PATH}\${GTK_INSTALL_FILE}"
+
+ SetOutPath "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
+ File "${GTK_DEV_PATH}\lib\gtk-2.0\2.10.0\engines\libwimp.dll"
+
+ SetOutPath "$INSTDIR\share\locale"
+ File /r "${GTK_DEV_PATH}\share\locale\cs"
+ File /r "${GTK_DEV_PATH}\share\locale\da"
+ File /r "${GTK_DEV_PATH}\share\locale\de"
+ File /r "${GTK_DEV_PATH}\share\locale\el"
+ File /r "${GTK_DEV_PATH}\share\locale\eo"
+ File /r "${GTK_DEV_PATH}\share\locale\es"
+ File /r "${GTK_DEV_PATH}\share\locale\fa"
+ File /r "${GTK_DEV_PATH}\share\locale\fr"
+ File /r "${GTK_DEV_PATH}\share\locale\he"
+ File /r "${GTK_DEV_PATH}\share\locale\it"
+ File /r "${GTK_DEV_PATH}\share\locale\nl"
+ File /r "${GTK_DEV_PATH}\share\locale\pl"
+ File /r "${GTK_DEV_PATH}\share\locale\pt_BR"
+ File /r "${GTK_DEV_PATH}\share\locale\ro"
+ File /r "${GTK_DEV_PATH}\share\locale\ru"
+ File /r "${GTK_DEV_PATH}\share\locale\zh_CN"
+
+SectionEnd
+
+SectionGroup "Plugins"
+Section $(OFXplug)
+
+ SectionIn 1 2
+
+ SetOutPath "$INSTDIR\plugins"
+ File "${EXE_PATH}\plugins\ofx.dll"
+
+ SetOutPath "$INSTDIR"
+ File /r "${PLUGINS_DEV_PATH}\libofx\bin\dtd"
+ File "${PLUGINS_DEV_PATH}\libofx\bin\osp152.dll"
+ File "${PLUGINS_DEV_PATH}\libofx\bin\libofx.dll"
+
+SectionEnd
+
+Section $(GnuCashPlugin)
+
+ SectionIn 1 2
+
+ SetOutPath "$INSTDIR\plugins"
+ File "${EXE_PATH}\plugins\gnucash.dll"
+
+ SetOutPath "$INSTDIR"
+ File "${PLUGINS_DEV_PATH}\libxml2\bin\libxml2.dll"
+ File "${PLUGINS_DEV_PATH}\iconv\bin\iconv.dll"
+
+SectionEnd
+
+Section $(OpenSSLplug)
+
+ SectionIn 1 2
+
+ SetOutPath "$INSTDIR\plugins"
+ File "${EXE_PATH}\plugins\openssl.dll"
+
+ SetOutPath "$INSTDIR"
+ File "${PLUGINS_DEV_PATH}\openssl\bin\libeay32.dll"
+
+SectionEnd
+SectionGroupEnd
+
+Section $(Shortcut)
+
+ SectionIn 1 2 3
+
+ SetShellVarContext all
+ CreateDirectory "$SMPROGRAMS\Grisbi"
+ CreateShortCut "$SMPROGRAMS\Grisbi\Uninstall ${FULLNAME}.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
+ CreateShortCut "$SMPROGRAMS\Grisbi\${FULLNAME}.lnk" "$INSTDIR\grisbi.exe" "" "$INSTDIR\grisbi.ico" 0
+ CreateShortCut "$DESKTOP\Grisbi.lnk" "$INSTDIR\grisbi.exe" "" "$INSTDIR\grisbi.ico" 0
+
+SectionEnd
+
+;--------------------------------
+;Installer Functions
+
+Function .onInit
+
+ !insertmacro MUI_LANGDLL_DISPLAY
+
+FunctionEnd
+
+;--------------------------------
+;Descriptions
+
+ ;USE A LANGUAGE STRING IF YOU WANT YOUR DESCRIPTIONS TO BE LANGAUGE SPECIFIC
+
+ ;Assign descriptions to sections
+ ;!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ ; !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} "A test section."
+ ;!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+
+ RMDir /r /REBOOTOK $INSTDIR
+ Delete "$INSTDIR\Uninstall.exe"
+
+ DeleteRegKey /ifempty HKLM "Software\${FULLNAME}"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}"
+
+ ; removing file extension keys
+ DeleteRegKey HKCR ".gsb"
+ DeleteRegKey HKCR "gsb_account_file"
+
+ ; Remove shortcuts, if any
+ SetShellVarContext all
+ Delete "$SMPROGRAMS\Grisbi\Uninstall ${FULLNAME}.lnk"
+ Delete "$SMPROGRAMS\Grisbi\${FULLNAME}.lnk"
+ Delete "$DESKTOP\Grisbi.lnk"
+ RMDir "$SMPROGRAMS\Grisbi"
+
+SectionEnd
+
+;--------------------------------
+;Uninstaller Functions
+
+Function un.onInit
+
+ !insertmacro MUI_UNGETLANGUAGE
+
+FunctionEnd
diff --git a/windows_installer.nsi b/windows_installer.nsi
deleted file mode 100644
index 81d5b63..0000000
--- a/windows_installer.nsi
+++ /dev/null
@@ -1,295 +0,0 @@
-;NSIS Modern User Interface
-;Multilingual Example Script
-;Written by Joost Verburg
-
-;--------------------------------
-;Include Modern UI
-
- !include "MUI2.nsh"
-
-;--------------------------------
-;Include Env Vars modification function
-;available at http://nsis.sourceforge.net/Environmental_Variables:_append,_prepend,_and_remove_entries
-
- ;!include "EnvVarUpdate.nsh"
-
-
-;-----------------------
-;Defining useful parameters
-
-!define PRODUCT "Grisbi" ;Name of the project
-!define MAJOR "0" ;Major version number
-!define MINOR "6" ;Minor version number
-!define PATCH "0" ;Patch version number
-!define STAGE "release" ;Developement stage id (RC, beta, alpha)
-!define SMALL_STAGE "rel" ;Small dev stage id without spaces
-!define EXE_PATH "win32-msvc\target\Win32\Release" ;Path to the exe file you want to pack
-!define PLUGINS_DEV_PATH "win32-msvc\target\Win32\plugins-dev" ;Path to the plugins-dev generated by prepare.cmd
-!define GTK_DEV_PATH "win32-msvc\target\Win32\gtk-dev" ;Path to the gtk-dev generated by prepare.cmd
-!define GNUWIN32_PATH "C:\Program Files (x86)\GnuWin32\bin" ;Path to the GnuWin32 root (must have libxml and openssl)
-;!define GTK_INSTALL_PATH "." ; Path to the GTK installer file to pack
-;!define GTK_INSTALL_FILE "gtk2-runtime-2.16.5-2009-08-06-ash.exe" ;Filename of the GTK installer
-
-;Automatically defined parameters
-!define BRANCH "${MAJOR}.${MINOR}.${PATCH}"
-!define VER "${BRANCH} ${STAGE}"
-!define SMALL_VER "${BRANCH}_${SMALL_STAGE}"
-!define FULLNAME "${PRODUCT} ${VER}"
-!define SHORTNAME "${PRODUCT}_${SMALL_VER}"
-
-;--------------------------------
-;General
-
- ;Name and file
- Name "${FULLNAME}"
- !define MUI_ICON "win32/grisbi.ico"
- !define MUI_UNICON "win32/grisbi.ico"
- !define MUI_COMPONENTSPAGE_NODESC "true"
- OutFile "${SHORTNAME}.exe"
-
- SetCompressor /SOLID lzma
-
- ;Default installation folder
- InstallDir "$PROGRAMFILES32\${FULLNAME}"
-
- ;Get installation folder from registry if available
- InstallDirRegKey HKLM "Software\${FULLNAME}" ""
-
- ;Request application privileges for Windows Vista
- RequestExecutionLevel admin
-
-;--------------------------------
-;Interface Settings
-
- !define MUI_ABORTWARNING
-
-;--------------------------------
-;Language Selection Dialog Settings
-
- ;Remember the installer language
- !define MUI_LANGDLL_REGISTRY_ROOT "HKLM"
- !define MUI_LANGDLL_REGISTRY_KEY "Software\${FULLNAME}"
- !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
-
-;--------------------------------
-;Pages
-
- !insertmacro MUI_PAGE_LICENSE "COPYING"
- !insertmacro MUI_PAGE_COMPONENTS
- !insertmacro MUI_PAGE_DIRECTORY
- !insertmacro MUI_PAGE_INSTFILES
-
- !insertmacro MUI_UNPAGE_CONFIRM
- !insertmacro MUI_UNPAGE_INSTFILES
-
-!ifndef NOINSTTYPES ; only if not defined
- InstType "Full (recommended)"
- InstType "Full (without GTK)"
- InstType "Grisbi only (no plugins)"
- ;InstType /NOCUSTOM
- ;InstType /COMPONENTSONLYONCUSTOM
-!endif
-
-
-;--------------------------------
-;Languages
-
- !insertmacro MUI_LANGUAGE "English" ;first language is the default language
- !insertmacro MUI_LANGUAGE "French"
- !insertmacro MUI_LANGUAGE "German"
- !insertmacro MUI_LANGUAGE "Spanish"
- !insertmacro MUI_LANGUAGE "TradChinese"
- !insertmacro MUI_LANGUAGE "Italian"
- !insertmacro MUI_LANGUAGE "Dutch"
- !insertmacro MUI_LANGUAGE "Danish"
- !insertmacro MUI_LANGUAGE "Greek"
- !insertmacro MUI_LANGUAGE "Russian"
- !insertmacro MUI_LANGUAGE "PortugueseBR"
- !insertmacro MUI_LANGUAGE "Polish"
- !insertmacro MUI_LANGUAGE "Czech"
- !insertmacro MUI_LANGUAGE "Romanian"
- !insertmacro MUI_LANGUAGE "Farsi"
- !insertmacro MUI_LANGUAGE "Hebrew"
-
-;--------------------------------
-;Reserve Files
-
- ;If you are using solid compression, files that are required before
- ;the actual installation should be stored first in the data block,
- ;because this will make your installer start faster.
-
- !insertmacro MUI_RESERVEFILE_LANGDLL
-
-
- !include "installer_strings.nsh"
-
-;--------------------------------
-;Installer Sections
-
-Section $(ProgFiles)
-
- SectionIn 1 2 3 RO
-
- SetOutPath "$TEMP"
- File "vcredist_x86.exe"
- ExecWait "vcredist_x86.exe"
- IfErrors 0 +2
- MessageBox MB_OK $(ErrorMsg)
-
- SetOutPath "$INSTDIR"
-
- File /r /x "plugin" /x "dtd" /x "*.dll" /x "Makefile.am" /x ".gitignore" /x ".git" /x "*.exp" /x "*.idb" /x "*.lib" /x "Release" "${EXE_PATH}\*.*"
- File "win32\grisbi.ico"
-
- ;Store installation folder
- WriteRegStr HKLM "Software\${FULLNAME}" "" $INSTDIR
-
- ; File extension keys
- WriteRegStr HKCR ".gsb" "" "gsb_account_file"
- WriteRegExpandStr HKCR "gsb_account_file\Shell\open\command" "" "$INSTDIR\grisbi.exe"
- WriteRegExpandStr HKCR "gsb_account_file\DefaultIcon" "" "$INSTDIR\grisbi.ico"
-
- ;Create uninstaller
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "DisplayName" "${FULLNAME}"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "NoModify" 1
- WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}" "NoRepair" 1
- WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-SectionEnd
-
-Section $(GTK)
-
- SectionIn 1
-
- SetOutPath "$INSTDIR"
- File /r "${GTK_DEV_PATH}\bin\*.dll" ;"${GTK_INSTALL_PATH}\${GTK_INSTALL_FILE}"
-
- SetOutPath "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
- File "${GTK_DEV_PATH}\lib\gtk-2.0\2.10.0\engines\libwimp.dll"
-
- SetOutPath "$INSTDIR\share\locale"
- File /r "${GTK_DEV_PATH}\share\locale\cs"
- File /r "${GTK_DEV_PATH}\share\locale\da"
- File /r "${GTK_DEV_PATH}\share\locale\de"
- File /r "${GTK_DEV_PATH}\share\locale\el"
- File /r "${GTK_DEV_PATH}\share\locale\eo"
- File /r "${GTK_DEV_PATH}\share\locale\es"
- File /r "${GTK_DEV_PATH}\share\locale\fa"
- File /r "${GTK_DEV_PATH}\share\locale\fr"
- File /r "${GTK_DEV_PATH}\share\locale\he"
- File /r "${GTK_DEV_PATH}\share\locale\it"
- File /r "${GTK_DEV_PATH}\share\locale\nl"
- File /r "${GTK_DEV_PATH}\share\locale\pl"
- File /r "${GTK_DEV_PATH}\share\locale\pt_BR"
- File /r "${GTK_DEV_PATH}\share\locale\ro"
- File /r "${GTK_DEV_PATH}\share\locale\ru"
- File /r "${GTK_DEV_PATH}\share\locale\zh_CN"
-
-SectionEnd
-
-SectionGroup "Plugins"
-Section $(OFXplug)
-
- SectionIn 1 2
-
- SetOutPath "$INSTDIR\plugins"
- File "${EXE_PATH}\plugins\ofx.dll"
-
- SetOutPath "$INSTDIR"
- File /r "${PLUGINS_DEV_PATH}\libofx\bin\dtd"
- File "${PLUGINS_DEV_PATH}\libofx\bin\osp152.dll"
- File "${PLUGINS_DEV_PATH}\libofx\bin\libofx.dll"
-
-SectionEnd
-
-Section $(GnuCashPlugin)
-
- SectionIn 1 2
-
- SetOutPath "$INSTDIR\plugins"
- File "${EXE_PATH}\plugins\gnucash.dll"
-
- SetOutPath "$INSTDIR"
- File "${PLUGINS_DEV_PATH}\libxml2\bin\libxml2.dll"
- File "${PLUGINS_DEV_PATH}\iconv\bin\iconv.dll"
-
-SectionEnd
-
-Section $(OpenSSLplug)
-
- SectionIn 1 2
-
- SetOutPath "$INSTDIR\plugins"
- File "${EXE_PATH}\plugins\openssl.dll"
-
- SetOutPath "$INSTDIR"
- File "${PLUGINS_DEV_PATH}\openssl\bin\libeay32.dll"
-
-SectionEnd
-SectionGroupEnd
-
-Section $(Shortcut)
-
- SectionIn 1 2 3
-
- SetShellVarContext all
- CreateDirectory "$SMPROGRAMS\Grisbi"
- CreateShortCut "$SMPROGRAMS\Grisbi\Uninstall ${FULLNAME}.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
- CreateShortCut "$SMPROGRAMS\Grisbi\${FULLNAME}.lnk" "$INSTDIR\grisbi.exe" "" "$INSTDIR\grisbi.ico" 0
- CreateShortCut "$DESKTOP\Grisbi.lnk" "$INSTDIR\grisbi.exe" "" "$INSTDIR\grisbi.ico" 0
-
-SectionEnd
-
-;--------------------------------
-;Installer Functions
-
-Function .onInit
-
- !insertmacro MUI_LANGDLL_DISPLAY
-
-FunctionEnd
-
-;--------------------------------
-;Descriptions
-
- ;USE A LANGUAGE STRING IF YOU WANT YOUR DESCRIPTIONS TO BE LANGAUGE SPECIFIC
-
- ;Assign descriptions to sections
- ;!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
- ; !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} "A test section."
- ;!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-
- RMDir /r /REBOOTOK $INSTDIR
- Delete "$INSTDIR\Uninstall.exe"
-
- DeleteRegKey /ifempty HKLM "Software\${FULLNAME}"
- DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${FULLNAME}"
-
- ; removing file extension keys
- DeleteRegKey HKCR ".gsb"
- DeleteRegKey HKCR "gsb_account_file"
-
- ; Remove shortcuts, if any
- SetShellVarContext all
- Delete "$SMPROGRAMS\Grisbi\Uninstall ${FULLNAME}.lnk"
- Delete "$SMPROGRAMS\Grisbi\${FULLNAME}.lnk"
- Delete "$DESKTOP\Grisbi.lnk"
- RMDir "$SMPROGRAMS\Grisbi"
-
-SectionEnd
-
-;--------------------------------
-;Uninstaller Functions
-
-Function un.onInit
-
- !insertmacro MUI_UNGETLANGUAGE
-
-FunctionEnd
hooks/post-receive
--
grisbi
More information about the cvs
mailing list