[grisbi-cvs] grisbi installer_strings.nsh, 1.3, 1.4 windows_installer.nsi, 1.4, 1.5

Gunee guneemwelloeux at users.sourceforge.net
Thu May 20 23:34:39 CEST 2010 

Update of /cvsroot/grisbi/grisbi
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12163

Modified Files:
	installer_strings.nsh windows_installer.nsi 
Log Message:
Multiple fixes for proper compilation/packaging on Windows (MSVC)

Index: installer_strings.nsh
===================================================================
RCS file: /cvsroot/grisbi/grisbi/installer_strings.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- installer_strings.nsh	28 Apr 2010 07:27:42 -0000	1.3
+++ installer_strings.nsh	20 May 2010 21:34:37 -0000	1.4
@@ -15,7 +15,7 @@
 LangString ProgFiles ${LANG_FARSI} "Grisbi program files"
 LangString ProgFiles ${LANG_HEBREW} "Grisbi program files"
 
-LangString GTK ${LANG_FRENCH} "Bibliothèque GTK2+"
+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"
@@ -78,12 +78,12 @@
 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_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_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"
@@ -95,12 +95,12 @@
 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_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_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."
@@ -112,7 +112,7 @@
 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 spuštì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 spuste instalaèní soubor."
+LangString ErrorMsg ${LANG_CZECH} "Instalace balíèku Microsoft Visual C++ 2008 SP1 redistributable se nezdaøila. Tato komponenta je nezbytná pro spuštì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 spuste 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

Index: windows_installer.nsi
===================================================================
RCS file: /cvsroot/grisbi/grisbi/windows_installer.nsi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- windows_installer.nsi	30 Jan 2010 14:56:40 -0000	1.4
+++ windows_installer.nsi	20 May 2010 21:34:37 -0000	1.5
@@ -21,12 +21,14 @@
 !define MAJOR "0"        ;Major version number
 !define MINOR "6"        ;Minor version number
 !define PATCH "0"        ;Patch version number
-!define STAGE "RC 2"     ;Developement stage id (RC, beta, alpha)
-!define SMALL_STAGE "rc2" ;Small dev stage id without spaces
+!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\plugins-dev" ;Path to the plugins-dev generated by prepare.cmd
+!define GTK_DEV_PATH "win32-msvc\target\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
+;!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}"
@@ -189,9 +191,9 @@
   File "${EXE_PATH}\plugins\ofx.dll"
   
   SetOutPath "$INSTDIR"
-  File /r "${EXE_PATH}\dtd"
-  File "${EXE_PATH}\osp151.dll"
-  File "${EXE_PATH}\libofx.dll"
+  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
 
@@ -203,8 +205,8 @@
   File "${EXE_PATH}\plugins\gnucash.dll"
   
   SetOutPath "$INSTDIR"
-  File "${GNUWIN32_PATH}\libxml2.dll"
-  File "${GNUWIN32_PATH}\iconv.dll"
+  File "${PLUGINS_DEV_PATH}\libxml2\bin\libxml2.dll"
+  File "${PLUGINS_DEV_PATH}\iconv\bin\iconv.dll"
 
 SectionEnd
 
@@ -216,7 +218,7 @@
   File "${EXE_PATH}\plugins\openssl.dll"
   
   SetOutPath "$INSTDIR"
-  File "${GNUWIN32_PATH}\libeay32.dll"
+  File "${PLUGINS_DEV_PATH}\openssl\bin\libeay32.dll"
 
 SectionEnd
 SectionGroupEnd

More information about the cvs mailing list