[grisbi-cvs] grisbi/win32-msvc build.cmd, NONE, 1.1 config.h, NONE, 1.1 package.cmd, NONE, 1.1 .cvsignore, 1.3, 1.4 CMakeLists.txt, 1.4, 1.5 prepare.cmd, 1.1, 1.2
Mickaël Remars
mykeul at users.sourceforge.net
Tue Aug 25 10:22:43 CEST 2009
Update of /cvsroot/grisbi/grisbi/win32-msvc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28385
Modified Files:
.cvsignore CMakeLists.txt prepare.cmd
Added Files:
build.cmd config.h package.cmd
Log Message:
minimalist packaging
--- NEW FILE: config.h ---
/* ************************************************************************** */
/* This file is generated by autogen script , please do not modify it, */
/* your modification will be lost */
/* Copyright (C) 2004- Francois Terrot (francois.terrot at grisbi.org) */
/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation; either version 2 of the License, or */
/* (at your option) any later version. */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program; if not, write to the Free Software */
/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* */
/* ************************************************************************** */
#ifndef _WIN32_CONFIG_H
#define _WIN32_CONFIG_H
#ifdef _WIN32
#define VERSION "0.6.0-grisbi for Windows (GTK 2.12.9)"
#define PACKAGE "grisbi"
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#define ENABLE_NLS 1
/* Define if you have the iconv() function. */
#define HAVE_ICONV 1
/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
#define HAVE_LANGINFO_CODESET 1
/* Define if your <locale.h> file defines LC_MESSAGES. */
#define HAVE_LC_MESSAGES 1
/* Define to 1 if you have the `intl' library (-lintl). */
#define HAVE_LIBINTL 1
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
/* Define to 1 if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
/* Define to 1 if you have the <malloc.h> header file. */
#define HAVE_MALLOC_H 1
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the `mempcpy' function. */
#define HAVE_MEMPCPY 1
/* Define to 1 if you have the `setlocale' function. */
#define HAVE_SETLOCALE 1
/* Define to 1 to have OFX support disabled */
#define NOOFX 1
/* Define to 1 if you want to have OFX support using libofx 0.7.0 */
#define OFX_0_7 1
/* Define to 1 when you do not want to use SSL as crypt algorithm (NOT RECOMMANDED) */
#undef NOSSL
/* Define to 1 to have grisbi plugins management system activated */
#define HAVE_PLUGINS 1
#include "win32utils.h"
#endif // _WIN32
#endif // !_WIN32_CONFIG_H
/* vim:ft=c
* */
Index: .cvsignore
===================================================================
RCS file: /cvsroot/grisbi/grisbi/win32-msvc/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore 24 Aug 2009 20:29:44 -0000 1.3
+++ .cvsignore 25 Aug 2009 08:22:41 -0000 1.4
@@ -1,14 +1,12 @@
cmake_install.cmake
CMakeCache.txt
CMakeFiles
-Debug
grisbi.dir
-gtk+
-Release
+target
ZERO_CHECK.dir
+*.cache
*.ncb
*.sln
*.suo
*.user
-*.vcproj
-*.zip
\ No newline at end of file
+*.vcproj
\ No newline at end of file
Index: prepare.cmd
===================================================================
RCS file: /cvsroot/grisbi/grisbi/win32-msvc/prepare.cmd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prepare.cmd 23 Aug 2009 21:17:17 -0000 1.1
+++ prepare.cmd 25 Aug 2009 08:22:41 -0000 1.2
@@ -1,4 +1,5 @@
@echo off
-wget http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.16/gtk+-bundle_2.16.5-20090731_win32.zip
-unzip gtk+-bundle_2.16.5-20090731_win32.zip -d gtk+
+mkdir target
+wget http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.16/gtk+-bundle_2.16.5-20090731_win32.zip -O target\gtk-dev.zip
+unzip target\gtk-dev.zip -d target\gtk-dev
cmake -G "Visual Studio 9 2008" .
\ No newline at end of file
--- NEW FILE: package.cmd ---
@echo off
set DIR=target\zip
mkdir %DIR%
xcopy /Y Release\*.exe %DIR%
xcopy /S /Y ..\help %DIR%\help\
call tools\dos2unix.cmd ..\help\tips\tips.txt %DIR%\help\tips\tips.txt
xcopy /S /Y ..\pixmaps\*.png %DIR%\pixmaps\
cd %DIR%
zip -r ..\grisbi *
pause
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/grisbi/grisbi/win32-msvc/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CMakeLists.txt 24 Aug 2009 20:15:41 -0000 1.4
+++ CMakeLists.txt 25 Aug 2009 08:22:41 -0000 1.5
@@ -1,5 +1,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+SET(EXECUTABLE_OUTPUT_PATH target)
+
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
ADD_DEFINITIONS(-DHAVE_STRING_H)
ADD_DEFINITIONS(-DNOSSL)
@@ -7,14 +9,14 @@
ADD_DEFINITIONS(-D_WIN32)
INCLUDE_DIRECTORIES(
- ../win32-msvc/gtk+/include/atk-1.0
- ../win32-msvc/gtk+/include/cairo
- ../win32-msvc/gtk+/include/glib-2.0
- ../win32-msvc/gtk+/include/gtk-2.0
- ../win32-msvc/gtk+/include/pango-1.0
- ../win32-msvc/gtk+/include
- ../win32-msvc/gtk+/lib/glib-2.0/include
- ../win32-msvc/gtk+/lib/gtk-2.0/include
+ target/gtk-dev/include/atk-1.0
+ target/gtk-dev/include/cairo
+ target/gtk-dev/include/glib-2.0
+ target/gtk-dev/include/gtk-2.0
+ target/gtk-dev/include/pango-1.0
+ target/gtk-dev/include
+ target/gtk-dev/lib/glib-2.0/include
+ target/gtk-dev/lib/gtk-2.0/include
../win32-msvc/src
../win32-msvc
../win32
@@ -22,7 +24,7 @@
)
LINK_DIRECTORIES(
- ../win32-msvc/gtk+/lib
+ target/gtk-dev/lib
)
LINK_LIBRARIES(
@@ -317,3 +319,21 @@
../win32/win32utils.c
../win32/win32utils.h
)
+
+ADD_CUSTOM_COMMAND(TARGET grisbi
+ PRE_BUILD
+ COMMAND xcopy
+ /S /Y ..\\pixmaps\\*.png $(TargetDir)\\pixmaps\\
+)
+
+ADD_CUSTOM_COMMAND(TARGET grisbi
+ PRE_BUILD
+ COMMAND xcopy
+ /S /Y ..\\help $(TargetDir)\\help\\
+)
+
+ADD_CUSTOM_COMMAND(TARGET grisbi
+ PRE_BUILD
+ COMMAND $(ProjectDir)\\tools\\dos2unix.cmd
+ ..\\help\\tips\\tips.txt $(TargetDir)\\help\\tips\\tips.txt
+)
--- NEW FILE: build.cmd ---
@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
More information about the cvs
mailing list