[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_98-23-ge86c09b
Pierre Biava
nobody at users.sourceforge.net
Tue Jan 18 23:48:10 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, master has been updated
via e86c09b436a87d08895a6769750d52b052f2f443 (commit)
via 275b79e2e6ce0cd4530549584c9c6ec808a88bbd (commit)
via 700da9d1cc1a1d96ceb5ebc3e27d0aed6ae5cb7b (commit)
via 892ff267a5051ae8c59779cfc997230c94f37c46 (commit)
from 5329695bae6ca2778b3bc5f2120f4324408719a0 (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 e86c09b436a87d08895a6769750d52b052f2f443
Author: pbiava <pierre.biava at nerim.net>
Date: Tue Jan 18 23:33:09 2011 +0100
changes for Windows compilation
commit 275b79e2e6ce0cd4530549584c9c6ec808a88bbd
Author: pbiava <pierre.biava at nerim.net>
Date: Tue Jan 18 23:22:03 2011 +0100
minor change in erreur.c
commit 700da9d1cc1a1d96ceb5ebc3e27d0aed6ae5cb7b
Author: pbiava <pierre.biava at nerim.net>
Date: Tue Jan 18 23:20:40 2011 +0100
initializes decimal point and changes for MSVC
commit 892ff267a5051ae8c59779cfc997230c94f37c46
Author: pbiava <pierre.biava at nerim.net>
Date: Tue Jan 18 23:03:28 2011 +0100
update win32-msvc
-----------------------------------------------------------------------
Changes:
diff --git a/src/erreur.c b/src/erreur.c
index f0cb0d2..d285df7 100644
--- a/src/erreur.c
+++ b/src/erreur.c
@@ -70,9 +70,9 @@ void traitement_sigsegv ( gint signal_nb )
gchar *gsb_file_default_dir;
gchar *errmsg = g_strdup ( "" );
gchar *old_errmsg;
- gchar *tmpstr;
GtkWidget * dialog;
#ifdef HAVE_BACKTRACE
+ gchar *tmpstr;
GtkWidget * expander;
#endif
diff --git a/src/gsb_real.c b/src/gsb_real.c
index 212ee73..6809ab6 100644
--- a/src/gsb_real.c
+++ b/src/gsb_real.c
@@ -46,30 +46,6 @@ glong gsb_real_power_10[] = { 1, 10, 100, 1000, 10000, 100000,
1000000, 10000000, 100000000, 1000000000 };
#ifdef _MSC_VER
-typedef struct _lldiv_t
-{
- long long quot;
- long long rem;
-} lldiv_t;
-
-lldiv_t lldiv(long long numerator, long long denominator)
-{
- /* TODO find a standard/efficient impl for this */
- lldiv_t result;
- result.quot = numerator / denominator;
- result.rem = numerator % denominator;
- return result;
-}
-
-long long llabs ( long long number )
-{
- if ( number < 0 )
- number = number * -1;
- return number;
-}
-
-
-#define lrint(x) (floor(x + 0.5))
#define rint(x) (floor(x + 0.5))
#endif /*_MSC_VER */
@@ -1026,7 +1002,10 @@ void gsb_real_set_decimal_point ( const gchar *decimal_point )
if ( gsb_decimal_point && strlen ( gsb_decimal_point ) )
g_free ( gsb_decimal_point );
- gsb_decimal_point = g_strdup ( decimal_point );
+ if ( decimal_point == NULL )
+ gsb_decimal_point = NULL;
+ else
+ gsb_decimal_point = g_strdup ( decimal_point );
}
diff --git a/src/main.c b/src/main.c
index b73b35a..437132e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -127,19 +127,6 @@ int main ( int argc, char **argv )
g_mem_set_vtable(glib_mem_profiler_table);
#endif
-#ifndef GTKOSXAPPLICATION
- bindtextdomain ( PACKAGE, LOCALEDIR );
- bind_textdomain_codeset ( PACKAGE, "UTF-8" );
- textdomain ( PACKAGE );
-
- /* Setup locale/gettext */
- setlocale (LC_ALL, "");
-#endif /* !GTKOSXAPPLICATION */
-
-#if IS_DEVELOPMENT_VERSION == 1
- gsb_grisbi_print_environment_var ( );
-#endif
-
#ifdef _WIN32
main_win_32 ( argc, argv );
#else
@@ -171,6 +158,17 @@ void main_linux ( int argc, char **argv )
cmdline_options opt;
gint status = CMDLINE_SYNTAX_OK;
+ bindtextdomain ( PACKAGE, LOCALEDIR );
+ bind_textdomain_codeset ( PACKAGE, "UTF-8" );
+ textdomain ( PACKAGE );
+
+ /* Setup locale/gettext */
+ setlocale (LC_ALL, "");
+
+#if IS_DEVELOPMENT_VERSION == 1
+ gsb_grisbi_print_environment_var ( );
+#endif
+
gtk_init ( &argc, &argv );
/* on commence par détourner le signal SIGSEGV */
@@ -230,6 +228,10 @@ void main_mac_osx ( int argc, char **argv )
devel_debug ("main_mac_osx");
+#if IS_DEVELOPMENT_VERSION == 1
+ gsb_grisbi_print_environment_var ( );
+#endif
+
gtk_init ( &argc, &argv );
/* init the app */
@@ -341,6 +343,13 @@ void main_win_32 ( int argc, char **argv )
/* needed to be able to use the "common" installation of GTK libraries */
win32_make_sure_the_gtk2_dlls_path_is_in_PATH();
+ bindtextdomain ( PACKAGE, LOCALEDIR );
+ bind_textdomain_codeset ( PACKAGE, "UTF-8" );
+ textdomain ( PACKAGE );
+
+ /* Setup locale/gettext */
+ setlocale( LC_ALL, NULL );
+
gtk_init ( &argc, &argv );
win32_parse_gtkrc ( "gtkrc" );
diff --git a/win32-msvc/CMakeLists.txt b/win32-msvc/CMakeLists.txt
index 5b1e885..5186151 100644
--- a/win32-msvc/CMakeLists.txt
+++ b/win32-msvc/CMakeLists.txt
@@ -12,8 +12,8 @@ PROJECT (Grisbi C)
# $(TargetDir) The directory of the primary output file for the build (defined as drive + path); includes the trailing backslash '\'.
# see http://msdn.microsoft.com/en-us/library/c02as0cs%28v=VS.100%29.aspx for more macros
-SET(RUNTIME_OUTPUT_DIRECTORY target/$(Platform))
-SET(LIBRARY_OUTPUT_DIRECTORY target/$(Platform)/$(Configuration)/plugins)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY target\\$(Platform))
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY target\\$(Platform)\\$(Configuration)\\plugins)
SET(package_name grisbi)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
@@ -434,7 +434,7 @@ ADD_LIBRARY ( ofx
ADD_CUSTOM_COMMAND ( TARGET ofx
POST_BUILD
- COMMAND XCOPY /D /Y $(TargetDir)ofx.dll target\\$(Platform)\\$(Configuration)\\plugins
+# COMMAND XCOPY /D /Y $(Configuration)\\ofx.dll target\\$(Platform)\\$(Configuration)\\plugins\\
COMMAND XCOPY /D /Y target\\$(Platform)\\plugins-dev\\libofx\\bin\\* target\\$(Platform)\\$(Configuration)
COMMAND IF NOT EXIST target\\$(Platform)\\$(Configuration)\\dtd MKDIR target\\$(Platform)\\$(Configuration)\\dtd
COMMAND XCOPY /D /Y target\\$(Platform)\\plugins-dev\\libofx\\bin\\dtd\\o*.d* target\\$(Platform)\\$(Configuration)\\dtd
@@ -448,9 +448,9 @@ ADD_LIBRARY ( gnucash
ADD_CUSTOM_COMMAND ( TARGET gnucash
POST_BUILD
- COMMAND XCOPY /D /Y $(TargetDir)gnucash.dll target\\$(Platform)\\$(Configuration)\\plugins
- COMMAND XCOPY /D /Y target\\$(Platform)\\plugins-dev\\libxml2\\bin\\libxml2.dll target\\$(Platform)\\$(Configuration)
- COMMAND XCOPY /D /Y target\\$(Platform)\\plugins-dev\\iconv\\bin\\iconv.dll target\\$(Platform)\\$(Configuration)
+ COMMAND XCOPY /D /Y $(Configuration)\\gnucash.dll target\\$(Platform)\\$(Configuration)\\plugins\\
+ COMMAND XCOPY /D /Y target\\$(Platform)\\plugins-dev\\libxml2\\bin\\libxml2.dll target\\$(Platform)\\$(Configuration)\\
+ COMMAND XCOPY /D /Y target\\$(Platform)\\plugins-dev\\iconv\\bin\\iconv.dll target\\$(Platform)\\$(Configuration)\\
)
ADD_LIBRARY ( openssl
@@ -461,7 +461,7 @@ ADD_LIBRARY ( openssl
ADD_CUSTOM_COMMAND ( TARGET openssl
POST_BUILD
- COMMAND XCOPY /D /Y $(TargetDir)openssl.dll target\\$(Platform)\\$(Configuration)\\plugins
+# COMMAND XCOPY /D /Y $(Configuration)\\openssl.dll target\\$(Platform)\\$(Configuration)\\plugins\\
COMMAND XCOPY /D /Y target\\$(Platform)\\plugins-dev\\openssl\\bin\\libeay32.dll target\\$(Platform)\\$(Configuration)
)
diff --git a/win32-msvc/installer_strings.nsh b/win32-msvc/installer_strings.nsh
index e0b9643..f723d46 100644
--- a/win32-msvc/installer_strings.nsh
+++ b/win32-msvc/installer_strings.nsh
@@ -100,19 +100,19 @@ LangString Shortcut ${LANG_ROMANIAN} "Start menu shortcuts"
LangString Shortcut ${LANG_FARSI} "Start menu shortcuts"
LangString Shortcut ${LANG_HEBREW} "Start menu shortcuts"
-LangString ErrorMsg ${LANG_FRENCH} "Les fichiers redistribuables de Microsoft Visual C++ 2008 SP1 n'ont pas été correctement installés. Ils sont pourant nécessaires au bon fonctionnement de Grisbi. S'ils ne sont pas déjà installés, Grisbi peut ne pas fontionner correctement. Dans ce cas, installez les fichier manuellement, ou relancez l'installateur de Grisbi."
-LangString ErrorMsg ${LANG_ENGLISH} "Microsoft Visual C++ 2008 SP1 redistribuables installation failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_GERMAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer"
-LangString ErrorMsg ${LANG_SPANISH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_TRADCHINESE} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_ITALIAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_DUTCH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_DANISH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_GREEK} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_RUSSIAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_PORTUGUESEBR} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_POLISH} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_CZECH} "Instalace balíèku Microsoft Visual C++ 2008 SP1 redistributable se nezdaøila. Tato komponenta je nezbytná pro sputìní Grisbi. Pokud ji døíve nebyla nainstalována, Grisbi nemusí fungovat. V takovém pøípadì prosím komponentu nainstalujte ruènì, nebo znovu spuste instalaèní soubor."
-LangString ErrorMsg ${LANG_ROMANIAN} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_FARSI} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
-LangString ErrorMsg ${LANG_HEBREW} "Microsoft Visual C++ 2008 SP1 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
\ No newline at end of file
+LangString ErrorMsg ${LANG_FRENCH} "Les fichiers redistribuables de Microsoft Visual C++ 2010 n'ont pas été correctement installés. Ils sont pourant nécessaires au bon fonctionnement de Grisbi. S'ils ne sont pas déjà installés, Grisbi peut ne pas fontionner correctement. Dans ce cas, installez les fichier manuellement, ou relancez l'installateur de Grisbi."
+LangString ErrorMsg ${LANG_ENGLISH} "Microsoft Visual C++ 2010 redistribuables installation failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_GERMAN} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer"
+LangString ErrorMsg ${LANG_SPANISH} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_TRADCHINESE} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_ITALIAN} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_DUTCH} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_DANISH} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_GREEK} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_RUSSIAN} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_PORTUGUESEBR} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_POLISH} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_CZECH} "Instalace balíèku Microsoft Visual C++ 2010 redistributable se nezdaøila. Tato komponenta je nezbytná pro sputìní Grisbi. Pokud ji døíve nebyla nainstalována, Grisbi nemusí fungovat. V takovém pøípadì prosím komponentu nainstalujte ruènì, nebo znovu spuste instalaèní soubor."
+LangString ErrorMsg ${LANG_ROMANIAN} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_FARSI} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
+LangString ErrorMsg ${LANG_HEBREW} "Microsoft Visual C++ 2010 redistribuables failed. This component is required to run Grisbi. If it is not already installed, Grisbi might not work. In that case, install the package manually, or re-run the installer."
\ No newline at end of file
diff --git a/win32-msvc/prepare_Win32.cmd b/win32-msvc/prepare_Win32.cmd
index 07fd4a8..cfe7d50 100644
--- a/win32-msvc/prepare_Win32.cmd
+++ b/win32-msvc/prepare_Win32.cmd
@@ -71,7 +71,7 @@ xcopy /YICD C:\OpenSSL\*.dll plugins-dev\openssl\bin
:: Download and unzip libofx dev and bin files
cd %DOWNLOADS_DIR%
-wget -nc -c https://sourceforge.net/projects/grisbi/files/dependancies/0.6/libofx_Win32.zip/download
+wget --no-check-certificate -nc -c https://sourceforge.net/projects/grisbi/files/dependancies/0.6/libofx_Win32.zip/download
cd %TARGET_DIR%
unzip -uo %DOWNLOADS_DIR%\libofx_Win32.zip -d plugins-dev
diff --git a/win32-msvc/windows_installer.nsi b/win32-msvc/windows_installer.nsi
index f3e02ac..8852ba5 100644
--- a/win32-msvc/windows_installer.nsi
+++ b/win32-msvc/windows_installer.nsi
@@ -20,12 +20,13 @@
!define PRODUCT "Grisbi" ;Name of the project
!define MAJOR "0" ;Major version number
!define MINOR "7" ;Minor version number
-!define PATCH "97" ;Patch version number
+!define PATCH "98" ;Patch version number
!define STAGE "testing pre release" ;Developement stage id (RC, beta, alpha)
!define SMALL_STAGE "test_pre_rel" ;Small dev stage id without spaces
-!define EXE_PATH "target\Win32\Release" ;Path to the exe file you want to pack
+!define EXE_PATH "Release" ;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 LIB_PATH "target\Win32\Release\lib" ; Path to Grisbi translation files
;!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
@@ -141,6 +142,24 @@ Section $(ProgFiles)
File /r /x "plugin" /x "dtd" /x "*.dll" /x "Makefile.am" /x ".gitignore" /x ".git" /x "*.exp" /x "*.idb" /x "*.lib" /x "Release" "${EXE_PATH}\*.*"
File "..\win32\grisbi.ico"
+ SetOutPath "$INSTDIR\lib\locale"
+ File /r "${LIB_PATH}\locale\cs"
+ File /r "${LIB_PATH}\locale\da"
+ File /r "${LIB_PATH}\locale\de"
+ File /r "${LIB_PATH}\locale\el"
+ File /r "${LIB_PATH}\locale\eo"
+ File /r "${LIB_PATH}\locale\es"
+ File /r "${LIB_PATH}\locale\fa"
+ File /r "${LIB_PATH}\locale\fr"
+ File /r "${LIB_PATH}\locale\he"
+ File /r "${LIB_PATH}\locale\it"
+ File /r "${LIB_PATH}\locale\nl"
+ File /r "${LIB_PATH}\locale\pl"
+ File /r "${LIB_PATH}\locale\pt_BR"
+ File /r "${LIB_PATH}\locale\ro"
+ File /r "${LIB_PATH}\locale\ru"
+ File /r "${LIB_PATH}\locale\zh_CN"
+
;Store installation folder
WriteRegStr HKLM "Software\${FULLNAME}" "" $INSTDIR
@@ -179,6 +198,7 @@ Section $(GTK)
File /r "${GTK_DEV_PATH}\share\locale\fr"
File /r "${GTK_DEV_PATH}\share\locale\he"
File /r "${GTK_DEV_PATH}\share\locale\it"
+ File /r "${GTK_DEV_PATH}\share\locale\lv"
File /r "${GTK_DEV_PATH}\share\locale\nl"
File /r "${GTK_DEV_PATH}\share\locale\pl"
File /r "${GTK_DEV_PATH}\share\locale\pt_BR"
@@ -194,7 +214,7 @@ Section $(OFXplug)
SectionIn 1 2
SetOutPath "$INSTDIR\plugins"
- File "${EXE_PATH}\plugins\ofx.dll"
+ File "${EXE_PATH}\ofx.dll"
SetOutPath "$INSTDIR"
File /r "${PLUGINS_DEV_PATH}\libofx\bin\dtd"
@@ -208,7 +228,7 @@ Section $(GnuCashPlugin)
SectionIn 1 2
SetOutPath "$INSTDIR\plugins"
- File "${EXE_PATH}\plugins\gnucash.dll"
+ File "${EXE_PATH}\gnucash.dll"
SetOutPath "$INSTDIR"
File "${PLUGINS_DEV_PATH}\libxml2\bin\libxml2.dll"
@@ -221,7 +241,7 @@ Section $(OpenSSLplug)
SectionIn 1 2
SetOutPath "$INSTDIR\plugins"
- File "${EXE_PATH}\plugins\openssl.dll"
+ File "${EXE_PATH}\openssl.dll"
SetOutPath "$INSTDIR"
File "${PLUGINS_DEV_PATH}\openssl\bin\libeay32.dll"
hooks/post-receive
--
grisbi
More information about the cvs
mailing list