[grisbi-cvs] grisbi/win32-msvc CMakeLists.txt, 1.15, 1.16 prepare.cmd, 1.6, 1.7
Gunee
guneemwelloeux at users.sourceforge.net
Thu May 20 23:34:39 CEST 2010
Update of /cvsroot/grisbi/grisbi/win32-msvc
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12163/win32-msvc
Modified Files:
CMakeLists.txt prepare.cmd
Log Message:
Multiple fixes for proper compilation/packaging on Windows (MSVC)
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/grisbi/grisbi/win32-msvc/CMakeLists.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CMakeLists.txt 18 Apr 2010 20:06:55 -0000 1.15
+++ CMakeLists.txt 20 May 2010 21:34:37 -0000 1.16
@@ -67,7 +67,8 @@
target/gtk-dev/lib/glib-2.0/include
target/gtk-dev/lib/gtk-2.0/include
target/plugins-dev/libofx/include
- target/plugins-dev/libxml/include
+ target/plugins-dev/libxml2/include
+ target/plugins-dev/iconv/include
target/plugins-dev/openssl/include
../win32-msvc/src
../win32-msvc
@@ -81,7 +82,8 @@
LINK_DIRECTORIES(
target/gtk-dev/lib
target/plugins-dev/libofx/lib
- target/plugins-dev/libxml/lib
+ target/plugins-dev/libxml2/lib
+ target/plugins-dev/iconv/lib
target/plugins-dev/openssl/lib
target/plugins-dev/openssl/lib/VC
target/$(PlatformName)/$(OutDir)
@@ -103,6 +105,7 @@
zdll
libofx
libxml2
+ iconv
libeay32
ssleay32
)
@@ -398,10 +401,10 @@
${grisbi_source}
)
-ADD_DEPENDENCIES (grisbi prepare_env)
+ADD_DEPENDENCIES (grisbi prepare_env prepare_mo)
ADD_LIBRARY ( ofx
- MODULE
+ SHARED
../src/plugins/ofx/ofx.c
../src/plugins/ofx/ofx.h
)
@@ -413,7 +416,7 @@
)
ADD_LIBRARY ( gnucash
- MODULE
+ SHARED
../src/plugins/gnucash/gnucash.c
../src/plugins/gnucash/gnucash.h
)
@@ -424,7 +427,7 @@
)
ADD_LIBRARY ( openssl
- MODULE
+ SHARED
../src/plugins/openssl/openssl.c
../src/plugins/openssl/openssl.h
)
@@ -511,7 +514,7 @@
set (msgfmt target\\gtk-dev\\bin\\msgfmt.exe)
-ADD_CUSTOM_TARGET(prepare_mo DEPENDS grisbi
+ADD_CUSTOM_TARGET(prepare_mo
COMMAND IF NOT EXIST target\\lib mkdir target\\lib
COMMAND IF NOT EXIST target\\lib\\locale mkdir target\\lib\\locale
)
Index: prepare.cmd
===================================================================
RCS file: /cvsroot/grisbi/grisbi/win32-msvc/prepare.cmd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- prepare.cmd 23 Jan 2010 23:14:48 -0000 1.6
+++ prepare.cmd 20 May 2010 21:34:37 -0000 1.7
@@ -1,38 +1,56 @@
@echo off
:: Change the next lines to choose which gtk+ version you download.
:: Choose runtime version posterior to dev version
-:: Get this file name from http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.16/
+:: 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=gtk+-bundle_2.16.5-20090731_win32
+SET GTK_DEV_FILE=gtk+-bundle_2.18.7-20100213_win32
:: Get this file name from http://sourceforge.net/projects/gtk-win/files
:: Include the .exe extension
-SET GTK_BIN_FILE=gtk2-runtime-2.16.5-2009-08-06-ash.exe
+REM SET GTK_BIN_FILE=gtk2-runtime-2.16.5-2009-08-06-ash.exe
:: The rest of the script should do the rest
SET CURRENT_DIR=%CD%
IF NOT EXIST target MKDIR target
+SET TARGET_DIR=%CURRENT_DIR%\target
IF NOT EXIST downloads MKDIR downloads
+SET DOWNLOADS_DIR=%CURRENT_DIR%\downloads
+
+echo Downloads directory : %DOWNLOADS_DIR%
+echo Target directory : %TARGET_DIR%
+
+REM PAUSE
:: Download and install the GTK runtime
-cd %CURRENT_DIR%\downloads
-wget -nc -c "http://sourceforge.net/projects/gtk-win/files/GTK+ Runtime Environment/GTK+ 2.16/%GTK_BIN_FILE%/download"
-.\%GTK_BIN_FILE%
+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 %CURRENT_DIR%\downloads
+cd %DOWNLOADS_DIR%
wget -nc -c ftp://ftp.zlatkovic.com/libxml/libxml2-2.7.6.win32.zip
-cd %CURRENT_DIR%\target
-unzip -uo %CURRENT_DIR%\downloads\libxml2-2.7.6.win32.zip -d plugins-dev
-mv plugins-dev\libxml2-2.7.6.win32 plugins-dev\libxml2
+cd %TARGET_DIR%
+unzip -uo %DOWNLOADS_DIR%\libxml2-2.7.6.win32.zip -d plugins-dev
+IF EXIST plugins-dev\libxml2 RMDIR /S /Q plugins-dev\libxml2
+MOVE plugins-dev\libxml2-2.7.6.win32 plugins-dev\libxml2
+PAUSE
+
+:: Download and unzip iconv dev and bin files
+cd %DOWNLOADS_DIR%
+wget -nc -c ftp://ftp.zlatkovic.com/libxml/iconv-1.9.2.win32.zip
+cd %TARGET_DIR%
+unzip -uo %DOWNLOADS_DIR%\iconv-1.9.2.win32.zip -d plugins-dev
+IF EXIST plugins-dev\iconv RMDIR /S /Q plugins-dev\iconv
+MOVE plugins-dev\iconv-1.9.2.win32 plugins-dev\iconv
+PAUSE
:: Download and install openssl, copy the required files in the right place
-cd %CURRENT_DIR%\downloads
-wget -nc -c http://www.slproweb.com/download/Win32OpenSSL-0_9_8l.exe
+cd %DOWNLOADS_DIR%
+wget -nc -c http://www.slproweb.com/download/Win32OpenSSL-0_9_8n.exe
ECHO ***** ATTENTION: Do not modify the default installation path for OpenSSL otherwise you will have trouble compiling *****
-.\Win32OpenSSL-0_9_8l.exe
-cd %CURRENT_DIR%\target
+.\Win32OpenSSL-0_9_8n.exe
+cd %TARGET_DIR%
if not exist plugins-dev\openssl mkdir plugins-dev\openssl
if not exist plugins-dev\openssl\lib mkdir plugins-dev\openssl\lib
xcopy /Y C:\OpenSSL\lib\libeay32.lib plugins-dev\openssl\lib\.
@@ -42,20 +60,26 @@
xcopy /YICD C:\OpenSSL\*.dll plugins-dev\openssl\bin
:: Download and unzip libofx dev and bin files
-cd %CURRENT_DIR%\downloads
+cd %DOWNLOADS_DIR%
wget -nc -c https://sourceforge.net/projects/grisbi/files/dependancies/0.6/libofx.zip/download
-cd %CURRENT_DIR%\target
-unzip -uo %CURRENT_DIR%\downloads\libofx.zip -d plugins-dev
+cd %TARGET_DIR%
+unzip -uo %DOWNLOADS_DIR%\libofx.zip -d plugins-dev
-cd %CURRENT_DIR%\downloads
-wget -nc -c http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.16/%GTK_DEV_FILE%.zip
+cd %DOWNLOADS_DIR%
+wget -nc -c http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.18/%GTK_DEV_FILE%.zip
:: Checking if already unzipped
:: If the readme file exists for this version, update the unzip
-cd %CURRENT_DIR%\target
+cd %TARGET_DIR%
+IF NOT EXIST gtk-dev (
+ echo GTK+ development files not present.
+ echo Unzipping the archive now...
+ unzip %DOWNLOADS_DIR%\%GTK_DEV_FILE% -d gtk-dev
+ echo Done unzipping archive!
+)
IF EXIST gtk-dev\%GTK_DEV_FILE%.README.txt (
echo Found gtk-dev directory with the same gtk+ version.
echo Updating the files...
- unzip -uo %GTK_DEV_FILE% -d gtk-dev
+ unzip -uo %DOWNLOADS_DIR%\%GTK_DEV_FILE% -d gtk-dev
echo Done updating the files in gtk-dev!
)
:: If the readme file for the current version does not exist, remove the dir, and unzip again
@@ -65,7 +89,7 @@
rmdir /S /Q gtk-dev
echo Done deleting gtk-dev directory!
echo Unzipping downloaded archive...
- unzip %GTK_DEV_FILE% -d gtk-dev
+ unzip %DOWNLOADS_DIR%\%GTK_DEV_FILE% -d gtk-dev
echo Done unzipping archive!
)
SET GTK_DEV_FILE=
More information about the cvs
mailing list