[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_5-170-g055b7db
Pierre Biava
nobody at users.sourceforge.net
Sun Oct 21 08:01:31 CEST 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 055b7db332fe490882445e37ebf898dfd9198a07 (commit)
via 0396c3dd45e7f545f7c1f39e24d2d10160fc58ef (commit)
via 681a1cca6e408c23441256451d8448e992403716 (commit)
via bdc3d175fdf8c2509d00e85cda617d1318e613a6 (commit)
via 2b7af1097873c986f6a7f8f7e6d2d399af1d5fbc (commit)
from ebadc21aafce349b0ccdb8a8d8eecc95241ea55d (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 055b7db332fe490882445e37ebf898dfd9198a07
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Oct 20 22:45:33 2012 +0200
remove bad header
commit 0396c3dd45e7f545f7c1f39e24d2d10160fc58ef
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Oct 20 22:19:04 2012 +0200
Changes to compile under windows
commit 681a1cca6e408c23441256451d8448e992403716
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Oct 20 22:17:45 2012 +0200
minor change for encoding characters
commit bdc3d175fdf8c2509d00e85cda617d1318e613a6
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Oct 20 22:16:08 2012 +0200
update french strings
commit 2b7af1097873c986f6a7f8f7e6d2d399af1d5fbc
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Oct 17 20:09:17 2012 +0200
corrects consistency problem of messages
-----------------------------------------------------------------------
Changes:
diff --git a/po/fr.po b/po/fr.po
index 12f9cba..38056b7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -46,7 +46,7 @@ msgstr "Comptes sous le solde autorisé"
#: ../src/accueil.c:254
msgid "Accounts under desired balance"
-msgstr "Comptes sous le solde minimum voulu"
+msgstr "Comptes sous le solde minimal voulu"
#. Create the dialog
#: ../src/accueil.c:301
@@ -137,40 +137,40 @@ msgstr "%s Débité sur %s"
#: ../src/accueil.c:1701
#, c-format
msgid "balance of account %s is under desired and authorised minima!"
-msgstr "le compte %s est passé sous les seuils minimums autorisés et voulus !"
+msgstr "le compte %s est passé sous les seuils minimaux autorisés et voulus !"
#: ../src/accueil.c:1705
msgid ""
"accounts with the balance under desired and authorised minimal :\n"
"\n"
msgstr ""
-"compte dont le solde est sous les seuils minimums autorisés et voulus :\n"
+"compte dont le solde est sous les seuils minimauxs autorisés et voulus :\n"
"\n"
#: ../src/accueil.c:1734
#, c-format
msgid "balance of account %s is under authorised minimum!"
-msgstr "le solde du compte %s est passé sous le seuil minimum autorisé !"
+msgstr "le solde du compte %s est passé sous le seuil minimal autorisé !"
#: ../src/accueil.c:1744
msgid ""
"accounts with the balance under authorised minimal :\n"
"\n"
msgstr ""
-"comptes dont le solde est passé sous seuil minimum autorisé :\n"
+"comptes dont le solde est passé sous seuil minimal autorisé :\n"
"\n"
#: ../src/accueil.c:1776
#, c-format
msgid "balance of account %s is under desired minimum!"
-msgstr "le compte %s est passé sous le seuil minimum voulu !"
+msgstr "le compte %s est passé sous le seuil minimal voulu !"
#: ../src/accueil.c:1786
msgid ""
"accounts with the balance under desired minimal :\n"
"\n"
msgstr ""
-"comptes dont le solde est sous le seuil minimum voulu :\n"
+"comptes dont le solde est sous le seuil minimal voulu :\n"
"\n"
#: ../src/accueil.c:1978
@@ -488,7 +488,7 @@ msgstr "Ne pas autoriser la création de nouvelles catégories/Imputations B."
#: ../src/affichage_liste.c:637
msgid "Maximum items showed in drop down lists (0 for no limit): "
msgstr ""
-"Nombre maximum de lignes dans les menus déroulants (0 pas de limite) : "
+"Nombre maximal de lignes dans les menus déroulants (0 pas de limite) : "
#. à la base, on met une vbox
#: ../src/affichage_liste.c:803 ../src/parametres.c:450
@@ -1739,12 +1739,12 @@ msgstr ""
#: ../src/dialog.c:78
msgid "Account under desired balance."
-msgstr "Comptes sous le solde minimum voulu"
+msgstr "Comptes sous le solde minimal voulu"
#: ../src/dialog.c:79
#, c-format
msgid "Grisbi detected that an account is under a desired balance: %s"
-msgstr "Grisbi a détecté qu'un compte est sous le solde minimum voulu: %s"
+msgstr "Grisbi a détecté qu'un compte est sous le solde minimal voulu: %s"
#: ../src/dialog.c:82
msgid "No budgetary line was entered"
@@ -8606,7 +8606,7 @@ msgstr "Editer l'opération sélectionnée"
#: ../src/gsb_scheduler_list.c:298 ../src/gsb_scheduler_list.c:805
msgid "Display the notes of scheduled transactions"
-msgstr "Afficher les notes des opérations planifiées"
+msgstr "Afficher les remarques des opérations planifiées"
#: ../src/gsb_scheduler_list.c:305
msgid "Execute"
diff --git a/po/sv.po b/po/sv.po
index 3034297..e7f513a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,7 +3,7 @@
#
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
-#, fuzzy
+#
msgid ""
msgstr ""
"Project-Id-Version: sv\n"
diff --git a/src/gsb_scheduler_list.c b/src/gsb_scheduler_list.c
index e4a1c57..2db0661 100644
--- a/src/gsb_scheduler_list.c
+++ b/src/gsb_scheduler_list.c
@@ -2350,7 +2350,11 @@ void popup_scheduled_context_menu ( void )
gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), gtk_separator_menu_item_new ( ) );
/* Display/hide notes */
- menu_item = gtk_image_menu_item_new_with_label ( _("Displays/Hide notes") );
+ if ( etat.affichage_commentaire_echeancier )
+ menu_item = gtk_image_menu_item_new_with_label ( _("Displays notes") );
+ else
+ menu_item = gtk_image_menu_item_new_with_label ( _("Displays Frequency/Mode") );
+
gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM ( menu_item ),
gtk_image_new_from_file ( g_build_filename ( gsb_dirs_get_pixmaps_dir ( ),
"comments.png", NULL ) ) );
diff --git a/src/main.c b/src/main.c
index 653e84b..2cd9c6a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -855,10 +855,12 @@ gchar *gsb_main_get_print_locale_var ( void )
gchar *mon_decimal_point;
gchar *positive_sign;
gchar *negative_sign;
+ gchar *currency_symbol;
/* test local pour les nombres */
conv = localeconv();
+ currency_symbol = g_locale_to_utf8 ( conv->currency_symbol, -1, NULL, NULL, NULL );
mon_thousands_sep = g_locale_to_utf8 ( conv->mon_thousands_sep, -1, NULL, NULL, NULL );
mon_decimal_point = g_locale_to_utf8 ( conv->mon_decimal_point, -1, NULL, NULL, NULL );
positive_sign = g_locale_to_utf8 ( conv->positive_sign, -1, NULL, NULL, NULL );
@@ -871,15 +873,22 @@ gchar *gsb_main_get_print_locale_var ( void )
"\tmon_decimal_point = %s\n"
"\tpositive_sign = \"%s\"\n"
"\tnegative_sign = \"%s\"\n"
+ "\tp_cs_precedes = \"%d\"\n"
+ "\tn_cs_precedes = \"%d\"\n"
+ "\tp_sep_by_space = \"%d\"\n"
"\tfrac_digits = \"%d\"\n\n",
g_getenv ( "LANG"),
- conv->currency_symbol,
+ currency_symbol,
mon_thousands_sep,
mon_decimal_point,
positive_sign,
negative_sign,
+ conv->p_cs_precedes,
+ conv->n_cs_precedes,
+ conv->p_sep_by_space,
conv->frac_digits );
+ g_free ( currency_symbol );
g_free ( mon_thousands_sep );
g_free ( mon_decimal_point );
g_free ( positive_sign );
diff --git a/win32-mingw/CMakeLists.txt b/win32-mingw/CMakeLists.txt
index fe49977..d8c4c6b 100644
--- a/win32-mingw/CMakeLists.txt
+++ b/win32-mingw/CMakeLists.txt
@@ -29,9 +29,10 @@ INCLUDE (CheckIncludeFiles)
#on verifie que le programme existe
INCLUDE (${PROJECT_SOURCE_DIR}/modules_cmake/FindMsgfmt.cmake)
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/target/${PlateformName})
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/target/${PlateformName}/plugins)
-SET(PACKAGE_NAME grisbi)
+SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/target/${PlateformName}/package)
+SET (LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}/lib)
+SET (SHARE_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}/share)
+SET (PACKAGE_NAME grisbi)
set (grisbi_MAJOR 0)
set (grisbi_MINOR 9)
set (grisbi_PATCH 5)
@@ -40,22 +41,28 @@ 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)
+SET (MINGW_DIR C:\MinGW)
+SET (GRISBI_SRC_DIR C:\grisbi\src)
+SET (GTK_DEV_PATH ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev)
+SET (PLUGINS_DEV_PATH ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev)
+SET (OPENSSL_DIR C:/OpenSSL-Win32)
INCLUDE_DIRECTORIES(
- ${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
+ ${GTK_DEV_PATH}/include
+ ${GTK_DEV_PATH}/include/atk-1.0
+ ${GTK_DEV_PATH}/include/cairo
+ ${GTK_DEV_PATH}/include/gtk-2.0
+ ${GTK_DEV_PATH}/lib/gtk-2.0/include
+ ${GTK_DEV_PATH}/include/glib-2.0
+ ${GTK_DEV_PATH}/lib/glib-2.0/include
+ ${GTK_DEV_PATH}/include/pango-1.0
+ ${GTK_DEV_PATH}/include/gdk-pixbuf-2.0
+ ${PLUGINS_DEV_PATH}/libofx/include
+ ${PLUGINS_DEV_PATH}/libxml2/include/libxml2
+ ${PLUGINS_DEV_PATH}/iconv/include
+ ${PLUGINS_DEV_PATH}/openssl/include
+ ${PLUGINS_DEV_PATH}/libgoffice/include/libgoffice-0.8
+ ${PLUGINS_DEV_PATH}/libgsf-1/include/libgsf-1
+ ${OPENSSL_DIR}/include/
${PROJECT_SOURCE_DIR}/../win32
${PROJECT_SOURCE_DIR}/../win32-msvc/src
${PROJECT_SOURCE_DIR}
@@ -66,11 +73,16 @@ INCLUDE_DIRECTORIES(
${PROJECT_BINARY_DIR}
)
LINK_DIRECTORIES(
-# ${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}/target/${PlateformName}/gtk-dev/lib
+ ${PLUGINS_DEV_PATH}/libofx/bin
+ ${PLUGINS_DEV_PATH}/libofx/lib
+ ${PLUGINS_DEV_PATH}/libxml2/bin
+ ${PLUGINS_DEV_PATH}/libxml2/lib
+ ${PLUGINS_DEV_PATH}/iconv/lib
+ ${PLUGINS_DEV_PATH}/openssl/lib
+ ${PLUGINS_DEV_PATH}/openssl/lib/VC
+ ${PLUGINS_DEV_PATH}/libgoffice/bin
+ ${PLUGINS_DEV_PATH}/libgoffice/lib
${PROJECT_SOURCE_DIR}
${PROJECT_BINARY_DIR}
)
@@ -176,10 +188,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 ${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
+ COMMAND ${CMAKE_COMMAND} -E copy ${PLUGINS_DEV_PATH}/libofx/bin/libofx-4.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${PLUGINS_DEV_PATH}/libofx/bin/libosp-5.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLUGINS_DEV_PATH}/libofx/bin/dtd ${SHARE_OUTPUT_PATH}/libofx/dtd
)
ADD_LIBRARY ( gnucash
@@ -190,9 +201,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 ${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}
+ COMMAND ${CMAKE_COMMAND} -E copy ${PLUGINS_DEV_PATH}/libxml2/bin/libxml2-2.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${PLUGINS_DEV_PATH}/iconv/bin/iconv.dll ${EXECUTABLE_OUTPUT_PATH}
)
ADD_LIBRARY ( openssl
@@ -203,9 +213,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 ${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}
+ COMMAND ${CMAKE_COMMAND} -E copy ${OPENSSL_DIR}/bin/libeay32.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${OPENSSL_DIR}/bin/ssleay32.dll ${EXECUTABLE_OUTPUT_PATH}
)
# ADD_DEPENDENCIES (ofx grisbi)
@@ -213,7 +222,7 @@ ADD_CUSTOM_COMMAND ( TARGET openssl
TARGET_LINK_LIBRARIES (ofx
glib-2.0
intl
- libofx-5
+ libofx-4
# grisbi
)
@@ -223,7 +232,7 @@ TARGET_LINK_LIBRARIES (gnucash
intl
# grisbi
libxml2-2
- libiconv
+ iconv
)
# ADD_DEPENDENCIES (openssl grisbi)
# SET_TARGET_PROPERTIES(openssl PROPERTIES LINK_FLAGS -enable-auto-import)
@@ -243,35 +252,43 @@ ADD_CUSTOM_TARGET (prepare_env COMMENT "preparation")
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}
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/../pixmaps ${EXECUTABLE_OUTPUT_PATH}/pixmaps
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/../help ${EXECUTABLE_OUTPUT_PATH}/help
+
+ COMMAND ${CMAKE_COMMAND} -E copy ${PLUGINS_DEV_PATH}/iconv/bin/iconv.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${PLUGINS_DEV_PATH}/libgoffice/bin/libgoffice-0.8-8.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${PLUGINS_DEV_PATH}/libgsf-1/bin/libgsf-1-114.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/libstdc++-6.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${PLUGINS_DEV_PATH}/pcre/bin/pcre3.dll ${EXECUTABLE_OUTPUT_PATH}
+
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/freetype6.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/intl.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libatk-1.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libcairo-2.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libexpat-1.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libfontconfig-1.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libgcc_s_dw2-1.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libgdk-win32-2.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libgdk_pixbuf-2.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libgio-2.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libglib-2.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libgmodule-2.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libgobject-2.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libgthread-2.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libgtk-win32-2.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libpango-1.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libpangocairo-1.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libpangoft2-1.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libpangowin32-1.0-0.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/libpng14-14.dll ${EXECUTABLE_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${MINGW_DIR}/bin/pthreadgc2.dll ${EXECUTABLE_OUTPUT_PATH}/pthread2.dll
+ COMMAND ${CMAKE_COMMAND} -E copy ${GTK_DEV_PATH}/bin/zlib1.dll ${EXECUTABLE_OUTPUT_PATH}
+
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLUGINS_DEV_PATH}/libgoffice/lib/goffice ${LIBRARY_OUTPUT_PATH}/goffice
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLUGINS_DEV_PATH}/libgoffice/share/goffice ${SHARE_OUTPUT_PATH}/goffice
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/../share/categories ${SHARE_OUTPUT_PATH}/categories
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/../src/ui ${SHARE_OUTPUT_PATH}/ui
+
)
if (HELLO_NLS_ENABLED)
@@ -286,7 +303,7 @@ if (HELLO_NLS_ENABLED)
endforeach (HDR ${Hello_I18N_HEADERS})
add_custom_target (prepare_mo COMMENT "Building i18n messages.")
file(GLOB po_files ${PROJECT_SOURCE_DIR}/../po/*.po)
- add_custom_command (TARGET prepare_mo COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/target/lib/locale)
+ add_custom_command (TARGET prepare_mo COMMAND ${CMAKE_COMMAND} -E make_directory ${EXECUTABLE_OUTPUT_PATH}/lib/locale)
foreach (current_po ${po_files})
get_filename_component(
@@ -294,10 +311,10 @@ if (HELLO_NLS_ENABLED)
${current_po}
NAME_WE
)
- set(mo_file ${PROJECT_BINARY_DIR}/target/${PlateformName}/lib/locale/${lang}/LC_MESSAGES/${PACKAGE_NAME}.mo)
+ set(mo_file ${EXECUTABLE_OUTPUT_PATH}/lib/locale/${lang}/LC_MESSAGES/${PACKAGE_NAME}.mo)
add_custom_command(TARGET prepare_mo
POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/target/${PlateformName}/lib/locale/${lang}/LC_MESSAGES
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${EXECUTABLE_OUTPUT_PATH}/lib/locale/${lang}/LC_MESSAGES
COMMAND ${MSGFMT_EXECUTABLE} -c ${current_po} -o ${mo_file}
DEPENDS ${current_po}
)
@@ -306,4 +323,4 @@ if (HELLO_NLS_ENABLED)
else(HELLO_NLS_ENABLED)
ADD_DEFINITIONS(-DENABLE_NLS=0)
message (STATUS "Native language support disabled.")
-endif(HELLO_NLS_ENABLED)
\ No newline at end of file
+endif(HELLO_NLS_ENABLED)
diff --git a/win32-mingw/build-clean.cmd b/win32-mingw/build-clean.cmd
new file mode 100644
index 0000000..349b014
--- /dev/null
+++ b/win32-mingw/build-clean.cmd
@@ -0,0 +1,2 @@
+ at echo off
+cmake --build . --clean-first
diff --git a/win32-mingw/generate.cmd b/win32-mingw/generate.cmd
index c327dcd..4233eef 100644
--- a/win32-mingw/generate.cmd
+++ b/win32-mingw/generate.cmd
@@ -1,5 +1,4 @@
- at set PKG_CONFIG_PATH=%CD%\target\Win32\gtk-dev\lib\pkgconfig
- at set PATH=%CD%\target\Win32\gtk-dev\bin;%PATH%
+ at set PKG_CONFIG_PATH=C:\MinGW\lib\pkgconfig
::subst c: "g:\"
::cmake --build . --target clean
rmdir Cmakefiles /s /q
diff --git a/win32-mingw/prepare_Win32.cmd b/win32-mingw/prepare_Win32.cmd
index 16d66f9..68e2d86 100644
--- a/win32-mingw/prepare_Win32.cmd
+++ b/win32-mingw/prepare_Win32.cmd
@@ -1,16 +1,20 @@
@echo off
+cd %GRISBISRC%
::DEFINITION DES VERSIONS
:: Change the next lines to choose which gtk+ version you download.
:: Choose runtime version posterior to dev version
-:: Get this file name from http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/
+:: Get this file name from http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10-20120208_win32.zip
:: 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 GTK_DEV_FILE_BASENAME=gtk+-bundle_2.24.10-20120208_win32
+SET GTK_DEV_BUNDLE_VERSION=2.24
SET ZLIB_DEV_FILE_BASENAME%=zlib_1.2.5-2_win32
-SET LIBXML_FILE_BASENAME=libxml2-2.7.8.win32
+SET LIBXML_FILE_BASENAME=libxml2_2.9.0-1_win32
+SET LIBXML_FILE_DEV_NAME=libxml2-dev_2.9.0-1_win32
SET ICONV_FILE_BASENAME=iconv-1.9.2.win32
-SET OPENSSL_FILE_BASENAME=Win32OpenSSL-1_0_0e
+SET OPENSSL_FILE_BASENAME=Win32OpenSSL-1_0_0j
+SET LIBGSF_FILE_BASENAME=libgsf_1.14.17-1_win32
+SET LIBGSF_FILE_DEV_NAME=libgsf-dev_1.14.17-1_win32
:: The rest of the script should do the rest
::on met chcp 1252 qpour les wget car ils affiche en francais
@@ -18,30 +22,35 @@ SET CURRENT_DIR=%CD%
IF NOT EXIST target MKDIR target
IF NOT EXIST target\Win32 MKDIR target\Win32
SET TARGET_DIR=%CURRENT_DIR%\target\Win32
+IF NOT EXIST target\Win32\plugins-dev MKDIR target\Win32\plugins-dev
IF NOT EXIST downloads MKDIR downloads
SET DOWNLOADS_DIR=%CURRENT_DIR%\downloads
echo Downloads directory : %DOWNLOADS_DIR%
echo Target directory : %TARGET_DIR%
-REM PAUSE
-
-:: Download and install the GTK runtime
-REM cd %DOWNLOADS_DIR%
-REM wget -nc -c "http://sourceforge.net/projects/gtk-win/files/GTK+ Runtime Environment/GTK+ 2.16/%GTK_BIN_FILE%/download"
-REM .\%GTK_BIN_FILE%
-
:: Download and unzip libxml2 dev and bin files
cd %DOWNLOADS_DIR%
-chcp 1252 && wget -nc ftp://ftp.zlatkovic.com/libxml/%LIBXML_FILE_BASENAME%.zip
+chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/%LIBXML_FILE_BASENAME%.zip
+chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/%LIBXML_FILE_DEV_NAME%.zip
cd %TARGET_DIR%
-unzip -uo "%DOWNLOADS_DIR%\%LIBXML_FILE_BASENAME%.zip" -d plugins-dev
-IF EXIST plugins-dev\libxml2 RMDIR /S /Q plugins-dev\libxml2
-MOVE plugins-dev\%LIBXML_FILE_BASENAME% plugins-dev\libxml2
+unzip -uo "%DOWNLOADS_DIR%\%LIBXML_FILE_BASENAME%.zip" -d plugins-dev\libxml2
+unzip -uo "%DOWNLOADS_DIR%\%LIBXML_FILE_DEV_NAME%.zip" -d plugins-dev\libxml2
echo libxml ok
PAUSE
+:: Download and unzip libgsf dev and bin files
+
+cd %DOWNLOADS_DIR%
+chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/libgsf/1.14/%LIBGSF_FILE_BASENAME%.zip
+chcp 1252 && wget -nc http://ftp.gnome.org/pub/gnome/binaries/win32/libgsf/1.14/%LIBGSF_FILE_DEV_NAME%.zip
+cd %TARGET_DIR%
+unzip -uo "%DOWNLOADS_DIR%\%LIBGSF_FILE_BASENAME%.zip" -d plugins-dev\libgsf-1
+unzip -uo "%DOWNLOADS_DIR%\%LIBGSF_FILE_DEV_NAME%.zip" -d plugins-dev\libgsf-1
+echo libgsf ok
+PAUSE
+
:: Download and unzip iconv dev and bin files
cd "%DOWNLOADS_DIR%"
@@ -57,7 +66,7 @@ PAUSE
cd "%DOWNLOADS_DIR%"
chcp 1252 && wget -nc http://www.slproweb.com/download/%OPENSSL_FILE_BASENAME%.exe
-SET SSLDIR=%SystemDrive%\OpenSSL
+SET SSLDIR=%SystemDrive%\OpenSSL-Win32
IF NOT EXIST "%SSLDIR%\readme.txt" (
IF EXIST %OPENSSL_FILE_BASENAME%.exe (
ECHO ***** ATTENTION: installer openssl sur le disque systeme generalement C: dans le repertoire par defaut *****
@@ -82,15 +91,35 @@ xcopy /YICD %SSLDIR%\*.dll plugins-dev\openssl\bin
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_mingw.zip/download
cd "%TARGET_DIR%"
unzip -uo "%DOWNLOADS_DIR%\libofx_mingw.zip" -d plugins-dev
echo ofx ok
+:: Download and unzip libgoffice dev and bin files
+
+cd %DOWNLOADS_DIR%
+chcp 1252 && wget -nc http://sourceforge.net/projects/grisbi/files/dependancies/0.9/libgoffice-0.8-8.zip/download
+cd %TARGET_DIR%
+unzip -uo "%DOWNLOADS_DIR%\libgoffice-0.8-8.zip" -d plugins-dev
+echo libgoffice ok
+PAUSE
+
+:: Download and unzip pcre dev and bin files
+
+cd %DOWNLOADS_DIR%
+chcp 1252 && wget -nc http://sourceforge.net/projects/gnuwin32/files/pcre/7.0/pcre-7.0-bin.zip/download
+chcp 1252 && wget -nc http://sourceforge.net/projects/gnuwin32/files/pcre/7.0/pcre-7.0-lib.zip/download
+cd %TARGET_DIR%
+unzip -uo "%DOWNLOADS_DIR%\pcre-7.0-bin.zip" -d plugins-dev\pcre
+unzip -uo "%DOWNLOADS_DIR%\pcre-7.0-lib.zip" -d plugins-dev\pcre
+echo pcre ok
+PAUSE
+
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/gtk+/%GTK_DEV_BUNDLE_VERSION%/%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
diff --git a/win32-mingw/windows_installer.nsi b/win32-mingw/windows_installer.nsi
index c40d07c..045d945 100644
--- a/win32-mingw/windows_installer.nsi
+++ b/win32-mingw/windows_installer.nsi
@@ -24,11 +24,11 @@
!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
+!define MINGW_DIR "C:/MinGW"
+!define MYSYS_DIR "${MINGW_DIR}/msys/1.0"
+!define PLUGINS_DEV_PATH "${MYSYS_DIR}/local" ;Path to the plugins-dev generated by prepare.cmd
+!define GTK_DEV_PATH "${MINGW_DIR}" ;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
;Automatically defined parameters
!define BRANCH "${MAJOR}.${MINOR}.${PATCH}"
hooks/post-receive
--
grisbi
More information about the cvs
mailing list