[grisbi-cvs] [SCM] grisbi branch, grisbi-0.8.x, updated. upstream_version_0_8_4-3-gc547a9b
chtibzh
nobody at users.sourceforge.net
Tue Mar 22 23:09:40 CET 2011
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 c547a9bac54fc6b96a41cd745c1658456cd76848 (commit)
from 1468920b0eb12af03bbf1088b9887f2cb7de9d89 (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 c547a9bac54fc6b96a41cd745c1658456cd76848
Author: unknown <Didier at .(none)>
Date: Tue Mar 22 22:44:09 2011 +0100
update DATA-PATH
-----------------------------------------------------------------------
Changes:
diff --git a/src/main.c b/src/main.c
index 32a22fe..070dd87 100644
--- a/src/main.c
+++ b/src/main.c
@@ -847,7 +847,7 @@ gchar *gsb_main_get_print_dir_var ( void )
"\tC_PATH_CONFIG = %s\n"
"\tC_PATH_CONFIG_ACCELS = %s\n"
"\tC_PATH_DATA_FILES = %s\n\n"
- "\tDATA_PATH = %s\n\n"
+ "\tC_DATA_PATH = %s\n\n"
"\tGRISBI_LOCALEDIR = %s\n"
"\tGRISBI_PLUGINS_DIR = %s\n"
"\tGRISBI_PIXMAPS_DIR = %s\n\n",
diff --git a/win32-mingw/CMakeLists.txt b/win32-mingw/CMakeLists.txt
index 077c464..832f7a9 100644
--- a/win32-mingw/CMakeLists.txt
+++ b/win32-mingw/CMakeLists.txt
@@ -29,8 +29,8 @@ SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/target/${PlateformName})
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/target/${PlateformName}/plugins)
SET(PACKAGE_NAME grisbi)
set (grisbi_MAJOR 0)
-set (grisbi_MINOR 7)
-set (grisbi_PATCH 100)
+set (grisbi_MINOR 8)
+set (grisbi_PATCH 4)
set (grisbi_version "${grisbi_MAJOR}.${grisbi_MINOR}.${grisbi_PATCH} pour windows")
MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH)
MARK_AS_ADVANCED(grisbi_version)
@@ -115,15 +115,14 @@ ADD_DEFINITIONS(-DHAVE_SETLOCALE=1)
ADD_DEFINITIONS(-DHAVE_STRING_H=1)
# Define to 1 to have OFX support disabled
-ADD_DEFINITIONS(-DNOOFX=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)
# Define to 1 when you do not want to use SSL as crypt algorithm (NOT RECOMMANDED)
#ADD_DEFINITIONS(-DNOSSL=1)
-
-#Define to 1 to have grisbi plugins management system activated
-ADD_DEFINITIONS(-DHAVE_PLUGINS=1)
+ADD_DEFINITIONS(-DHAVE_SSL=1)
#Define to 1 to enable static plugins
ADD_DEFINITIONS(-DENABLE_STATIC=1)
@@ -151,7 +150,7 @@ TARGET_LINK_LIBRARIES( grisbi
pango-1.0
pangocairo-1.0
zdll
- # ofx
+ ofx
gnucash
openssl
)
@@ -160,13 +159,13 @@ TARGET_LINK_LIBRARIES( grisbi
# PROPERTIES ENABLE_EXPORTS 1
# )
-# ADD_LIBRARY ( ofx
- # STATIC
- # ../src/plugins/ofx/ofx.c
- # ../src/plugins/ofx/ofx.h
-# )
+ADD_LIBRARY ( ofx
+ STATIC
+ ../src/plugins/ofx/ofx.c
+ ../src/plugins/ofx/ofx.h
+)
-ADD_CUSTOM_COMMAND ( TARGET ofxplg
+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}
@@ -179,12 +178,12 @@ ADD_LIBRARY ( gnucash
../src/plugins/gnucash/gnucash.h
)
-# ADD_CUSTOM_COMMAND ( TARGET gnucash
- # POST_BUILD
+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 ${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}
+)
ADD_LIBRARY ( openssl
STATIC
@@ -200,12 +199,12 @@ ADD_CUSTOM_COMMAND ( TARGET openssl
# ADD_DEPENDENCIES (ofx grisbi)
#SET_TARGET_PROPERTIES(ofx PROPERTIES LINK_FLAGS "-no-undefined --enable-runtime-pseudo-reloc")
-# TARGET_LINK_LIBRARIES (ofx
- # glib-2.0
- # intl
- # libofx
+TARGET_LINK_LIBRARIES (ofx
+ glib-2.0
+ intl
+ libofx
# grisbi
-# )
+)
# ADD_DEPENDENCIES (gnucash grisbi)
TARGET_LINK_LIBRARIES (gnucash
diff --git a/win32-mingw/windows_installer.nsi b/win32-mingw/windows_installer.nsi
index e71a780..db2da2b 100644
--- a/win32-mingw/windows_installer.nsi
+++ b/win32-mingw/windows_installer.nsi
@@ -19,10 +19,10 @@
!define PRODUCT "Grisbi" ;Name of the project
!define MAJOR "0" ;Major version number
-!define MINOR "7" ;Minor version number
-!define PATCH "100" ;Patch version number
-!define STAGE "mingw testing pre release" ;Developement stage id (RC, beta, alpha)
-!define SMALL_STAGE "mingw_test_pre_rel" ;Small dev stage id without spaces
+!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 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
diff --git a/win32/win32utils.h b/win32/win32utils.h
index d036816..fde472c 100644
--- a/win32/win32utils.h
+++ b/win32/win32utils.h
@@ -69,7 +69,7 @@ extern void win32_parse_gtkrc (const gchar* basename);
#define HELP_PATH win32_app_subdir_folder_path("help") /* help */
#define LOCALEDIR win32_app_subdir_folder_path("lib/locale") /* locale */
#define LOGO_PATH win32_app_subdir_folder_path("pixmaps/grisbi-logo.png")
-#define DATA_PATH win32_app_subdir_folder_path("help/tips")
+#define DATA_PATH win32_app_subdir_folder_path("share")
#define PLUGINS_DIR win32_app_subdir_folder_path("plugins")
// -------------------------------------------------------------------------
hooks/post-receive
--
grisbi
More information about the cvs
mailing list