[grisbi-cvs] [SCM] grisbi branch, grisbi-0.8.x, updated. upstream_version_0_8_9-30-gf9bf80e
Pierre Biava
nobody at users.sourceforge.net
Sun Oct 7 20:32:43 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, grisbi-0.8.x has been updated
via f9bf80ec40bcbcfb360a7cb77593bbeff0fac991 (commit)
from 058ad831ade5edcbe867716581ebf963a89b81f2 (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 f9bf80ec40bcbcfb360a7cb77593bbeff0fac991
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Oct 7 20:31:01 2012 +0200
Changes to compile under windows
-----------------------------------------------------------------------
Changes:
diff --git a/win32-mingw/.gitignore b/win32-mingw/.gitignore
index fa99d0f..501a789 100644
--- a/win32-mingw/.gitignore
+++ b/win32-mingw/.gitignore
@@ -9,5 +9,7 @@ target
*.suo
*.user
*.vcproj
+*.bak
downloads
-config.h
\ No newline at end of file
+config.h
+
diff --git a/win32-mingw/CMakeLists.txt b/win32-mingw/CMakeLists.txt
index a9a881a..d0dc6c2 100644
--- a/win32-mingw/CMakeLists.txt
+++ b/win32-mingw/CMakeLists.txt
@@ -30,7 +30,7 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/target/${PlateformName}/plugins)
SET(PACKAGE_NAME grisbi)
set (grisbi_MAJOR 0)
set (grisbi_MINOR 8)
-set (grisbi_PATCH 7)
+set (grisbi_PATCH 10)
set (grisbi_version "${grisbi_MAJOR}.${grisbi_MINOR}.${grisbi_PATCH} pour windows")
MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH)
MARK_AS_ADVANCED(grisbi_version)
diff --git a/win32-mingw/build.cmd b/win32-mingw/build.cmd
index c411b35..9fd0bdf 100644
--- a/win32-mingw/build.cmd
+++ b/win32-mingw/build.cmd
@@ -1,4 +1,4 @@
@echo off
-::cmake --build . --clean-first
-cmake --build .
-::pause
+cmake --build . --clean-first
+::cmake --build .
+pause
diff --git a/win32-mingw/package.cmd b/win32-mingw/package.cmd
index de262d7..c8f3089 100644
--- a/win32-mingw/package.cmd
+++ b/win32-mingw/package.cmd
@@ -16,9 +16,9 @@ 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
+ msgfmt.exe ..\po\%%f.po --output-file=target\zip\lib\locale\%%f\LC_MESSAGES\grisbi.mo
)
cd %DIR%
-zip -r ..\grisbi *
+7z.exe a -r grisbi.zip ..\grisbi *
pause
diff --git a/win32-mingw/prepare_Win32.cmd b/win32-mingw/prepare_Win32.cmd
index 6d5f69a..86f50e7 100644
--- a/win32-mingw/prepare_Win32.cmd
+++ b/win32-mingw/prepare_Win32.cmd
@@ -1,4 +1,5 @@
@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
@@ -7,9 +8,9 @@
:: Don't include the extension
SET GTK_DEV_FILE_BASENAME=gtk+-bundle_2.18.7-20100213_win32
SET ZLIB_DEV_FILE_BASENAME%=zlib_1.2.5-2_win32
-SET LIBXML_FILE_BASENAME=libxml2-2.7.7.win32
+SET LIBXML_FILE_BASENAME=libxml2-2.7.8.win32
SET ICONV_FILE_BASENAME=iconv-1.9.2.win32
-SET OPENSSL_FILE_BASENAME=Win32OpenSSL-1_0_0d
+SET OPENSSL_FILE_BASENAME=Win32OpenSSL-1_0_1c
:: The rest of the script should do the rest
::on met chcp 1252 qpour les wget car ils affiche en francais
@@ -23,17 +24,10 @@ 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 ftp://ftp.zlatkovic.com/pub/libxml/%LIBXML_FILE_BASENAME%.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
@@ -56,7 +50,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 *****
diff --git a/win32-mingw/wiki.txt b/win32-mingw/wiki.txt
index baef6ec..9eaa3bc 100644
--- a/win32-mingw/wiki.txt
+++ b/win32-mingw/wiki.txt
@@ -2,15 +2,16 @@
<FIXME: attention page en cours de création>
==== A installer tout le support ====
- - installer mingw [http://sourceforge.net/projects/mingw/files/Automated%20MinGW%20Installer/mingw-get-inst/mingw-get-inst-20100909/mingw-get-inst-20100909.exe/download]
+ - installer mingw [http://sourceforge.net/projects/mingw/files/Installer/mingw-get-inst/mingw-get-inst-20120426/mingw-get-inst-20120426.exe/download]
- installer wget [http://sourceforge.net/projects/gnuwin32/files/wget/1.11.4-1/wget-1.11.4-1-setup.exe/download]
- installer unzip [http://sourceforge.net/projects/gnuwin32/files/unzip/5.51-1/unzip-5.51-1.exe/download]
- installer getext [http://sourceforge.net/projects/gnuwin32/files/gettext/0.14.4/gettext-0.14.4.exe/download]
- rajouter les 1 à 4 dans le path ( a priori les 2,3 et 4 sont dans le même répertoire)
- - installer putty [http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.60-installer.exe] (pas absolument necessaire mais bon)
+
+ - installer git extensions [http://gitextensions.googlecode.com/files/GitExtensions241SetupComplete.msi] ne pas ajouer au path\\
+ installe putty, console graphique et kdiff 3
- créer au besoin une clé SSH
- - installer git extensions [http://code.google.com/p/gitextensions/downloads/list]
- - installer cmake [http://www.cmake.org/cmake/resources/software.html] (installer dans un endroit sans espaces)
+ - installer cmake [http://www.cmake.org/cmake/resources/software.html] (installer dans un endroit sans espaces pas nécessaire sous seven)
- NSIS [http://nsis.sourceforge.net/Download] (ajoutez NSIS au PATH )
- redémarrer le pc
@@ -23,4 +24,5 @@
- Lancer le script %GRISBISRC%\win32-mingw\prepare_win32.cmd qui va effectuer les opération suivantes : il va télécharger le kit de développement de gtk+ et le décompresser et générer les make pour mingw \\
- Lancer le script %GRISBISRC%\win32-mingw\build.cmd qui va compiler les versions Debug et Release. \\
- - Lancer le script %GRISBISRC%\win32-mingw\package.cmd qui va générer un zip <FIXME: pas encore testé>\\
+ - Lancer le script %GRISBISRC%\win32-mingw\package.cmd qui va générer un zip <fonctionne mais j'ai pas compris à quoi ça sert.>\\
+ - lancer NSIS choisir compiler un script sélectionner windows_installer.nsi et lancer ça crée un exécutable dans le répertoire courant.
diff --git a/win32-mingw/windows_installer.nsi b/win32-mingw/windows_installer.nsi
index 527dbff..782e27c 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 "8" ;Minor version number
-!define PATCH "7" ;Patch version number
+!define PATCH "10" ;Patch version number
!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
hooks/post-receive
--
grisbi
More information about the cvs
mailing list