[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_1-65-g9bdea03
chtibzh
nobody at users.sourceforge.net
Wed May 25 22:07:31 CEST 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, master has been updated
via 9bdea03deb64d2655362d8e9f12b385bac074fb4 (commit)
from 3d46eea25705948ff628d9f67e0dbb480d284858 (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 9bdea03deb64d2655362d8e9f12b385bac074fb4
Author: Chtibzh <didier.chevalier35 at gmail.com>
Date: Wed May 25 22:06:29 2011 +0200
move to win32 gtk 2.18 and zlib 1.2.5
-----------------------------------------------------------------------
Changes:
diff --git a/src/plugins/ofx/ofx.c b/src/plugins/ofx/ofx.c
index a719344..b6e8047 100644
--- a/src/plugins/ofx/ofx.c
+++ b/src/plugins/ofx/ofx.c
@@ -36,34 +36,6 @@
#include "erreur.h"
/*END_INCLUDE*/
-/* 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_
- * libofx.h therefore needs to be patched on windows.
- */
-
-#ifndef OFX_INFO
-#define OFX_INFO INFO
-#endif
-
-#ifndef OFX_WARN
-#define OFX_WARN WARN
-#endif
-
-#ifndef OFX_ERROR
-#define OFX_ERROR ERROR
-#endif
-
-#ifndef OFX_DELETE
-#define OFX_DELETE DELETE
-#endif
-
-#ifndef OFX_REPLACE
-#define OFX_REPLACE REPLACE
-#endif
-
-
/*START_EXTERN*/
/*END_EXTERN*/
diff --git a/win32-mingw/CMakeLists.txt b/win32-mingw/CMakeLists.txt
index 077c464..6afa534 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 9)
+set (grisbi_PATCH 2)
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/prepare_Win32.cmd b/win32-mingw/prepare_Win32.cmd
index f1dd1ed..6d5f69a 100644
--- a/win32-mingw/prepare_Win32.cmd
+++ b/win32-mingw/prepare_Win32.cmd
@@ -5,10 +5,11 @@
:: Get this file name from http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/
:: Specify the BUNDLE file
:: Don't include the extension
-SET GTK_DEV_FILE_BASENAME=gtk+-bundle_2.22.1-20101227_win32
+SET GTK_DEV_FILE_BASENAME=gtk+-bundle_2.18.7-20100213_win32
+SET ZLIB_DEV_FILE_BASENAME%=zlib_1.2.5-2_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,13 +82,15 @@ 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
+unzip -uo "%DOWNLOADS_DIR%\libofx_mingw.zip" -d plugins-dev
echo ofx ok
cd "%DOWNLOADS_DIR%"
-chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.22/%GTK_DEV_FILE_BASENAME%.zip
+chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/%GTK_DEV_FILE_BASENAME%.zip
+chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/%ZLIB_DEV_FILE_BASENAME%.zip
+
:: Checking if already unzipped
:: If the readme file exists for this version, update the unzip
cd "%TARGET_DIR%"
@@ -95,6 +98,7 @@ IF NOT EXIST gtk-dev (
echo GTK+ development files not present.
echo Unzipping the archive now...
unzip "%DOWNLOADS_DIR%\%GTK_DEV_FILE_BASENAME%" -d gtk-dev
+ unzip -uo "%DOWNLOADS_DIR%\%ZLIB_DEV_FILE_BASENAME%" -d gtk-dev
echo Done unzipping archive!
)
IF EXIST gtk-dev\%GTK_DEV_FILE_BASENAME%.README.txt (
diff --git a/win32-mingw/windows_installer.nsi b/win32-mingw/windows_installer.nsi
index e71a780..6c041fd 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 "9" ;Minor version number
+!define PATCH "2" ;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
!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
diff --git a/win32-msvc/CMakeLists.txt b/win32-msvc/CMakeLists.txt
index 99baeee..2ed2e12 100644
--- a/win32-msvc/CMakeLists.txt
+++ b/win32-msvc/CMakeLists.txt
@@ -101,288 +101,8 @@ LINK_DIRECTORIES(
)
SET (grisbi_source
- ../src/accueil.c
- ../src/accueil.h
- ../src/affichage.c
- ../src/affichage.h
- ../src/affichage_liste.c
- ../src/affichage_liste.h
- ../src/bet_config.c
- ../src/bet_config.h
- ../src/bet_data.c
- ../src/bet_data.h
- ../src/bet_data_finance.c
- ../src/bet_data_finance.h
- ../src/bet_finance_ui.c
- ../src/bet_finance_ui.h
- ../src/bet_future.c
- ../src/bet_future.h
- ../src/bet_hist.c
- ../src/bet_hist.h
- ../src/bet_tab.c
- ../src/bet_tab.h
- ../src/categories_onglet.c
- ../src/categories_onglet.h
- ../src/classement_echeances.c
- ../src/classement_echeances.h
- ../src/csv_parse.c
- ../src/csv_parse.h
- ../src/custom_list.c
- ../src/custom_list.h
- ../src/dialog.c
- ../src/dialog.h
- ../src/erreur.c
- ../src/erreur.h
- ../src/etats.h
- ../src/etats_affiche.c
- ../src/etats_affiche.h
- ../src/etats_calculs.c
- ../src/etats_calculs.h
- ../src/etats_config.c
- ../src/etats_config.h
- ../src/etats_csv.c
- ../src/etats_csv.h
- ../src/etats_gtktable.c
- ../src/etats_gtktable.h
- ../src/etats_html.c
- ../src/etats_html.h
- ../src/etats_latex.c
- ../src/etats_latex.h
- ../src/etats_onglet.c
- ../src/etats_onglet.h
- ../src/etats_support.c
- ../src/etats_support.h
- ../src/export.c
- ../src/export.h
- ../src/export_csv.c
- ../src/export_csv.h
- ../src/fenetre_principale.c
- ../src/fenetre_principale.h
- ../src/file_obfuscate.c
- ../src/file_obfuscate.h
- ../src/file_obfuscate_qif.c
- ../src/file_obfuscate_qif.h
- ../src/go-charmap-sel.c
- ../src/go-charmap-sel.h
- ../src/go-optionmenu.c
- ../src/go-optionmenu.h
- ../src/gsb_account.c
- ../src/gsb_account.h
- ../src/gsb_account_property.c
- ../src/gsb_account_property.h
- ../src/gsb_archive_config.c
- ../src/gsb_archive_config.h
- ../src/gsb_assistant.c
- ../src/gsb_assistant.h
- ../src/gsb_assistant_account.c
- ../src/gsb_assistant_account.h
- ../src/gsb_assistant_archive.c
- ../src/gsb_assistant_archive.h
- ../src/gsb_assistant_archive_export.c
- ../src/gsb_assistant_archive_export.h
- ../src/gsb_assistant_file.c
- ../src/gsb_assistant_file.h
- ../src/gsb_assistant_first.c
- ../src/gsb_assistant_first.h
- ../src/gsb_assistant_reconcile_config.c
- ../src/gsb_assistant_reconcile_config.h
- ../src/gsb_autofunc.c
- ../src/gsb_autofunc.h
- ../src/gsb_automem.c
- ../src/gsb_automem.h
- ../src/gsb_bank.c
- ../src/gsb_bank.h
- ../src/gsb_calendar.c
- ../src/gsb_calendar.h
- ../src/gsb_calendar_entry.c
- ../src/gsb_calendar_entry.h
- ../src/gsb_category.c
- ../src/gsb_category.h
- ../src/gsb_combo_box.c
- ../src/gsb_combo_box.h
- ../src/gsb_currency.c
- ../src/gsb_currency.h
- ../src/gsb_currency_config.c
- ../src/gsb_currency_config.h
- ../src/gsb_currency_link_config.c
- ../src/gsb_currency_link_config.h
- ../src/gsb_data_account.c
- ../src/gsb_data_account.h
- ../src/gsb_data_archive.c
- ../src/gsb_data_archive.h
- ../src/gsb_data_archive_store.c
- ../src/gsb_data_archive_store.h
- ../src/gsb_data_bank.c
- ../src/gsb_data_bank.h
- ../src/gsb_data_budget.c
- ../src/gsb_data_budget.h
- ../src/gsb_data_category.c
- ../src/gsb_data_category.h
- ../src/gsb_data_currency.c
- ../src/gsb_data_currency.h
- ../src/gsb_data_currency_link.c
- ../src/gsb_data_currency_link.h
- ../src/gsb_data_form.c
- ../src/gsb_data_form.h
- ../src/gsb_data_fyear.c
- ../src/gsb_data_fyear.h
- ../src/gsb_data_import_rule.c
- ../src/gsb_data_import_rule.h
- ../src/gsb_data_mix.c
- ../src/gsb_data_mix.h
- ../src/gsb_data_partial_balance.c
- ../src/gsb_data_partial_balance.h
- ../src/gsb_data_payee.c
- ../src/gsb_data_payee.h
- ../src/gsb_data_payment.c
- ../src/gsb_data_payment.h
- ../src/gsb_data_print_config.c
- ../src/gsb_data_print_config.h
- ../src/gsb_data_reconcile.c
- ../src/gsb_data_reconcile.h
- ../src/gsb_data_report.c
- ../src/gsb_data_report.h
- ../src/gsb_data_report_amout_comparison.c
- ../src/gsb_data_report_amout_comparison.h
- ../src/gsb_data_report_text_comparison.c
- ../src/gsb_data_report_text_comparison.h
- ../src/gsb_data_scheduled.c
- ../src/gsb_data_scheduled.h
- ../src/gsb_data_transaction.c
- ../src/gsb_data_transaction.h
- ../src/gsb_debug.c
- ../src/gsb_debug.h
- ../src/gsb_file.c
- ../src/gsb_file.h
- ../src/gsb_file_config.c
- ../src/gsb_file_config.h
- ../src/gsb_file_load.c
- ../src/gsb_file_load.h
- ../src/gsb_file_others.c
- ../src/gsb_file_others.h
- ../src/gsb_file_save.c
- ../src/gsb_file_save.h
- ../src/gsb_file_util.c
- ../src/gsb_file_util.h
- ../src/gsb_form.c
- ../src/gsb_form.h
- ../src/gsb_form_config.c
- ../src/gsb_form_config.h
- ../src/gsb_form_scheduler.c
- ../src/gsb_form_scheduler.h
- ../src/gsb_form_transaction.c
- ../src/gsb_form_transaction.h
- ../src/gsb_form_widget.c
- ../src/gsb_form_widget.h
- ../src/gsb_fyear.c
- ../src/gsb_fyear.h
- ../src/gsb_fyear_config.c
- ../src/gsb_fyear_config.h
- ../src/gsb_payment_method.c
- ../src/gsb_payment_method.h
- ../src/gsb_payment_method_config.c
- ../src/gsb_payment_method_config.h
- ../src/gsb_plugins.c
- ../src/gsb_plugins.h
- ../src/gsb_real.c
- ../src/gsb_real.h
- ../src/gsb_reconcile.c
- ../src/gsb_reconcile.h
- ../src/gsb_reconcile_config.c
- ../src/gsb_reconcile_config.h
- ../src/gsb_reconcile_list.c
- ../src/gsb_reconcile_list.h
- ../src/gsb_reconcile_sort_config.c
- ../src/gsb_reconcile_sort_config.h
- ../src/gsb_report.c
- ../src/gsb_report.h
- ../src/gsb_scheduler.c
- ../src/gsb_scheduler.h
- ../src/gsb_scheduler_list.c
- ../src/gsb_scheduler_list.h
- ../src/gsb_select_icon.c
- ../src/gsb_select_icon.h
- ../src/gsb_status.c
- ../src/gsb_status.h
- ../src/gsb_transactions_list.c
- ../src/gsb_transactions_list.h
- ../src/gsb_transactions_list_sort.c
- ../src/gsb_transactions_list_sort.h
- ../src/gtk_combofix.c
- ../src/gtk_combofix.h
- ../src/help.c
- ../src/help.h
- ../src/import.c
- ../src/import.h
- ../src/import_csv.c
- ../src/import_csv.h
- ../src/imputation_budgetaire.c
- ../src/imputation_budgetaire.h
- ../src/include.h
- ../src/main.c
- ../src/main.h
-# ../src/main_cunit.c
-# ../src/main_cunit.h
- ../src/menu.c
- ../src/menu.h
- ../src/meta_budgetary.c
- ../src/meta_budgetary.h
- ../src/meta_categories.c
- ../src/meta_categories.h
- ../src/meta_payee.c
- ../src/meta_payee.h
- ../src/metatree.c
- ../src/metatree.h
- ../src/navigation.c
- ../src/navigation.h
- ../src/parametres.c
- ../src/parametres.h
- ../src/parse_cmdline.c
- ../src/parse_cmdline.h
- ../src/print_config.c
- ../src/print_config.h
- ../src/print_dialog_config.c
- ../src/print_dialog_config.h
- ../src/print_report.c
- ../src/print_report.h
- ../src/print_transactions_list.c
- ../src/print_transactions_list.h
- ../src/print_tree_view_list.c
- ../src/print_tree_view_list.h
- ../src/qif.c
- ../src/qif.h
- ../src/tiers_onglet.c
- ../src/tiers_onglet.h
- ../src/tip.c
- ../src/tip.h
- ../src/traitement_variables.c
- ../src/traitement_variables.h
- ../src/transaction_list.c
- ../src/transaction_list.h
- ../src/transaction_list_select.c
- ../src/transaction_list_select.h
- ../src/transaction_list_sort.c
- ../src/transaction_list_sort.h
- ../src/transaction_model.c
- ../src/transaction_model.h
- ../src/utils.c
- ../src/utils.h
- ../src/utils_buttons.c
- ../src/utils_buttons.h
- ../src/utils_dates.c
- ../src/utils_dates.h
- ../src/utils_editables.c
- ../src/utils_editables.h
- ../src/utils_files.c
- ../src/utils_files.h
- ../src/utils_file_selection.c
- ../src/utils_file_selection.h
- ../src/utils_font.c
- ../src/utils_font.h
- ../src/utils_operations.c
- ../src/utils_operations.h
- ../src/utils_str.c
- ../src/utils_str.h
+ ../src/*.c
+ ../src/*.h
../win32-msvc/src/getopt.c
../win32-msvc/src/getopt.h
../win32-msvc/src/getopt1.c
hooks/post-receive
--
grisbi
More information about the cvs
mailing list