[grisbi-cvs] [SCM] grisbi branch, grisbi-0.8.x, updated. upstream_version_0_8_5-4-ge91c417

[chtibzh]

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, grisbi-0.8.x has been updated
       via  e91c4174083de06a572d1b22941f044b58fe906b (commit)
       via  158b534a71a985d6a5f0bf16d2446fa071ff3b96 (commit)
       via  293ae31f85f5d601c614e0dfd0a2357c77b48367 (commit)
       via  17322410f2084d91e30ffcde7813a8bab31f7ae0 (commit)
      from  49b08e410a658de32b8a5018ee05f2dd2dcc5219 (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 e91c4174083de06a572d1b22941f044b58fe906b
Author: chtibzh <didier.chevalier35 at gmailcom>
Date:   Fri Apr 15 21:32:20 2011 +0200

    move to libofx_mingw 0.9.3

commit 158b534a71a985d6a5f0bf16d2446fa071ff3b96
Merge: 293ae31f85f5d601c614e0dfd0a2357c77b48367 49b08e410a658de32b8a5018ee05f2dd2dcc5219
Author: chtibzh <didier.chevalier35 at gmailcom>
Date:   Fri Apr 15 21:25:55 2011 +0200

    Merge branch 'grisbi-0.8.x' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi into grisbi-0.8.x

commit 293ae31f85f5d601c614e0dfd0a2357c77b48367
Author: chtibzh <didier.chevalier35 at gmailcom>
Date:   Fri Apr 15 20:29:11 2011 +0200

    move dtd in share/libofx

commit 17322410f2084d91e30ffcde7813a8bab31f7ae0
Author: chtibzh <didier.chevalier35 at gmailcom>
Date:   Thu Apr 14 21:26:33 2011 +0200

    win32-mingw 0.8.5 with OFX

-----------------------------------------------------------------------

Changes:
diff --git a/win32-mingw/CMakeLists.txt b/win32-mingw/CMakeLists.txt
index 832f7a9..58a1142 100644
--- a/win32-mingw/CMakeLists.txt
+++ b/win32-mingw/CMakeLists.txt
@@ -118,7 +118,7 @@ ADD_DEFINITIONS(-DHAVE_STRING_H=1)
 #ADD_DEFINITIONS(-DNOOFX=1)
 # Define to 1 if you want to have OFX support using libofx 0.7.0
 ADD_DEFINITIONS(-DOFX_0_7=1)
-#ADD_DEFINITIONS(-DHAVE_OFX=1)
+ADD_DEFINITIONS(-DHAVE_OFX=1)
 
 # Define to 1 when you do not want to use SSL as crypt algorithm (NOT RECOMMANDED)
 #ADD_DEFINITIONS(-DNOSSL=1)
diff --git a/win32-mingw/prepare_Win32.cmd b/win32-mingw/prepare_Win32.cmd
index f1dd1ed..c12feac 100644
--- a/win32-mingw/prepare_Win32.cmd
+++ b/win32-mingw/prepare_Win32.cmd
@@ -8,7 +8,7 @@
 SET GTK_DEV_FILE_BASENAME=gtk+-bundle_2.22.1-20101227_win32
 SET LIBXML_FILE_BASENAME=libxml2-2.7.7.win32
 SET ICONV_FILE_BASENAME=iconv-1.9.2.win32
-SET OPENSSL_FILE_BASENAME=Win32OpenSSL-1_0_0c
+SET OPENSSL_FILE_BASENAME=Win32OpenSSL-1_0_0d
 
 :: The rest of the script should do the rest
 ::on met chcp 1252 qpour les wget car ils affiche en francais
@@ -81,7 +81,7 @@ echo openssl ok
 
 :: Download and unzip libofx dev and bin files
 cd "%DOWNLOADS_DIR%"
-chcp 1252 && wget -nc http://sourceforge.net/projects/grisbi/files/dependancies/0.7/libofx_Win32.zip/download
+chcp 1252 && wget -nc http://sourceforge.net/projects/grisbi/files/dependancies/0.7/libofx_mingw.zip/download
 cd "%TARGET_DIR%"
 unzip -uo "%DOWNLOADS_DIR%\libofx_Win32.zip" -d plugins-dev
 echo ofx ok
diff --git a/win32-mingw/windows_installer.nsi b/win32-mingw/windows_installer.nsi
index db2da2b..9ed9c23 100644
--- a/win32-mingw/windows_installer.nsi
+++ b/win32-mingw/windows_installer.nsi
@@ -20,9 +20,9 @@
 !define PRODUCT "Grisbi" ;Name of the project
 !define MAJOR "0"        ;Major version number
 !define MINOR "8"        ;Minor version number
-!define PATCH "4"        ;Patch version number
-!define STAGE "win32 mingw without ofx"     ;Developement stage id (RC, beta, alpha)
-!define SMALL_STAGE "win32_mingw_without_ofx" ;Small dev stage id without spaces
+!define PATCH "5"        ;Patch version number
+!define STAGE "win32 mingw with ofx"     ;Developement stage id (RC, beta, alpha)
+!define SMALL_STAGE "win32_mingw_with_ofx" ;Small dev stage id without spaces
 !define EXE_PATH "target\Win32" ;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
@@ -199,10 +199,11 @@ Section $(OFXplug)
 ;  SetOutPath "$INSTDIR\plugins"
 ;  File "${EXE_PATH}\plugins\libofxplg.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"
+  SetOutPath "$INSTDIR\share\libofx"
+  File /r "${PLUGINS_DEV_PATH}\libofx\bin\dtd"
+  SetOutPath "$INSTDIR"
+  File "${PLUGINS_DEV_PATH}\libofx\bin\libofx-4.dll"
+  File "${PLUGINS_DEV_PATH}\libofx\bin\libosp-5.dll"
 
 SectionEnd
 


hooks/post-receive
-- 
grisbi