[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_97-5-ga7e3cf7
Pierre Biava
nobody at users.sourceforge.net
Sat Dec 25 17:23:03 CET 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 a7e3cf7f796fd8ffcd274723a56f06bfecdc0138 (commit)
via 89bd15bc6e8009d2a075a920df71e1e7db74d58c (commit)
from cd16083058f07400887f5e38e3ed3cd9d2f69a43 (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 a7e3cf7f796fd8ffcd274723a56f06bfecdc0138
Author: pbiava <pierre.biava at nerim.net>
Date: Fri Dec 24 09:04:39 2010 +0100
changes for compilation with MS Visual Studio 10 Express
commit 89bd15bc6e8009d2a075a920df71e1e7db74d58c
Author: pbiava <pierre.biava at nerim.net>
Date: Fri Dec 24 08:56:08 2010 +0100
fixes bugs 1228 and 1231
-----------------------------------------------------------------------
Changes:
diff --git a/src/gsb_data_budget.c b/src/gsb_data_budget.c
index 7415413..8839588 100644
--- a/src/gsb_data_budget.c
+++ b/src/gsb_data_budget.c
@@ -841,7 +841,7 @@ gboolean gsb_data_budget_set_name ( gint no_budget,
GtkWidget *combofix;
budget -> budget_name = my_strdup (name);
- combofix = gsb_form_widget_get_widget ( TRANSACTION_FORM_PARTY );
+ combofix = gsb_form_widget_get_widget ( TRANSACTION_FORM_BUDGET );
if ( combofix )
gsb_budget_update_combofix ( TRUE );
}
diff --git a/win32-msvc/CMakeLists.txt b/win32-msvc/CMakeLists.txt
index 2f256c0..5b1e885 100644
--- a/win32-msvc/CMakeLists.txt
+++ b/win32-msvc/CMakeLists.txt
@@ -1,10 +1,20 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+if(POLICY CMP0015)
+ # policies not known to CMake 2.6 ...
+ cmake_policy(SET CMP0015 NEW)
+endif(POLICY CMP0015)
PROJECT (Grisbi C)
-SET(EXECUTABLE_OUTPUT_PATH target/$(PlatformName))
-SET(LIBRARY_OUTPUT_PATH target/$(PlatformName)/$(OutDir)/plugins)
-SET(PACKAGE_NAME grisbi)
+# MS Visual Studio 10 Macros
+# $(Platform) The name of current project platform (for example, "Win32").
+# $(Configuration) The name of the current project configuration (for example, "Debug").
+# $(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(package_name grisbi)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
ADD_DEFINITIONS(-D__PRETTY_FUNCTION__="")
@@ -58,18 +68,19 @@ ADD_DEFINITIONS(-DOFX_0_7=1)
#ADD_DEFINITIONS(-DNOSSL=1)
INCLUDE_DIRECTORIES(
- target/$(PlatformName)/gtk-dev/include/atk-1.0
- target/$(PlatformName)/gtk-dev/include/cairo
- target/$(PlatformName)/gtk-dev/include/glib-2.0
- target/$(PlatformName)/gtk-dev/include/gtk-2.0
- target/$(PlatformName)/gtk-dev/include/pango-1.0
- target/$(PlatformName)/gtk-dev/include
- target/$(PlatformName)/gtk-dev/lib/glib-2.0/include
- target/$(PlatformName)/gtk-dev/lib/gtk-2.0/include
- target/$(PlatformName)/plugins-dev/libofx/include
- target/$(PlatformName)/plugins-dev/libxml2/include
- target/$(PlatformName)/plugins-dev/iconv/include
- target/$(PlatformName)/plugins-dev/openssl/include
+ target/$(Platform)/gtk-dev/include/atk-1.0
+ target/$(Platform)/gtk-dev/include/cairo
+ target/$(Platform)/gtk-dev/include/glib-2.0
+ target/$(Platform)/gtk-dev/include/gdk-pixbuf-2.0
+ target/$(Platform)/gtk-dev/include/gtk-2.0
+ target/$(Platform)/gtk-dev/include/pango-1.0
+ target/$(Platform)/gtk-dev/include
+ target/$(Platform)/gtk-dev/lib/glib-2.0/include
+ target/$(Platform)/gtk-dev/lib/gtk-2.0/include
+ target/$(Platform)/plugins-dev/libofx/include
+ target/$(Platform)/plugins-dev/libxml2/include
+ target/$(Platform)/plugins-dev/iconv/include
+ target/$(Platform)/plugins-dev/openssl/include
../win32-msvc/src
../win32-msvc
../win32
@@ -80,12 +91,12 @@ INCLUDE_DIRECTORIES(
)
LINK_DIRECTORIES(
- target/$(PlatformName)/gtk-dev/lib
- target/$(PlatformName)/plugins-dev/libofx/lib
- target/$(PlatformName)/plugins-dev/libxml2/lib
- target/$(PlatformName)/plugins-dev/iconv/lib
- target/$(PlatformName)/plugins-dev/openssl/lib
- target/$(PlatformName)/plugins-dev/openssl/lib/VC
+ target/$(Platform)/gtk-dev/lib
+ target/$(Platform)/plugins-dev/libofx/lib
+ target/$(Platform)/plugins-dev/libxml2/lib
+ target/$(Platform)/plugins-dev/iconv/lib
+ target/$(Platform)/plugins-dev/openssl/lib
+ target/$(Platform)/plugins-dev/openssl/lib/VC
$(TargetDir)
)
@@ -423,10 +434,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\\$(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
+ COMMAND XCOPY /D /Y $(TargetDir)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
)
ADD_LIBRARY ( gnucash
@@ -437,9 +448,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 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)
+ 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)
)
ADD_LIBRARY ( openssl
@@ -450,8 +461,8 @@ 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)
+ COMMAND XCOPY /D /Y $(TargetDir)openssl.dll target\\$(Platform)\\$(Configuration)\\plugins
+ COMMAND XCOPY /D /Y target\\$(Platform)\\plugins-dev\\openssl\\bin\\libeay32.dll target\\$(Platform)\\$(Configuration)
)
@@ -485,7 +496,7 @@ ADD_CUSTOM_TARGET (prepare_env)
ADD_CUSTOM_COMMAND(TARGET prepare_env
POST_BUILD
- COMMAND IF NOT EXIST target\\$(PlatformName)\\$(ConfigurationName) mkdir target\\$(PlatformName)\\$(ConfigurationName)
+ COMMAND IF NOT EXIST target\\$(Platform)\\$(Configuration) mkdir target\\$(Platform)\\$(Configuration)
)
@@ -509,25 +520,25 @@ ADD_CUSTOM_COMMAND(TARGET prepare_env
ADD_CUSTOM_COMMAND(TARGET prepare_env
POST_BUILD
- COMMAND xcopy /S /Y /D ..\\pixmaps\\*.png target\\$(PlatformName)\\$(ConfigurationName)\\pixmaps\\
+ COMMAND xcopy /S /Y /D ..\\pixmaps\\*.png target\\$(Platform)\\$(Configuration)\\pixmaps\\
# COMMAND xcopy /S /Y /D ..\\pixmaps\\*.png target\\Release\\pixmaps\\
)
ADD_CUSTOM_COMMAND(TARGET prepare_env
POST_BUILD
- COMMAND xcopy /S /Y /D ..\\help target\\$(PlatformName)\\$(ConfigurationName)\\help\\
+ COMMAND xcopy /S /Y /D ..\\help target\\$(Platform)\\$(Configuration)\\help\\
# COMMAND xcopy /S /Y /D ..\\help target\\Release\\help\\
)
ADD_CUSTOM_COMMAND(TARGET prepare_env
POST_BUILD
- COMMAND xcopy /S /Y /D ..\\share\\categories target\\$(PlatformName)\\$(ConfigurationName)\\help\\tips\\categories\\
+ COMMAND xcopy /S /Y /D ..\\share\\categories target\\$(Platform)\\$(Configuration)\\help\\tips\\categories\\
# COMMAND xcopy /S /Y /D ..\\share\\categories target\\Release\\help\\tips\\categories\\
)
#ADD_CUSTOM_COMMAND(TARGET prepare_env
# POST_BUILD
-# COMMAND tools\\dos2unix.cmd ..\\help\\tips\\tips.txt target\\$(PlatformName)\\$(ConfigurationName)\\help\\tips\\tips#.txt
+# COMMAND tools\\dos2unix.cmd ..\\help\\tips\\tips.txt target\\$(Platform)\\$(Configuration)\\help\\tips\\tips#.txt
# COMMAND tools\\dos2unix.cmd ..\\help\\tips\\tips.txt target\\Release\\help\\tips\\tips.txt
#)
@@ -559,7 +570,7 @@ set(
# ../help/tips/fr.po
# )
-set (msgfmt msgfmt.exe)
+set (msgfmt target\\Win32\\gettext\\bin\\msgfmt.exe)
ADD_CUSTOM_TARGET(prepare_mo
COMMAND IF NOT EXIST target\\lib mkdir target\\lib
@@ -573,7 +584,7 @@ foreach (current_po ${po_files})
NAME_WE
)
- set(mo_file target\\lib\\locale\\${lang}\\LC_MESSAGES\\${PACKAGE_NAME}.mo)
+ set(mo_file target\\lib\\locale\\${lang}\\LC_MESSAGES\\${package_name}.mo)
add_custom_command(TARGET prepare_mo
POST_BUILD
@@ -596,7 +607,7 @@ foreach (current_po ${po_files})
# NAME_WE
# )
- # set(mo_file target\\lib\\locale\\${lang}\\LC_MESSAGES\\${PACKAGE_NAME}-tips.mo)
+ # set(mo_file target\\lib\\locale\\${lang}\\LC_MESSAGES\\${package_name}-tips.mo)
# add_custom_command(TARGET prepare_mo
# POST_BUILD
@@ -614,8 +625,8 @@ foreach (current_po ${po_files})
add_custom_command(TARGET prepare_mo
POST_BUILD
- COMMAND IF NOT EXIST target\\$(PlatformName)\\$(ConfigurationName)\\lib mkdir target\\$(PlatformName)\\$(ConfigurationName)\\lib
- COMMAND xcopy /S /Y /I /D target\\lib\\locale target\\$(PlatformName)\\$(ConfigurationName)\\lib\\locale
+ COMMAND IF NOT EXIST target\\$(Platform)\\$(Configuration)\\lib mkdir target\\$(Platform)\\$(Configuration)\\lib
+ COMMAND xcopy /S /Y /I /D target\\lib\\locale target\\$(Platform)\\$(Configuration)\\lib\\locale
# COMMAND IF NOT EXIST target\\Release\\lib mkdir target\\Release\\lib
# COMMAND xcopy /S /Y /I /D target\\lib\\locale target\\Release\\lib\\locale
-)
+)
\ No newline at end of file
diff --git a/win32-msvc/build.cmd b/win32-msvc/build.cmd
index 446e0d0..169c5fb 100644
--- a/win32-msvc/build.cmd
+++ b/win32-msvc/build.cmd
@@ -1,5 +1,5 @@
@echo off
rem "C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\vsvars32.bat"
-CALL "%VS90COMNTOOLS%\vsvars32.bat"
-msbuild Project.sln /property:Configuration=Debug /maxcpucount
-msbuild Project.sln /property:Configuration=Release /maxcpucount
\ No newline at end of file
+CALL "%VS100COMNTOOLS%\vsvars32.bat"
+msbuild Grisbi.sln /property:Configuration=Debug /maxcpucount
+msbuild Grisbi.sln /property:Configuration=Release /maxcpucount
\ No newline at end of file
diff --git a/win32-msvc/generate.cmd b/win32-msvc/generate.cmd
index 0870ab4..f53af64 100644
--- a/win32-msvc/generate.cmd
+++ b/win32-msvc/generate.cmd
@@ -1 +1 @@
-cmake -G "Visual Studio 9 2008" .
+cmake -G "Visual Studio 10"
diff --git a/win32-msvc/package.cmd b/win32-msvc/package.cmd
index de262d7..2effd9c 100644
--- a/win32-msvc/package.cmd
+++ b/win32-msvc/package.cmd
@@ -1,11 +1,11 @@
- at echo off
+ at echo on
set DIR=target\zip
mkdir %DIR%
-xcopy /Y target\Release\*.dll %DIR%
-xcopy /Y target\Release\*.exe %DIR%
-xcopy /S /Y target\Release\etc %DIR%\etc\
-xcopy /S /Y target\Release\lib %DIR%\lib\
+xcopy /Y target\Win32\Release\*.dll %DIR%
+xcopy /Y target\Win32\Release\*.exe %DIR%
+xcopy /S /Y target\Win32\Release\etc %DIR%\etc\
+xcopy /S /Y target\Win32\Release\lib %DIR%\lib\
xcopy /S /Y ..\help %DIR%\help\
call tools\dos2unix.cmd ..\help\tips\tips.txt %DIR%\help\tips\tips.txt
@@ -16,7 +16,7 @@ xcopy /S /Y ..\pixmaps\*.png %DIR%\pixmaps\
for %%f in (CS DA DE EL EO ES FA FR HE IT NL PL PT_BR RO RU ZH_CN) do (
mkdir target\zip\lib\locale\%%f\LC_MESSAGES
- target\gtk-dev\bin\msgfmt.exe ..\po\%%f.po --output-file=target\zip\lib\locale\%%f\LC_MESSAGES\grisbi.mo
+ target\Win32\gettext\bin\msgfmt.exe ..\po\%%f.po --output-file=target\zip\lib\locale\%%f\LC_MESSAGES\grisbi.mo
)
cd %DIR%
diff --git a/win32-msvc/prepare_Win32.cmd b/win32-msvc/prepare_Win32.cmd
index 79cfa81..07fd4a8 100644
--- a/win32-msvc/prepare_Win32.cmd
+++ b/win32-msvc/prepare_Win32.cmd
@@ -75,8 +75,14 @@ wget -nc -c https://sourceforge.net/projects/grisbi/files/dependancies/0.6/libof
cd %TARGET_DIR%
unzip -uo %DOWNLOADS_DIR%\libofx_Win32.zip -d plugins-dev
+:: Download and unzip gettext to get msgfmt.exe
cd %DOWNLOADS_DIR%
-wget -nc -c http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/%GTK_DEV_FILE_BASENAME%.zip
+wget -nc -c http://sourceforge.net/projects/gnuwin32/files/gettext/0.14.4/gettext-0.14.4-bin.zip/download
+cd %TARGET_DIR%
+unzip -uo %DOWNLOADS_DIR%\gettext-0.14.4-bin.zip -d gettext
+
+cd %DOWNLOADS_DIR%
+wget -nc -c 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%
diff --git a/win32-msvc/src/grisbi.rc b/win32-msvc/src/grisbi.rc
index 0afd34a..92d7f19 100644
--- a/win32-msvc/src/grisbi.rc
+++ b/win32-msvc/src/grisbi.rc
@@ -7,7 +7,8 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+//#include "afxres.h"
+#include "windows.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -46,7 +47,6 @@ END
#endif // APSTUDIO_INVOKED
-
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -62,8 +62,8 @@ IDI_ICON1 ICON "..\\win32\\grisbi.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,6,0,0
- PRODUCTVERSION 0,6,0,0
+ FILEVERSION 0,7,9,7
+ PRODUCTVERSION 0,7,9,7
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "The Grisbi Team"
VALUE "FileDescription", "Grisbi"
- VALUE "FileVersion", "0, 6, 0, 0"
+ VALUE "FileVersion", "0, 7, 9, 7"
VALUE "InternalName", "grisbi"
VALUE "LegalCopyright", "Copyleft (C) 2003-2010"
VALUE "OriginalFilename", "grisbi.rc"
VALUE "ProductName", "Grisbi"
- VALUE "ProductVersion", "0, 6, 0, 0"
+ VALUE "ProductVersion", "0, 7, 9, 7"
END
END
BLOCK "VarFileInfo"
diff --git a/win32-msvc/wiki.txt b/win32-msvc/wiki.txt
index f98d6a4..410556a 100644
--- a/win32-msvc/wiki.txt
+++ b/win32-msvc/wiki.txt
@@ -1,8 +1,8 @@
-====== Compiler Grisbi pour Windows avec Visual C++ 2008 Express Edition ======
+====== Compiler Grisbi pour Windows avec Visual C++ 2010 Express Edition ======
==== Pré Requis ====
-* Visual C++ 2008 Express Edition (http://msdn.microsoft.com/fr-fr/express/default.aspx)
+* Visual C++ 2010 Express Edition (http://msdn.microsoft.com/fr-fr/express/default.aspx)
* UnxUtils (http://unxutils.sourceforge.net/)
* cmake (http://www.cmake.org/)
diff --git a/win32-msvc/windows_installer.nsi b/win32-msvc/windows_installer.nsi
index e6af5c7..f3e02ac 100644
--- a/win32-msvc/windows_installer.nsi
+++ b/win32-msvc/windows_installer.nsi
@@ -19,8 +19,8 @@
!define PRODUCT "Grisbi" ;Name of the project
!define MAJOR "0" ;Major version number
-!define MINOR "6" ;Minor version number
-!define PATCH "1" ;Patch version number
+!define MINOR "7" ;Minor version number
+!define PATCH "97" ;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
hooks/post-receive
--
grisbi
More information about the cvs
mailing list