[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_99-40-g6dc3f67
chtibzh
nobody at users.sourceforge.net
Sun Feb 6 14:37:28 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 6dc3f67fbc93124ae56ddc403bf4b892513cbadb (commit)
from df58fb5900611f9f90a2ef04d9da0d58c0120660 (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 6dc3f67fbc93124ae56ddc403bf4b892513cbadb
Author: unknown <Didier at .(none)>
Date: Sun Feb 6 14:35:56 2011 +0100
Update for win32/mingw after Major #include clean up
-----------------------------------------------------------------------
Changes:
diff --git a/src/plugins/ofx/ofx.h b/src/plugins/ofx/ofx.h
index 61ad5ff..116f4fd 100644
--- a/src/plugins/ofx/ofx.h
+++ b/src/plugins/ofx/ofx.h
@@ -20,6 +20,8 @@ G_MODULE_EXPORT extern gpointer ofx_plugin_run ( GtkWidget * assistant,
* on windows they should be prefixed by OFX_
*/
+#ifndef _MINGW
+
#ifndef OFX_INFO
#define OFX_INFO INFO
#endif
@@ -43,6 +45,8 @@ G_MODULE_EXPORT extern gpointer ofx_plugin_run ( GtkWidget * assistant,
#define OFX_REPLACE REPLACE
#endif
+#endif /* _MIN_GW */
+
/* #endif _WIN32 */
#endif /* GSB_OFX_H */
diff --git a/win32-mingw/CMakeLists.txt b/win32-mingw/CMakeLists.txt
index 1471919..2709171 100644
--- a/win32-mingw/CMakeLists.txt
+++ b/win32-mingw/CMakeLists.txt
@@ -13,8 +13,9 @@ endif(WIN32)
if (MINGW)
set (TargetDir .)
ADD_DEFINITIONS(-D_MINGW)
+ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
set(STATIC_SCRIPT_BINDINGS TRUE)
- SET(BUILD_SHARED_LIBS ON)
+# SET(BUILD_SHARED_LIBS ON)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mms-bitfields")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mms-bitfields")
endif (MINGW)
@@ -41,6 +42,7 @@ INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include/glib-2.0
${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include/gtk-2.0
${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include/pango-1.0
+ ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include/gdk-pixbuf-2.0
${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/include
${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/lib/glib-2.0/include
${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/lib/gtk-2.0/include
@@ -123,15 +125,8 @@ ADD_DEFINITIONS(-DOFX_0_7=1)
#Define to 1 to have grisbi plugins management system activated
ADD_DEFINITIONS(-DHAVE_PLUGINS=1)
-LINK_DIRECTORIES(
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/gtk-dev/lib
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/libofx/lib
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/libxml2/lib
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/iconv/lib
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/openssl/lib
- ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/openssl/lib/VC
- ${TargetDir}
-)
+#Define to 1 to enable static plugins
+ADD_DEFINITIONS(-DENABLE_STATIC=1)
file(GLOB grisbi_source
${PROJECT_SOURCE_DIR}/../src/*.c
@@ -156,16 +151,17 @@ TARGET_LINK_LIBRARIES( grisbi
pango-1.0
pangocairo-1.0
zdll
+ ofx
+ gnucash
+ openssl
)
-set_target_properties ( grisbi
- PROPERTIES ENABLE_EXPORTS 1
-)
-
-
+# set_target_properties ( grisbi
+ # PROPERTIES ENABLE_EXPORTS 1
+# )
-ADD_LIBRARY ( ofxplg
- MODULE
+ADD_LIBRARY ( ofx
+ STATIC
../src/plugins/ofx/ofx.c
../src/plugins/ofx/ofx.h
)
@@ -178,20 +174,20 @@ ADD_CUSTOM_COMMAND ( TARGET ofxplg
)
ADD_LIBRARY ( gnucash
- MODULE
+ STATIC
../src/plugins/gnucash/gnucash.c
../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
- MODULE
+ STATIC
../src/plugins/openssl/openssl.c
../src/plugins/openssl/openssl.h
)
@@ -202,30 +198,29 @@ ADD_CUSTOM_COMMAND ( TARGET openssl
COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/target/${PlateformName}/plugins-dev/openssl/bin/libeay32.dll ${PROJECT_BINARY_DIR}/target/${PlateformName}
)
-
-ADD_DEPENDENCIES (ofxplg grisbi)
+# ADD_DEPENDENCIES (ofx grisbi)
#SET_TARGET_PROPERTIES(ofx PROPERTIES LINK_FLAGS "-no-undefined --enable-runtime-pseudo-reloc")
-TARGET_LINK_LIBRARIES (ofxplg
+TARGET_LINK_LIBRARIES (ofx
glib-2.0
intl
libofx
- grisbi
+# grisbi
)
-ADD_DEPENDENCIES (gnucash grisbi)
+# ADD_DEPENDENCIES (gnucash grisbi)
TARGET_LINK_LIBRARIES (gnucash
glib-2.0
intl
- grisbi
+# grisbi
libxml2
iconv
)
-ADD_DEPENDENCIES (openssl grisbi)
-SET_TARGET_PROPERTIES(openssl PROPERTIES LINK_FLAGS -enable-auto-import)
+# ADD_DEPENDENCIES (openssl grisbi)
+# SET_TARGET_PROPERTIES(openssl PROPERTIES LINK_FLAGS -enable-auto-import)
TARGET_LINK_LIBRARIES (openssl
glib-2.0
intl
- grisbi
+# grisbi
gobject-2.0
gtk-win32-2.0
libeay32
diff --git a/win32-mingw/build.cmd b/win32-mingw/build.cmd
index 24a6e9c..c411b35 100644
--- a/win32-mingw/build.cmd
+++ b/win32-mingw/build.cmd
@@ -1,4 +1,4 @@
@echo off
::cmake --build . --clean-first
cmake --build .
-pause
+::pause
diff --git a/win32-mingw/generate.cmd b/win32-mingw/generate.cmd
index c86f3f0..c327dcd 100644
--- a/win32-mingw/generate.cmd
+++ b/win32-mingw/generate.cmd
@@ -2,8 +2,8 @@
@set PATH=%CD%\target\Win32\gtk-dev\bin;%PATH%
::subst c: "g:\"
::cmake --build . --target clean
-::rmdir Cmakefiles /s /q
-::del cmakecache.txt
-::del Makefile
+rmdir Cmakefiles /s /q
+del cmakecache.txt
+del Makefile
cmake -G "MinGW Makefiles"
::pause
diff --git a/win32-mingw/prepare_Win32.cmd b/win32-mingw/prepare_Win32.cmd
index c4f9a81..f1dd1ed 100644
--- a/win32-mingw/prepare_Win32.cmd
+++ b/win32-mingw/prepare_Win32.cmd
@@ -5,10 +5,10 @@
:: 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.18.7-20100213_win32
-SET LIBXML_FILE_BASENAME=libxml2-2.7.6.win32
+SET GTK_DEV_FILE_BASENAME=gtk+-bundle_2.22.1-20101227_win32
+SET LIBXML_FILE_BASENAME=libxml2-2.7.7.win32
SET ICONV_FILE_BASENAME=iconv-1.9.2.win32
-SET OPENSSL_FILE_BASENAME=Win32OpenSSL-0_9_8q
+SET OPENSSL_FILE_BASENAME=Win32OpenSSL-1_0_0c
:: The rest of the script should do the rest
::on met chcp 1252 qpour les wget car ils affiche en francais
@@ -81,13 +81,13 @@ 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.6/libofx_Win32.zip/download
+chcp 1252 && wget -nc http://sourceforge.net/projects/grisbi/files/dependancies/0.7/libofx_Win32.zip/download
cd "%TARGET_DIR%"
unzip -uo "%DOWNLOADS_DIR%\libofx_Win32.zip" -d plugins-dev
echo ofx ok
cd "%DOWNLOADS_DIR%"
-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/gtk+/2.22/%GTK_DEV_FILE_BASENAME%.zip
:: Checking if already unzipped
:: If the readme file exists for this version, update the unzip
cd "%TARGET_DIR%"
@@ -118,4 +118,4 @@ SET GTK_DEV_FILE_BASENAME=
cd "%CURRENT_DIR%"
::call generate.cmd
-PAUSE
+::PAUSE
diff --git a/win32-mingw/windows_installer.nsi b/win32-mingw/windows_installer.nsi
index 6a534d4..6c5f478 100644
--- a/win32-mingw/windows_installer.nsi
+++ b/win32-mingw/windows_installer.nsi
@@ -20,7 +20,7 @@
!define PRODUCT "Grisbi" ;Name of the project
!define MAJOR "0" ;Major version number
!define MINOR "7" ;Minor version number
-!define PATCH "99" ;Patch version number
+!define PATCH "99-5" ;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 EXE_PATH "target\Win32" ;Path to the exe file you want to pack
@@ -196,8 +196,8 @@ Section $(OFXplug)
SectionIn 1 2
- SetOutPath "$INSTDIR\plugins"
- File "${EXE_PATH}\plugins\libofxplg.dll"
+; SetOutPath "$INSTDIR\plugins"
+; File "${EXE_PATH}\plugins\libofxplg.dll"
SetOutPath "$INSTDIR"
File /r "${PLUGINS_DEV_PATH}\libofx\bin\dtd"
@@ -210,8 +210,8 @@ Section $(GnuCashPlugin)
SectionIn 1 2
- SetOutPath "$INSTDIR\plugins"
- File "${EXE_PATH}\plugins\libgnucash.dll"
+; SetOutPath "$INSTDIR\plugins"
+; File "${EXE_PATH}\plugins\libgnucash.dll"
SetOutPath "$INSTDIR"
File "${PLUGINS_DEV_PATH}\libxml2\bin\libxml2.dll"
@@ -223,12 +223,14 @@ Section $(OpenSSLplug)
SectionIn 1 2
- SetOutPath "$INSTDIR\plugins"
- File "${EXE_PATH}\plugins\libopenssl.dll"
+; SetOutPath "$INSTDIR\plugins"
+; File "${EXE_PATH}\plugins\libopenssl.dll"
SetOutPath "$INSTDIR"
File "${PLUGINS_DEV_PATH}\openssl\bin\libeay32.dll"
-
+ File "${PLUGINS_DEV_PATH}\openssl\bin\libssl32.dll"
+ File "${PLUGINS_DEV_PATH}\openssl\bin\ssleay32.dll"
+
SectionEnd
SectionGroupEnd
diff --git a/win32-msvc/src/getopt.c b/win32-msvc/src/getopt.c
index 9bafa45..0ffa911 100644
--- a/win32-msvc/src/getopt.c
+++ b/win32-msvc/src/getopt.c
@@ -445,7 +445,7 @@ _getopt_initialize (argc, argv, optstring)
return optstring;
}
-
+
/* Scan elements of ARGV (whose length is ARGC) for option characters
given in OPTSTRING.
diff --git a/win32-msvc/src/getopt.h b/win32-msvc/src/getopt.h
index a1b8dd6..0c31d82 100644
--- a/win32-msvc/src/getopt.h
+++ b/win32-msvc/src/getopt.h
@@ -148,17 +148,13 @@ extern int getopt ();
# endif /* __GNU_LIBRARY__ */
# ifndef __need_getopt
-extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
- const struct option *__longopts, int *__longind);
-extern int getopt_long_only (int __argc, char *const *__argv,
- const char *__shortopts,
- const struct option *__longopts, int *__longind);
-
+extern int getopt_long (int argc, char *const *argv, const char *options,
+ const struct option *long_options, int *opt_index);
+extern int getopt_long_only (int argc, char *const *argv, const char *options,
+ const struct option *long_options, int *opt_index);
/* Internal only. Users should not call this directly. */
-extern int _getopt_internal (int __argc, char *const *__argv,
- const char *__shortopts,
- const struct option *__longopts, int *__longind,
- int __long_only);
+extern int _getopt_internal (int argc, char *const *argv, const char *optstring,
+ const struct option *longopts, int *longind, int long_only);
# endif
#else /* not __STDC__ */
extern int getopt ();
diff --git a/win32-msvc/src/getopt1.c b/win32-msvc/src/getopt1.c
index 22a7efb..8365480 100644
--- a/win32-msvc/src/getopt1.c
+++ b/win32-msvc/src/getopt1.c
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -92,7 +92,7 @@ getopt_long_only (argc, argv, options, long_options, opt_index)
#endif /* Not ELIDE_CODE. */
-
+
#ifdef TEST
#include <stdio.h>
diff --git a/win32-msvc/src/realpath.c b/win32-msvc/src/realpath.c
index 3d9cdda..b76e239 100644
--- a/win32-msvc/src/realpath.c
+++ b/win32-msvc/src/realpath.c
@@ -27,10 +27,10 @@
/*
* @see the realpath() function from <stdlib.h>
*/
-char *realpath(const char *path, char resolved_path[])
-{
- return 0x0; //TODO
-}
+//char *realpath(const char *path, char resolved_path[])
+//{
+// return 0x0; //TODO
+//}
/* Local Variables: */
/* c-basic-offset: 4 */
diff --git a/win32-msvc/src/realpath.h b/win32-msvc/src/realpath.h
index b13c61a..00259be 100644
--- a/win32-msvc/src/realpath.h
+++ b/win32-msvc/src/realpath.h
@@ -2,7 +2,11 @@
#define _GRISBI_WIN32_MSVC_REALPATH_H (1)
/* START_DECLARATION */
-char *realpath(const char *path, char resolved_path[]);
+
+#define realpath(N,R) _fullpath((R),(N),_MAX_PATH)
+
+//char *realpath(const char *path, char resolved_path[]);
+
/* END_DECLARATION */
#endif//_GRISBI_WIN32_MSVC_REALPATH_H
hooks/post-receive
--
grisbi
More information about the cvs
mailing list