[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_5-41-g8423b3c
chtibzh
nobody at users.sourceforge.net
Sun Jan 1 21:53:32 CET 2012
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 8423b3c686f7830c42547d77c9f3e39df6ad34dc (commit)
via acc09163d3917c96509aeabcd32ae303feaeabba (commit)
via c368b98ac92f24c7a97cadb880fdfc60c3b1b95b (commit)
via afee0d2a3ce0c77d0ab5e36938fe4498c7524a26 (commit)
via a3b725368fc4bbb54af7b93218252923cc5ce01e (commit)
via 5dd4f1175d2865af20f983d3f5394fa258fe4295 (commit)
via ef24380585d39a46fcf3536eb8a560671f33b418 (commit)
via 6ae6ccc09e16529c7ff594d212202be202287c41 (commit)
via ff9d5feba18e8a5658128eda62dbe88cd84cbe88 (commit)
via e00f761a7f15971604ea5d3696eda668e1c01d16 (commit)
via 46ae5df358289738551f468f2fd065e4ebdb3307 (commit)
via 369c91b077874e3a2da504e329ef28d95a9f1cd8 (commit)
via ea7902a771a9b0c6a782e28095f0367e65dca38d (commit)
via db759c1ccda4693d130d3bde39c488633d1555c7 (commit)
via 3c39e8c2fc217215a21e6c55140e6d24d4c9cd03 (commit)
via 07f60f44fa2b1078d6b6b9863d206e0c2c3243e6 (commit)
via 0db9760dba6cd954645a6361334252ed9c938850 (commit)
via 55431a3e22c71d6beb4290a5cccd31f153e34a09 (commit)
via 3e8a308e413b843e092122577c0407d96edf58fa (commit)
via d958bc473d1fea43a6f06cff85a5c0afa45e44fa (commit)
via e2896a438fca3d67291385d608b761338698723e (commit)
via d71643295e70bfbf728ba8063144e6868690b5bd (commit)
via 19add8087c85af112616936af99bb4365229baa6 (commit)
via 635990d82dfdbb06523c40cfbc7d1f51918739a0 (commit)
via fe744322436a9858c239e8d2998f48cf9c4c07c8 (commit)
via 342eacaa2d875aa3dea08239422f9287fdf0a197 (commit)
via aa50e1f243490db4688f31f8bcd02724165df198 (commit)
via 3155e249298cb426af6494325f491674dbcd3ba9 (commit)
via 888db1583e33ffce29dec185cb0fc0ed3373f680 (commit)
via 0e34b6b1b93f86215686db488ef64df4fd18675a (commit)
via dbc059ba0c700d63d581ead5ed035efac9a17849 (commit)
via 1887e86adf454becd4672cbd63e2a50019613133 (commit)
via 66f56934126cb8a121635757be7514e508c1d9ae (commit)
via c975d6fc8c8f9e3ba01f4c2009a536a5c3c7334b (commit)
via cb5aac65f41c7dd8c58f975ff680717615dec013 (commit)
via 863a94361f05921486a84b25485079ea5bdf5af0 (commit)
via 859303f544f288fd944a40f747004297afb72b50 (commit)
via 030102b1b07f7f492adddae9af097ed7d78f3882 (commit)
via ebdb121fc1ace44878be5e9c63c3e06198518bca (commit)
via 8bd0d5c922c5d4477f7acb1e8a253d7a19fe6ffa (commit)
via ac1596b4ef8e13f14ddf9b5082ebb3b7fa08ce6e (commit)
from 0c8a0230a8e894d36dbdac5392cb4c65f60d429b (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 8423b3c686f7830c42547d77c9f3e39df6ad34dc
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sun Jan 1 21:52:25 2012 +0100
add goffice to windows build
move lib and include path to mingw
commit acc09163d3917c96509aeabcd32ae303feaeabba
Merge: c368b98 0c8a023
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sun Jan 1 20:42:21 2012 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit c368b98ac92f24c7a97cadb880fdfc60c3b1b95b
Merge: afee0d2 e60c2d9
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sat Dec 31 14:34:50 2011 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit afee0d2a3ce0c77d0ab5e36938fe4498c7524a26
Merge: a3b7253 ec25130
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Thu Dec 29 20:19:16 2011 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit a3b725368fc4bbb54af7b93218252923cc5ce01e
Merge: 5dd4f11 274dd43
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sat Dec 10 15:12:49 2011 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 5dd4f1175d2865af20f983d3f5394fa258fe4295
Merge: ef24380 fd88302
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sun Dec 4 20:24:58 2011 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit ef24380585d39a46fcf3536eb8a560671f33b418
Merge: 6ae6ccc 6cbad1f
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sun Nov 27 21:38:12 2011 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 6ae6ccc09e16529c7ff594d212202be202287c41
Merge: ff9d5fe e9f772f
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Mon Nov 14 21:16:38 2011 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit ff9d5feba18e8a5658128eda62dbe88cd84cbe88
Merge: e00f761 4057a71
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sat Nov 12 15:19:54 2011 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit e00f761a7f15971604ea5d3696eda668e1c01d16
Merge: 46ae5df 889a412
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Wed Nov 9 22:28:58 2011 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 46ae5df358289738551f468f2fd065e4ebdb3307
Merge: 369c91b 3d552d7
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Tue Nov 8 19:11:13 2011 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 369c91b077874e3a2da504e329ef28d95a9f1cd8
Merge: ea7902a 9442450
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sat Nov 5 18:06:06 2011 +0100
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit ea7902a771a9b0c6a782e28095f0367e65dca38d
Merge: db759c1 2b5a21d
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Thu Oct 27 19:57:49 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit db759c1ccda4693d130d3bde39c488633d1555c7
Merge: 3c39e8c a54495d
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Wed Oct 26 13:41:44 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 3c39e8c2fc217215a21e6c55140e6d24d4c9cd03
Merge: 07f60f4 0a0a58d
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sun Oct 23 16:46:58 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 07f60f44fa2b1078d6b6b9863d206e0c2c3243e6
Merge: 0db9760 409f096
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sat Oct 22 17:54:20 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 0db9760dba6cd954645a6361334252ed9c938850
Merge: 55431a3 a9f0434
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sat Oct 15 08:38:59 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 55431a3e22c71d6beb4290a5cccd31f153e34a09
Merge: 3e8a308 07c9fe0
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sun Oct 9 21:43:36 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 3e8a308e413b843e092122577c0407d96edf58fa
Merge: d958bc4 00ddaed
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sat Oct 8 08:53:12 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit d958bc473d1fea43a6f06cff85a5c0afa45e44fa
Merge: e2896a4 f362015
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sat Oct 1 21:30:42 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit e2896a438fca3d67291385d608b761338698723e
Merge: d716432 d8c3446
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sat Oct 1 18:08:37 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit d71643295e70bfbf728ba8063144e6868690b5bd
Merge: 19add80 2d0ebe6
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Fri Sep 30 18:56:52 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 19add8087c85af112616936af99bb4365229baa6
Merge: 635990d 03a109a
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Thu Sep 29 19:43:38 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 635990d82dfdbb06523c40cfbc7d1f51918739a0
Merge: fe74432 7e4ecf7
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Wed Sep 28 23:00:19 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit fe744322436a9858c239e8d2998f48cf9c4c07c8
Merge: 342eaca b35d74c
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sun Sep 25 11:51:23 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 342eacaa2d875aa3dea08239422f9287fdf0a197
Merge: aa50e1f 538c9c9
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Fri Sep 23 06:48:26 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit aa50e1f243490db4688f31f8bcd02724165df198
Merge: 3155e24 93e485e
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Mon Sep 19 21:49:38 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 3155e249298cb426af6494325f491674dbcd3ba9
Merge: 888db15 4083f94
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Fri Sep 2 19:28:22 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 888db1583e33ffce29dec185cb0fc0ed3373f680
Merge: 0e34b6b b2ca7a2
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sun Aug 21 10:48:26 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 0e34b6b1b93f86215686db488ef64df4fd18675a
Merge: dbc059b 5c7bb10
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sun Aug 14 16:28:41 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit dbc059ba0c700d63d581ead5ed035efac9a17849
Merge: 1887e86 0ac63f1
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sun Aug 7 12:05:26 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 1887e86adf454becd4672cbd63e2a50019613133
Merge: 66f5693 c5515cf
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Tue Jul 26 21:32:19 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 66f56934126cb8a121635757be7514e508c1d9ae
Merge: c975d6f 25dab4b
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Mon Jul 18 20:07:16 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit c975d6fc8c8f9e3ba01f4c2009a536a5c3c7334b
Merge: cb5aac6 77236f7
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Thu Jun 30 22:38:42 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit cb5aac65f41c7dd8c58f975ff680717615dec013
Merge: 863a943 368ed8c
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Fri Jun 17 21:12:08 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 863a94361f05921486a84b25485079ea5bdf5af0
Merge: 859303f 64e6989
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Mon Jun 13 12:05:46 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 859303f544f288fd944a40f747004297afb72b50
Merge: 030102b d77ef3b
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sun Jun 12 21:46:05 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 030102b1b07f7f492adddae9af097ed7d78f3882
Merge: ebdb121 f18ffbb
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Sat Jun 11 17:24:09 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit ebdb121fc1ace44878be5e9c63c3e06198518bca
Merge: 8bd0d5c a3fef2a
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Wed Jun 8 19:48:21 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit 8bd0d5c922c5d4477f7acb1e8a253d7a19fe6ffa
Merge: ac1596b 5d328df
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Tue Jun 7 22:06:55 2011 +0200
Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi
commit ac1596b4ef8e13f14ddf9b5082ebb3b7fa08ce6e
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Mon Jun 6 22:11:27 2011 +0200
back to OFX_ for any OS
-----------------------------------------------------------------------
Changes:
diff --git a/src/plugins/ofx/ofx.c b/src/plugins/ofx/ofx.c
index 867a88d..b6e8047 100644
--- a/src/plugins/ofx/ofx.c
+++ b/src/plugins/ofx/ofx.c
@@ -193,11 +193,11 @@ int ofx_proc_status_cb(struct OfxStatusData data, void * status_data)
{
switch ( data.severity )
{
- case INFO :
+ case OFX_INFO :
/* pas de pb, on fait rien */
break;
- case WARN :
+ case OFX_WARN :
if ( data.code_valid )
dialogue_warning ( g_strconcat ( _("OFX processing returned following message:\n"),
data.name,
@@ -209,7 +209,7 @@ int ofx_proc_status_cb(struct OfxStatusData data, void * status_data)
/* erreur_import_ofx = 1; */
break;
- case ERROR:
+ case OFX_ERROR:
if ( data.code_valid )
dialogue_error ( g_strconcat ( _("OFX processing returned following error message:\n"),
data.name,
diff --git a/src/plugins/ofx/ofx.h b/src/plugins/ofx/ofx.h
index d08d6b9..116f4fd 100644
--- a/src/plugins/ofx/ofx.h
+++ b/src/plugins/ofx/ofx.h
@@ -12,4 +12,41 @@ G_MODULE_EXPORT extern gpointer ofx_plugin_run ( GtkWidget * assistant,
/* END_DECLARATION */
+/* It seems the following applies to everyone, otherwise OFX_* are not defined */
+/* #ifdef _WIN32 */
+/* On Windows, the Ofx Severity enumerate values are already used in wingdi.h, DELETE is used in winnt.h
+ * This is a work around to this issues :
+ * INFO, WARN, ERROR, DELETE and REPLACE are used in standard libofx.h;
+ * on windows they should be prefixed by OFX_
+ */
+
+#ifndef _MINGW
+
+#ifndef OFX_INFO
+#define OFX_INFO INFO
+#endif
+
+#ifndef OFX_WARN
+#define OFX_WARN WARN
+#endif
+
+#ifndef OFX_ERROR
+#if defined(_MSC_VER) || defined(_MINGW)
+#undef ERROR
+#endif /* _MSC_VER */
+#define OFX_ERROR ERROR
+#endif
+
+#ifndef OFX_DELETE
+#define OFX_DELETE DELETE
+#endif
+
+#ifndef OFX_REPLACE
+#define OFX_REPLACE REPLACE
+#endif
+
+#endif /* _MIN_GW */
+
+/* #endif _WIN32 */
+
#endif /* GSB_OFX_H */
diff --git a/win32-mingw/CMakeLists.txt b/win32-mingw/CMakeLists.txt
index 6afa534..fe49977 100644
--- a/win32-mingw/CMakeLists.txt
+++ b/win32-mingw/CMakeLists.txt
@@ -16,8 +16,12 @@ if (MINGW)
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
set(STATIC_SCRIPT_BINDINGS TRUE)
# SET(BUILD_SHARED_LIBS ON)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mms-bitfields")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mms-bitfields")
+# set(CMAKE_VERBOSE_MAKEFILE ON)
+ set(CMAKE_BUILD_TYPE Debug)
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -mms-bitfields")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mms-bitfields")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mms-bitfields")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mms-bitfields")
endif (MINGW)
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/modules_cmakes)
@@ -30,26 +34,28 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/target/${PlateformName}/plugins)
SET(PACKAGE_NAME grisbi)
set (grisbi_MAJOR 0)
set (grisbi_MINOR 9)
-set (grisbi_PATCH 2)
+set (grisbi_PATCH 5)
set (grisbi_version "${grisbi_MAJOR}.${grisbi_MINOR}.${grisbi_PATCH} pour windows")
MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH)
MARK_AS_ADVANCED(grisbi_version)
configure_file (config.h.cmake config.h)
+SET (MINGW_DIR C:/MinGW)
+SET (MYSYS_DIR ${MINGW_DIR}/msys/1.0)
INCLUDE_DIRECTORIES(
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include/atk-1.0
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include/cairo
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include/glib-2.0
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include/gtk-2.0
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include/pango-1.0
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include/gdk-pixbuf-2.0
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/lib/glib-2.0/include
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/lib/gtk-2.0/include
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/libofx/include
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/libxml2/include
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/iconv/include
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/openssl/include
+ ${MINGW_DIR}/include
+ ${MINGW_DIR}/include/atk-1.0
+ ${MINGW_DIR}/include/cairo
+ ${MINGW_DIR}/include/gtk-2.0
+ ${MINGW_DIR}/lib/gtk-2.0/include
+ ${MINGW_DIR}/include/glib-2.0
+ ${MINGW_DIR}/lib/glib-2.0/include
+ ${MINGW_DIR}/include/pango-1.0
+ ${MINGW_DIR}/include/gdk-pixbuf-2.0
+ ${MYSYS_DIR}/local/include/
+ ${MYSYS_DIR}/local/include/libxml2/include
+ ${MYSYS_DIR}/local/include/libgoffice-0.8/
+ ${MINGW_DIR}/include/libgsf-1
${PROJECT_SOURCE_DIR}/../win32
${PROJECT_SOURCE_DIR}/../win32-msvc/src
${PROJECT_SOURCE_DIR}
@@ -60,12 +66,11 @@ INCLUDE_DIRECTORIES(
${PROJECT_BINARY_DIR}
)
LINK_DIRECTORIES(
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/lib
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/libofx/lib
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/libxml2/lib
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/iconv/lib
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/openssl/lib
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/openssl/lib/VC
+# ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/openssl/lib
+# ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/openssl/lib/VC
+ ${MYSYS_DIR}/local/lib
+ ${MYSYS_DIR}/local/bin
+ ${MINGW}/bin
${PROJECT_SOURCE_DIR}
${PROJECT_BINARY_DIR}
)
@@ -124,6 +129,9 @@ ADD_DEFINITIONS(-DHAVE_OFX=1)
#ADD_DEFINITIONS(-DNOSSL=1)
ADD_DEFINITIONS(-DHAVE_SSL=1)
+# Define to 1 to get goffice support
+ADD_DEFINITIONS(-DHAVE_GOFFICE=1)
+
#Define to 1 to enable static plugins
ADD_DEFINITIONS(-DENABLE_STATIC=1)
@@ -150,6 +158,7 @@ TARGET_LINK_LIBRARIES( grisbi
pango-1.0
pangocairo-1.0
zdll
+ goffice-0.8-8
ofx
gnucash
openssl
@@ -168,8 +177,9 @@ ADD_LIBRARY ( ofx
ADD_CUSTOM_COMMAND ( TARGET ofx
POST_BUILD
#COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/${TargetDir}/ofx.dll ${PROJECT_BINARY_DIR}//target/${PlateformName}/plugins
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/libofx/bin ${PROJECT_BINARY_DIR}/target/${PlateformName}
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/libofx/bin/dtd ${PROJECT_BINARY_DIR}/target/${PlateformName}/dtd
+ COMMAND ${CMAKE_COMMAND} -E copy ${MYSYS_DIR}/local/bin/libofx-5.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MYSYS_DIR}/local/bin/libosp-5.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${MYSYS_DIR}/local/libofx/dtd ${PROJECT_BINARY_DIR}/target/${PlateformName}/dtd
)
ADD_LIBRARY ( gnucash
@@ -181,8 +191,8 @@ ADD_LIBRARY ( gnucash
ADD_CUSTOM_COMMAND ( TARGET gnucash
POST_BUILD
#COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/${TargetDir}/gnucash.dll target\\${PlateformName}\\${OutDir}\\plugins
- COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/libxml2/bin/libxml2.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
- COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/iconv/bin/iconv.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MYSYS_DIR}/local/bin/libxml2-2.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libiconv-2.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
)
ADD_LIBRARY ( openssl
@@ -194,7 +204,8 @@ ADD_LIBRARY ( openssl
ADD_CUSTOM_COMMAND ( TARGET openssl
POST_BUILD
#COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/target/openssl.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}/plugins
- COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/openssl/bin/libeay32.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MYSYS_DIR}/local/bin/libeay32.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MYSYS_DIR}/local/bin/ssleay32.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
)
# ADD_DEPENDENCIES (ofx grisbi)
@@ -202,7 +213,7 @@ ADD_CUSTOM_COMMAND ( TARGET openssl
TARGET_LINK_LIBRARIES (ofx
glib-2.0
intl
- libofx
+ libofx-5
# grisbi
)
@@ -211,8 +222,8 @@ TARGET_LINK_LIBRARIES (gnucash
glib-2.0
intl
# grisbi
- libxml2
- iconv
+ libxml2-2
+ libiconv
)
# ADD_DEPENDENCIES (openssl grisbi)
# SET_TARGET_PROPERTIES(openssl PROPERTIES LINK_FLAGS -enable-auto-import)
@@ -234,6 +245,33 @@ ADD_CUSTOM_COMMAND(TARGET prepare_env
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/../pixmaps ${PROJECT_BINARY_DIR}/target/${PlateformName}/pixmaps
COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/../help ${PROJECT_BINARY_DIR}/target/${PlateformName}/help
+ COMMAND ${CMAKE_COMMAND} -E copy ${MYSYS_DIR}/local/bin/libgoffice-0.8-8.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/freetype6.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/intl.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libatk-1.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libcairo-2.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libexpat-1.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libfontconfig-1.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libgcc_s_dw2-1.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libgdk-win32-2.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libgdk_pixbuf-2.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libgio-2.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libglib-2.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libgmodule-2.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libgobject-2.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libgsf-1-114.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libgthread-2.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libgtk-win32-2.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libiconv-2.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libpango-1.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libpangocairo-1.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libpangoft2-1.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libpangowin32-1.0-0.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libpng14-14.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libstdc++-6.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/pcre3.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/pthreadgc2.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/zlib1.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
)
if (HELLO_NLS_ENABLED)
@@ -268,4 +306,4 @@ if (HELLO_NLS_ENABLED)
else(HELLO_NLS_ENABLED)
ADD_DEFINITIONS(-DENABLE_NLS=0)
message (STATUS "Native language support disabled.")
-endif(HELLO_NLS_ENABLED)
+endif(HELLO_NLS_ENABLED)
\ No newline at end of file
diff --git a/win32-mingw/prepare_Win32.cmd b/win32-mingw/prepare_Win32.cmd
index 6d5f69a..16d66f9 100644
--- a/win32-mingw/prepare_Win32.cmd
+++ b/win32-mingw/prepare_Win32.cmd
@@ -6,10 +6,11 @@
:: Specify the BUNDLE file
:: Don't include the extension
SET GTK_DEV_FILE_BASENAME=gtk+-bundle_2.18.7-20100213_win32
+:: gtk+-bundle_2.24.5-20110713_win32.zip
SET ZLIB_DEV_FILE_BASENAME%=zlib_1.2.5-2_win32
-SET LIBXML_FILE_BASENAME=libxml2-2.7.7.win32
+SET LIBXML_FILE_BASENAME=libxml2-2.7.8.win32
SET ICONV_FILE_BASENAME=iconv-1.9.2.win32
-SET OPENSSL_FILE_BASENAME=Win32OpenSSL-1_0_0d
+SET OPENSSL_FILE_BASENAME=Win32OpenSSL-1_0_0e
:: The rest of the script should do the rest
::on met chcp 1252 qpour les wget car ils affiche en francais
@@ -89,6 +90,7 @@ echo ofx ok
cd "%DOWNLOADS_DIR%"
chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/%GTK_DEV_FILE_BASENAME%.zip
+:: http://www.optionexplicit.be/projects/gnome-windows/20111020/gtk+-bundle_test_gtk-2-24-win32_branch3.zip
chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/%ZLIB_DEV_FILE_BASENAME%.zip
:: Checking if already unzipped
diff --git a/win32-mingw/windows_installer.nsi b/win32-mingw/windows_installer.nsi
index 6c041fd..c40d07c 100644
--- a/win32-mingw/windows_installer.nsi
+++ b/win32-mingw/windows_installer.nsi
@@ -20,7 +20,7 @@
!define PRODUCT "Grisbi" ;Name of the project
!define MAJOR "0" ;Major version number
!define MINOR "9" ;Minor version number
-!define PATCH "2" ;Patch version number
+!define PATCH "5" ;Patch version number
!define STAGE "win32 mingw" ;Developement stage id (RC, beta, alpha)
!define SMALL_STAGE "win32_mingw" ;Small dev stage id without spaces
!define EXE_PATH "target\Win32" ;Path to the exe file you want to pack
@@ -132,7 +132,7 @@ Section $(ProgFiles)
SetOutPath "$INSTDIR"
File /r /x Makefile.am /x Makefile.in /x *.lib "${EXE_PATH}\help"
- File /r /x Makefile.am /x Makefile.in /x *.lib "${EXE_PATH}\pixmaps"
+ File /r /x Makefile.am /x Makefile.in /x *.lib /x libgoffice "${EXE_PATH}\pixmaps"
File "${EXE_PATH}\grisbi.exe"
File "${EXE_PATH}\*.dll"
File ..\win32\grisbi.ico
@@ -142,6 +142,10 @@ Section $(ProgFiles)
File /r /x Makefile.am /x Makefile.in /x *.lib "${EXE_PATH}\lib\*.*"
SetOutPath "$INSTDIR\share"
File /r ..\share\*.*
+ SetOutPath "$INSTDIR\share\ui"
+ File /r "${EXE_PATH}\share\ui\*.*"
+ SetOutPath "$INSTDIR\share\goffice"
+ File /r "${EXE_PATH}\share\goffice\*.*"
;Store installation folder
WriteRegStr HKLM "Software\${FULLNAME}" "" $INSTDIR
diff --git a/win32/win32utils.h b/win32/win32utils.h
index d036816..acd45c5 100644
--- a/win32/win32utils.h
+++ b/win32/win32utils.h
@@ -71,6 +71,7 @@ extern void win32_parse_gtkrc (const gchar* basename);
#define LOGO_PATH win32_app_subdir_folder_path("pixmaps/grisbi-logo.png")
#define DATA_PATH win32_app_subdir_folder_path("help/tips")
#define PLUGINS_DIR win32_app_subdir_folder_path("plugins")
+#define UI_DIR win32_app_subdir_folder_path("share/ui")
// -------------------------------------------------------------------------
// Windows(c) Version ID and Technology PART_3
hooks/post-receive
--
grisbi
More information about the cvs
mailing list