[grisbi-cvs] grisbi/win32-msvc CMakeLists.txt, 1.11, 1.12 prepare.cmd, 1.4, 1.5
Gunee
guneemwelloeux at users.sourceforge.net
Fri Nov 20 00:04:55 CET 2009
Update of /cvsroot/grisbi/grisbi/win32-msvc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9306
Modified Files:
CMakeLists.txt prepare.cmd
Log Message:
Several fixes to the Makefile
Modified prepare script for lazy compilation
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/grisbi/grisbi/win32-msvc/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- CMakeLists.txt 7 Nov 2009 22:01:31 -0000 1.11
+++ CMakeLists.txt 19 Nov 2009 23:04:52 -0000 1.12
@@ -67,8 +67,7 @@
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/libxml2
-# target/plugins-dev/libxml/include/libxml2/libxml
+ target/plugins-dev/libxml/include
target/plugins-dev/openssl/include
../win32-msvc/src
../win32-msvc
@@ -115,6 +114,8 @@
../src/affichage.h
../src/affichage_liste.c
../src/affichage_liste.h
+ ../src/balance_estimate_tab.c
+ ../src/balance_estimate_tab.h
../src/barre_outils.c
../src/barre_outils.h
../src/categories_onglet.c
@@ -131,12 +132,15 @@
../src/dialog.h
../src/erreur.c
../src/erreur.h
+ ../src/etats.h
../src/etats_affiche.c
../src/etats_affiche.h
../src/etats_calculs.c
../src/etats_calculs.h
../src/etats_config.c
../src/etats_config.h
+ ../src/etats_csv.c
+ ../src/etats_csv.h
../src/etats_gtktable.c
../src/etats_gtktable.h
../src/etats_html.c
@@ -313,6 +317,7 @@
../src/import_csv.h
../src/imputation_budgetaire.c
../src/imputation_budgetaire.h
+ ../src/include.h
../src/main.c
../src/main.h
../src/main_cunit.c
@@ -401,13 +406,6 @@
MODULE
../src/plugins/ofx/ofx.c
../src/plugins/ofx/ofx.h
- # ../src/dialog.h
- # ../src/import.h
- # ../src/gsb_real.h
- # ../src/utils_str.h
- # ../src/include.h
- # ../src/erreur.h
- # ../src/import.h
)
ADD_CUSTOM_COMMAND ( TARGET ofx
@@ -446,51 +444,51 @@
ADD_CUSTOM_COMMAND(TARGET prepare_env
POST_BUILD
- COMMAND IF NOT EXIST target\\Debug mkdir target\\Debug
- COMMAND IF NOT EXIST target\\Release mkdir target\\Release
+ COMMAND IF NOT EXIST target\\$(ConfigurationName) mkdir target\\$(ConfigurationName)
+ # COMMAND IF NOT EXIST target\\Release mkdir target\\Release
)
-ADD_CUSTOM_COMMAND(TARGET prepare_env
- POST_BUILD
- COMMAND xcopy /Y /C /D target\\gtk-dev\\bin\\*.dll target\\Debug
- COMMAND xcopy /Y /C /D target\\gtk-dev\\bin\\*.dll target\\Release
-)
+# ADD_CUSTOM_COMMAND(TARGET prepare_env
+ # POST_BUILD
+ # COMMAND xcopy /Y /C /D target\\gtk-dev\\bin\\*.dll target\\Debug
+ # COMMAND xcopy /Y /C /D target\\gtk-dev\\bin\\*.dll target\\Release
+# )
-ADD_CUSTOM_COMMAND(TARGET prepare_env
- POST_BUILD
- COMMAND xcopy /S /Y /D target\\gtk-dev\\etc target\\Debug\\etc\\
- COMMAND xcopy /S /Y /D target\\gtk-dev\\etc target\\Release\\etc\\
-)
+# ADD_CUSTOM_COMMAND(TARGET prepare_env
+ # POST_BUILD
+ # COMMAND xcopy /S /Y /D target\\gtk-dev\\etc target\\Debug\\etc\\
+ # COMMAND xcopy /S /Y /D target\\gtk-dev\\etc target\\Release\\etc\\
+# )
-ADD_CUSTOM_COMMAND(TARGET prepare_env
- POST_BUILD
- COMMAND xcopy /S /Y /D target\\gtk-dev\\lib\\gtk-2.0\\2.10.0 target\\Debug\\lib\\gtk-2.0\\2.10.0\\
- COMMAND xcopy /S /Y /D target\\gtk-dev\\lib\\gtk-2.0\\2.10.0 target\\Release\\lib\\gtk-2.0\\2.10.0\\
-)
+# ADD_CUSTOM_COMMAND(TARGET prepare_env
+ # POST_BUILD
+ # COMMAND xcopy /S /Y /D target\\gtk-dev\\lib\\gtk-2.0\\2.10.0 target\\Debug\\lib\\gtk-2.0\\2.10.0\\
+ # COMMAND xcopy /S /Y /D target\\gtk-dev\\lib\\gtk-2.0\\2.10.0 target\\Release\\lib\\gtk-2.0\\2.10.0\\
+# )
ADD_CUSTOM_COMMAND(TARGET prepare_env
POST_BUILD
- COMMAND xcopy /S /Y /D ..\\pixmaps\\*.png target\\Debug\\pixmaps\\
- COMMAND xcopy /S /Y /D ..\\pixmaps\\*.png target\\Release\\pixmaps\\
+ COMMAND xcopy /S /Y /D ..\\pixmaps\\*.png target\\$(ConfigurationName)\\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\\Debug\\help\\
- COMMAND xcopy /S /Y /D ..\\help target\\Release\\help\\
+ COMMAND xcopy /S /Y /D ..\\help target\\$(ConfigurationName)\\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\\Debug\\help\\tips\\categories\\
- COMMAND xcopy /S /Y /D ..\\share\\categories target\\Release\\help\\tips\\categories\\
+ COMMAND xcopy /S /Y /D ..\\share\\categories target\\$(ConfigurationName)\\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\\Debug\\help\\tips\\tips.txt
- COMMAND tools\\dos2unix.cmd ..\\help\\tips\\tips.txt target\\Release\\help\\tips\\tips.txt
+ COMMAND tools\\dos2unix.cmd ..\\help\\tips\\tips.txt target\\$(ConfigurationName)\\help\\tips\\tips.txt
+ # COMMAND tools\\dos2unix.cmd ..\\help\\tips\\tips.txt target\\Release\\help\\tips\\tips.txt
)
set(
@@ -545,8 +543,8 @@
add_custom_command(TARGET prepare_mo
POST_BUILD
- COMMAND IF NOT EXIST target\\Debug\\lib mkdir target\\Debug\\lib
- COMMAND xcopy /S /Y /I /D target\\lib\\locale target\\Debug\\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
+ COMMAND IF NOT EXIST target\\$(ConfigurationName)\\lib mkdir target\\$(ConfigurationName)\\lib
+ COMMAND xcopy /S /Y /I /D target\\lib\\locale target\\$(ConfigurationName)\\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
Index: prepare.cmd
===================================================================
RCS file: /cvsroot/grisbi/grisbi/win32-msvc/prepare.cmd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prepare.cmd 7 Nov 2009 22:02:48 -0000 1.4
+++ prepare.cmd 19 Nov 2009 23:04:52 -0000 1.5
@@ -11,10 +11,31 @@
SET CURRENT_DIR=%CD%
cd ..
wget -nc -c "http://sourceforge.net/projects/gtk-win/files/GTK+ Runtime Environment/GTK+ 2.16/%GTK_BIN_FILE%/download"
-./%GTK_BIN_FILE%
+.\%GTK_BIN_FILE%
cd %CURRENT_DIR%
mkdir target
cd target
+
+:: Download and unzip libxml2 dev and bin files
+wget -nc -c ftp://ftp.zlatkovic.com/libxml/libxml2-2.7.6.win32.zip
+unzip -uo libxml2-2.7.6.win32.zip -d plugins-dev
+
+:: Download and install openssl, copy the required files in the right place
+wget -nc -c http://www.slproweb.com/download/Win32OpenSSL-0_9_8l.exe
+ECHO ***** ATTENTION: Do not modify the default installation path for OpenSSL otherwise you will have trouble compiling *****
+.\Win32OpenSSL-0_9_8l.exe
+mkdir plugins-dev\openssl
+mkdir plugins-dev\openssl\lib
+xcopy /Y C:\OpenSSL\lib\libeay32.lib plugins-dev\openssl\lib\libeay32.lib
+xcopy /Y C:\OpenSSL\lib\ssleay32.lib plugins-dev\openssl\lib\ssleay32.lib
+mkdir plugins-dev\openssl\include
+xcopy /YICD C:\OpenSSL\include\openssl\* plugins-dev\openssl\include\openssl
+xcopy /YICD C:\OpenSSL\*.dll plugins-dev\openssl\bin
+
+:: Download and unzip libofx dev and bin files
+wget -nc -c https://sourceforge.net/projects/grisbi/files/dependancies/0.6/libofx.zip/download
+unzip -uo libofx.zip -d plugins-dev
+
wget -nc -c http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.16/%GTK_DEV_FILE%.zip
:: Checking if already unzipped
:: If the readme file exists for this version, update the unzip
More information about the cvs
mailing list