[grisbi-cvs] grisbi windows_installer.nsi,1.5,1.6

[Gunee]

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

Modified Files:
	windows_installer.nsi 
Log Message:
Test lock

Index: windows_installer.nsi
===================================================================
RCS file: /cvsroot/grisbi/grisbi/windows_installer.nsi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- windows_installer.nsi	20 May 2010 21:34:37 -0000	1.5
+++ windows_installer.nsi	15 Jun 2010 14:09:13 -0000	1.6
@@ -21,11 +21,11 @@
 !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 STAGE "release2"     ;Developement stage id (RC, beta, alpha)
+!define SMALL_STAGE "rel2" ;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 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
@@ -50,7 +50,7 @@
   SetCompressor /SOLID lzma
 
   ;Default installation folder
-  InstallDir "$PROGRAMFILES\${FULLNAME}"
+  InstallDir "$PROGRAMFILES32\${FULLNAME}"
   
   ;Get installation folder from registry if available
   InstallDirRegKey HKLM "Software\${FULLNAME}" ""
@@ -129,6 +129,12 @@
 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"
   
@@ -157,28 +163,28 @@
   SectionIn 1
   
   SetOutPath "$INSTDIR"
-  File /r "win32-msvc\target\gtk-dev\bin\*.dll" ;"${GTK_INSTALL_PATH}\${GTK_INSTALL_FILE}"
+  File /r "${GTK_DEV_PATH}\bin\*.dll" ;"${GTK_INSTALL_PATH}\${GTK_INSTALL_FILE}"
   
   SetOutPath "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
-  File "win32-msvc\target\gtk-dev\lib\gtk-2.0\2.10.0\engines\libwimp.dll"
+  File "${GTK_DEV_PATH}\lib\gtk-2.0\2.10.0\engines\libwimp.dll"
   
   SetOutPath "$INSTDIR\share\locale"
-  File /r "win32-msvc\target\gtk-dev\share\locale\cs"
-  File /r "win32-msvc\target\gtk-dev\share\locale\da"
-  File /r "win32-msvc\target\gtk-dev\share\locale\de"
-  File /r "win32-msvc\target\gtk-dev\share\locale\el"
-  File /r "win32-msvc\target\gtk-dev\share\locale\eo"
-  File /r "win32-msvc\target\gtk-dev\share\locale\es"
-  File /r "win32-msvc\target\gtk-dev\share\locale\fa"
-  File /r "win32-msvc\target\gtk-dev\share\locale\fr"
-  File /r "win32-msvc\target\gtk-dev\share\locale\he"
-  File /r "win32-msvc\target\gtk-dev\share\locale\it"
-  File /r "win32-msvc\target\gtk-dev\share\locale\nl"
-  File /r "win32-msvc\target\gtk-dev\share\locale\pl"
-  File /r "win32-msvc\target\gtk-dev\share\locale\pt_BR"
-  File /r "win32-msvc\target\gtk-dev\share\locale\ro"
-  File /r "win32-msvc\target\gtk-dev\share\locale\ru"
-  File /r "win32-msvc\target\gtk-dev\share\locale\zh_CN"
+  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