[grisbi-cvs] [SCM] grisbi branch, master, updated. c6677e8eeb1340881765d9222e4041417e4031e8
Gunee
nobody at users.sourceforge.net
Thu Jun 17 23:37:43 CEST 2010
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 c6677e8eeb1340881765d9222e4041417e4031e8 (commit)
via 95b0efac1a33cd003c3e01a7f0e43453e580a62c (commit)
via 06827f60e53f85f25c8b1b0c764040306481af8f (commit)
via f5395855363ad1a9e51642907b80d4e6b882b25c (commit)
via ab8630e7ac5ddf365f935c8ff43f32f80dc7d4e2 (commit)
via dcd6cafa0cbc6059d82d011621a57a2b122f2498 (commit)
via b2abbd361f16858c6ea0ffbaead9e78512170d2d (commit)
via 63d7ae4cb6fd1d9f69a1454c6ba617375d8d6179 (commit)
from 3b04245f35e1d96aaa9df84f1e5b6aeee4f32b8d (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 c6677e8eeb1340881765d9222e4041417e4031e8
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Thu Jun 17 23:06:38 2010 +0200
Fixed paths (for genericity) + Copy files into build dir. for proper execution
commit 95b0efac1a33cd003c3e01a7f0e43453e580a62c
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Thu Jun 17 23:00:45 2010 +0200
Removed unused variable (MSVC)
commit 06827f60e53f85f25c8b1b0c764040306481af8f
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Thu Jun 17 22:59:50 2010 +0200
Factorized platform-specific paths for easier maintenance.
commit f5395855363ad1a9e51642907b80d4e6b882b25c
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Thu Jun 17 22:58:18 2010 +0200
Turning the generic installer into a specific 32-bit installer
commit ab8630e7ac5ddf365f935c8ff43f32f80dc7d4e2
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Thu Jun 17 22:57:03 2010 +0200
Added bundled installation of required runtime package
(Microsoft Visual C++ 2008 Redistribuable package)
commit dcd6cafa0cbc6059d82d011621a57a2b122f2498
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Thu Jun 17 22:51:25 2010 +0200
Fixing a link error with Windows MSVC++
commit b2abbd361f16858c6ea0ffbaead9e78512170d2d
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Thu Jun 17 22:37:49 2010 +0200
Ignoring *.bak files (WinMerge backup files)
commit 63d7ae4cb6fd1d9f69a1454c6ba617375d8d6179
Author: William OLLIVIER <guneemwelloeux at users.sourceforge.net>
Date: Thu Jun 17 19:46:58 2010 +0200
Fix for compilation error on Windows, due to redefined symbol
-----------------------------------------------------------------------
Changes:
diff --git a/src/.gitignore b/src/.gitignore
index 2cc37d4..0df098b 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,3 +2,4 @@
*.lo
.libs
.deps
+*.bak
diff --git a/src/main.c b/src/main.c
index e36499c..d84dddd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -119,9 +119,6 @@ int main (int argc, char **argv)
#ifndef _WIN32
struct sigaction sig_sev;
#endif
-#ifdef _MSC_VER
- gchar *gtkrc_file;
-#endif
#if GSB_GMEMPROFILE
g_mem_set_vtable(glib_mem_profiler_table);
diff --git a/src/plugins/ofx/ofx.h b/src/plugins/ofx/ofx.h
index f5593f5..3901b04 100644
--- a/src/plugins/ofx/ofx.h
+++ b/src/plugins/ofx/ofx.h
@@ -30,6 +30,9 @@ G_MODULE_EXPORT extern GSList * ofx_plugin_run ( GtkWidget * assistant,
#endif
#ifndef OFX_ERROR
+#ifdef _MSC_VER
+#undef ERROR
+#endif // _MSC_VER
#define OFX_ERROR ERROR
#endif
diff --git a/src/plugins/openssl/openssl.c b/src/plugins/openssl/openssl.c
index 26c2825..57ae376 100644
--- a/src/plugins/openssl/openssl.c
+++ b/src/plugins/openssl/openssl.c
@@ -36,11 +36,13 @@
/*FIX FOR THE LINKING ERROR WITH WINDOWS MSVC*/
#ifdef _MSC_VER
-#include "./../../main.h"
+#define SYMBOL_IMPORT __declspec(dllimport)
+#else
+#define SYMBOL_IMPORT extern
#endif
/*START_EXTERN*/
-extern GtkWidget *window;
+SYMBOL_IMPORT GtkWidget *window;
/*END_EXTERN*/
#ifndef NOSSL
diff --git a/win32-msvc/CMakeLists.txt b/win32-msvc/CMakeLists.txt
index 2a015c5..150c9ae 100644
--- a/win32-msvc/CMakeLists.txt
+++ b/win32-msvc/CMakeLists.txt
@@ -409,8 +409,10 @@ ADD_LIBRARY ( ofx
ADD_CUSTOM_COMMAND ( TARGET ofx
POST_BUILD
- COMMAND xcopy /D /Y $(TargetDir)ofx.dll target\\$(PlatformName)\\$(OutDir)\\plugins
- COMMAND XCOPY /D /Y target\\plugins-dev\\libofx\\bin\\* target\\$(PlatformName)\\$(OutDir)
+ COMMAND XCOPY /D /Y $(TargetDir)ofx.dll target\\$(PlatformName)\\$(OutDir)\\plugins
+ COMMAND XCOPY /D /Y target\\$(PlatformName)\\plugins-dev\\libofx\\bin\\* target\\$(PlatformName)\\$(OutDir)
+ COMMAND IF NOT EXIST target\\$(PlatformName)\\$(OutDir)\\dtd MKDIR target\\$(PlatformName)\\$(OutDir)\\dtd
+ COMMAND XCOPY /D /Y target\\$(PlatformName)\\plugins-dev\\libofx\\bin\\dtd\\o*.d* target\\$(PlatformName)\\$(OutDir)\\dtd
)
ADD_LIBRARY ( gnucash
@@ -421,7 +423,9 @@ ADD_LIBRARY ( gnucash
ADD_CUSTOM_COMMAND ( TARGET gnucash
POST_BUILD
- COMMAND xcopy /D /Y $(TargetDir)gnucash.dll target\\$(PlatformName)\\$(OutDir)\\plugins
+ COMMAND XCOPY /D /Y $(TargetDir)gnucash.dll target\\$(PlatformName)\\$(OutDir)\\plugins
+ COMMAND XCOPY /D /Y target\\$(PlatformName)\\plugins-dev\\libxml2\\bin\\libxml2.dll target\\$(PlatformName)\\$(OutDir)
+ COMMAND XCOPY /D /Y target\\$(PlatformName)\\plugins-dev\\iconv\\bin\\iconv.dll target\\$(PlatformName)\\$(OutDir)
)
ADD_LIBRARY ( openssl
@@ -433,6 +437,7 @@ ADD_LIBRARY ( openssl
ADD_CUSTOM_COMMAND ( TARGET openssl
POST_BUILD
COMMAND xcopy /D /Y $(TargetDir)openssl.dll target\\$(PlatformName)\\$(ConfigurationName)\\plugins
+ COMMAND XCOPY /D /Y target\\$(PlatformName)\\plugins-dev\\openssl\\bin\\libeay32.dll target\\$(PlatformName)\\$(OutDir)
)
diff --git a/windows_installer.nsi b/windows_installer.nsi
index a0e0a9c..81d5b63 100644
--- a/windows_installer.nsi
+++ b/windows_installer.nsi
@@ -24,8 +24,8 @@
!define STAGE "release" ;Developement stage id (RC, beta, alpha)
!define SMALL_STAGE "rel" ;Small dev stage id without spaces
!define EXE_PATH "win32-msvc\target\Win32\Release" ;Path to the exe file you want to pack
-!define PLUGINS_DEV_PATH "win32-msvc\target\plugins-dev" ;Path to the plugins-dev generated by prepare.cmd
-!define GTK_DEV_PATH "win32-msvc\target\gtk-dev" ;Path to the gtk-dev generated by prepare.cmd
+!define PLUGINS_DEV_PATH "win32-msvc\target\Win32\plugins-dev" ;Path to the plugins-dev generated by prepare.cmd
+!define GTK_DEV_PATH "win32-msvc\target\Win32\gtk-dev" ;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
@@ -50,7 +50,7 @@
SetCompressor /SOLID lzma
;Default installation folder
- InstallDir "$PROGRAMFILES\${FULLNAME}"
+ InstallDir "$PROGRAMFILES32\${FULLNAME}"
;Get installation folder from registry if available
InstallDirRegKey HKLM "Software\${FULLNAME}" ""
@@ -130,6 +130,12 @@ Section $(ProgFiles)
SectionIn 1 2 3 RO
+ SetOutPath "$TEMP"
+ File "vcredist_x86.exe"
+ ExecWait "vcredist_x86.exe"
+ IfErrors 0 +2
+ MessageBox MB_OK $(ErrorMsg)
+
SetOutPath "$INSTDIR"
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}\*.*"
@@ -157,28 +163,28 @@ Section $(GTK)
SectionIn 1
SetOutPath "$INSTDIR"
- File /r "win32-msvc\target\gtk-dev\bin\*.dll" ;"${GTK_INSTALL_PATH}\${GTK_INSTALL_FILE}"
+ File /r "${GTK_DEV_PATH}\bin\*.dll" ;"${GTK_INSTALL_PATH}\${GTK_INSTALL_FILE}"
SetOutPath "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
- File "win32-msvc\target\gtk-dev\lib\gtk-2.0\2.10.0\engines\libwimp.dll"
+ File "${GTK_DEV_PATH}\lib\gtk-2.0\2.10.0\engines\libwimp.dll"
SetOutPath "$INSTDIR\share\locale"
- File /r "win32-msvc\target\gtk-dev\share\locale\cs"
- File /r "win32-msvc\target\gtk-dev\share\locale\da"
- File /r "win32-msvc\target\gtk-dev\share\locale\de"
- File /r "win32-msvc\target\gtk-dev\share\locale\el"
- File /r "win32-msvc\target\gtk-dev\share\locale\eo"
- File /r "win32-msvc\target\gtk-dev\share\locale\es"
- File /r "win32-msvc\target\gtk-dev\share\locale\fa"
- File /r "win32-msvc\target\gtk-dev\share\locale\fr"
- File /r "win32-msvc\target\gtk-dev\share\locale\he"
- File /r "win32-msvc\target\gtk-dev\share\locale\it"
- File /r "win32-msvc\target\gtk-dev\share\locale\nl"
- File /r "win32-msvc\target\gtk-dev\share\locale\pl"
- File /r "win32-msvc\target\gtk-dev\share\locale\pt_BR"
- File /r "win32-msvc\target\gtk-dev\share\locale\ro"
- File /r "win32-msvc\target\gtk-dev\share\locale\ru"
- File /r "win32-msvc\target\gtk-dev\share\locale\zh_CN"
+ File /r "${GTK_DEV_PATH}\share\locale\cs"
+ File /r "${GTK_DEV_PATH}\share\locale\da"
+ File /r "${GTK_DEV_PATH}\share\locale\de"
+ File /r "${GTK_DEV_PATH}\share\locale\el"
+ File /r "${GTK_DEV_PATH}\share\locale\eo"
+ File /r "${GTK_DEV_PATH}\share\locale\es"
+ File /r "${GTK_DEV_PATH}\share\locale\fa"
+ 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\nl"
+ File /r "${GTK_DEV_PATH}\share\locale\pl"
+ File /r "${GTK_DEV_PATH}\share\locale\pt_BR"
+ File /r "${GTK_DEV_PATH}\share\locale\ro"
+ File /r "${GTK_DEV_PATH}\share\locale\ru"
+ File /r "${GTK_DEV_PATH}\share\locale\zh_CN"
SectionEnd
hooks/post-receive
--
grisbi
More information about the cvs
mailing list