E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/win32 Log Message: Directory /cvs/e/e17/libs/eet/win32 added to the repository - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/win32/vs8 Log Message: Directory /cvs/e/e17/libs/eet/win32/vs8 added to the repository - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/win32 Added Files: MANIFEST.txt README.txt set_env.bat Log Message: Add Visual Studio solution and vc projects to compile Eet with Microsoft tools For those who want to try it, please read README.txt first Work from Dmitriy Mazovka. Thank you ! - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/win32/vs8 Added Files: eet.sln libeet.vcproj start.bat Log Message: Add Visual Studio solution and vc projects to compile Eet with Microsoft tools For those who want to try it, please read README.txt first Work from Dmitriy Mazovka. Thank you ! - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: ChangeLog Log Message: Add Visual Studio solution and vc projects to compile Eet with Microsoft tools For those who want to try it, please read README.txt first Work from Dmitriy Mazovka. Thank you ! === RCS file: /cvs/e/e17/libs/eet/ChangeLog,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ChangeLog 24 Jul 2008 13:25:18 - 1.12 +++ ChangeLog 24 Jul 2008 18:26:08 - 1.13 @@ -75,4 +75,12 @@ 2008-07-24 Cedric BAIL - * Fix wrongly stored image when compressed size is bigger than uncompressed. Fix bug #523. + * Fix wrongly stored image when compressed size is bigger than + uncompressed. Fix bug #523. + +2008-07-24 Vincent Torri + + * Add Visual Studio solution and vc projects to compile Eet + with Microsoft tools. + + Written by Dmitriy Mazovka. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: ChangeLog INSTALL Log Message: minor fix of the doc about tests and coverage === RCS file: /cvs/e/e17/libs/eet/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ChangeLog 16 May 2008 15:07:03 - 1.5 +++ ChangeLog 16 May 2008 15:32:32 - 1.6 @@ -40,5 +40,6 @@ finding and fixing the bugs of the last three days. The test suite is based on library check. At this time we need cvs version, look at http://check.sourceforge.net/ to find it. - The covering is done by lcov and we also need the cvs version that - you can found at http://ltp.sourceforge.net/coverage/lcov.php. + The covering is done by gcov + The html report is done by lcov version 1.6 or above. + You can found it at http://ltp.sourceforge.net/coverage/lcov.php. === RCS file: /cvs/e/e17/libs/eet/INSTALL,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- INSTALL 16 May 2008 15:07:03 - 1.5 +++ INSTALL 16 May 2008 15:32:32 - 1.6 @@ -11,39 +11,37 @@ To install (run this as root, or the user who handles installs): make install -NOTE: You MUST make install Eet for it to run properly. +To run the unit tests (See Note 5 below): +make check -NOTE: For compilation with MinGW, fnmatch.h is probably missing. - That file can be found here: -http://www.koders.com/c/fid2B518462CB1EED3D4E31E271DB83CD1582F6EEBE.aspx - It should be installed in the mingw include directory. +To get the coverage report (See Notes 6 and 7 below): +make coverage -NOTE: For compilation with mingw32ce, run configure with the option +The report is created in the coverage/ subdir ---host=arm-wince-mingw32ce -NOTE: For compilation with cegcc, you have to do the following steps: -1) After having run autogen.sh, add in config.sub file: - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; +NOTE 1: You MUST make install Eet for it to run properly. -after the mingw32ce case +NOTE 2: For compilation with MinGW, fnmatch.h is probably missing. +That file can be found here: +http://www.koders.com/c/fid2B518462CB1EED3D4E31E271DB83CD1582F6EEBE.aspx +It should be installed in the mingw include directory. -2) in config.sub, add -cegcc* after -pe*. You should have a line like: - | -cygwin* | -pe* | -cegcc* | -psos* | -moss* | -proelf* | -rtems* \ +NOTE 3: For compilation with mingw32ce, run configure with the option + +--host=arm-wince-mingw32ce -3) run configure with the option +NOTE 4: For compilation with cegcc, follow the wiki: ---host=arm-wince-cegcc +http://wiki.enlightenment.org/index.php/Category:EFL_Windows_CE -NOTE: If you want to be able to run make check, you need library check - from http://check.sourceforge.net/. +NOTE 5: If you want to be able to run make check, you need library check +from http://check.sourceforge.net/. -NOTE: If you want to be able to run coverage test over eet, you will need - lcov from http://ltp.sourceforge.net/coverage/lcov.php. +NOTE 6: If you want to be able to run coverage test over eet, you will need +gcov (usually any distro provides it) and lcov from +http://ltp.sourceforge.net/coverage/lcov.php. -NOTE: For coverage support you also need check support. +NOTE 7: For coverage support you also need check support. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: .cvsignore Log Message: ignore libtool 2.2.* m4 files === RCS file: /cvs/e/e17/libs/eet/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- .cvsignore 22 Mar 2007 17:07:46 - 1.12 +++ .cvsignore 28 Apr 2008 09:23:43 - 1.13 @@ -32,3 +32,8 @@ *.spec README eet.c +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: Makefile.am Log Message: actually, autom4te.cache is automatically removed === RCS file: /cvs/e/e17/libs/eet/Makefile.am,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- Makefile.am 19 Apr 2008 21:40:32 - 1.36 +++ Makefile.am 20 Apr 2008 06:03:03 - 1.37 @@ -5,7 +5,6 @@ MAINTAINERCLEANFILES = \ Makefile.in \ aclocal.m4 \ -autom4te.cache \ compile \ config.guess \ config.h.in \ - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: ChangeLog Log Message: add release comment in ChangeLog === RCS file: /cvs/e/e17/libs/eet/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ChangeLog 2 Dec 2002 23:39:25 - 1.2 +++ ChangeLog 21 Apr 2008 05:21:13 - 1.3 @@ -0,0 +1,3 @@ +2008-04-20 Carsten Haitzler (The Rasterman) + + 1.0.0 release - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet
Modified Files:
eet.pc.in
Log Message:
winsock_libs renamed to WIN32_LIBS
===
RCS file: /cvs/e/e17/libs/eet/eet.pc.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- eet.pc.in 25 Sep 2007 18:26:48 - 1.6
+++ eet.pc.in 19 Apr 2008 12:43:21 - 1.7
@@ -7,5 +7,5 @@
Description: Library for speedy data storage, retrieval, and compression
Version: @VERSION@
Libs: -L${libdir} -leet
-Libs.private: -lz -ljpeg @fnmatch_libs@ @winsock_libs@ -lm
+Libs.private: -lz -ljpeg @fnmatch_libs@ @WIN32_LIBS@ -lm
Cflags: -I${includedir}
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/src/lib Modified Files: Makefile.am Log Message: put WIN32_CFLAGS in CFLAGS, not CPPFLAGS. Formatting === RCS file: /cvs/e/e17/libs/eet/src/lib/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- Makefile.am 19 Apr 2008 05:02:30 - 1.23 +++ Makefile.am 19 Apr 2008 21:18:12 - 1.24 @@ -7,11 +7,12 @@ -DPACKAGE_BIN_DIR=\$(bindir)\ \ -DPACKAGE_LIB_DIR=\$(libdir)\ \ -DPACKAGE_DATA_DIR=\$(datadir)/$(PACKAGE)\ \ [EMAIL PROTECTED]@ \ @EVIL_CFLAGS@ -lib_LTLIBRARIES = libeet.la -include_HEADERS = Eet.h +include_HEADERS = Eet.h + +lib_LTLIBRARIES = libeet.la + libeet_la_SOURCES = \ eet_lib.c \ eet_data.c \ @@ -20,8 +21,9 @@ eet_dictionary.c \ eet_utils.c -libeet_la_LIBADD = @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg @fnmatch_libs@ -lm +libeet_la_CFLAGS = @WIN32_CFLAGS@ +libeet_la_LIBADD = @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg @fnmatch_libs@ -lm +libeet_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@ libeet_la_DEPENDENCIES = $(top_builddir)/config.h -libeet_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@ EXTRA_DIST = Eet_private.h - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: configure.in Log Message: put WIN32_CFLAGS in CFLAGS, not CPPFLAGS. Formatting === RCS file: /cvs/e/e17/libs/eet/configure.in,v retrieving revision 1.92 retrieving revision 1.93 diff -u -3 -r1.92 -r1.93 --- configure.in19 Apr 2008 05:02:30 - 1.92 +++ configure.in19 Apr 2008 21:18:12 - 1.93 @@ -33,7 +33,7 @@ lt_no_undefined= lt_enable_auto_import= case $host_os in - mingw|mingw32*|cegcc) + mingw*|cegcc) PKG_CHECK_MODULES([EVIL], [evil]) AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed]) dnl needed for correct definition of EAPI - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/src/bin Modified Files: Makefile.am Log Message: put WIN32_CFLAGS in CFLAGS, not CPPFLAGS. Formatting === RCS file: /cvs/e/e17/libs/eet/src/bin/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- Makefile.am 19 Apr 2008 05:02:30 - 1.11 +++ Makefile.am 19 Apr 2008 21:18:12 - 1.12 @@ -12,5 +12,7 @@ bin_PROGRAMS = eet eet_SOURCES = eet_main.c -eet_LDADD = $(top_builddir)/src/lib/libeet.la @lt_enable_auto_import@ +eet_CFLAGS = @WIN32_CFLAGS@ +eet_LDADD = $(top_builddir)/src/lib/libeet.la +eet_LDFLAGS = @lt_enable_auto_import@ eet_DEPENDENCIES = $(top_builddir)/src/lib/libeet.la - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: Makefile.am Log Message: missing space === RCS file: /cvs/e/e17/libs/eet/Makefile.am,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- Makefile.am 19 Apr 2008 05:02:30 - 1.34 +++ Makefile.am 19 Apr 2008 21:25:50 - 1.35 @@ -13,7 +13,7 @@ install-sh \ ltmain.sh \ missing \ -eet_docs.tar.gz\ +eet_docs.tar.gz \ m4/libtool.m4 \ m4/lt~obsolete.m4 \ m4/ltoptions.m4 \ - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: Makefile.am configure.in Log Message: add requested macro, hence more things to clean. add autogen.sh to dist === RCS file: /cvs/e/e17/libs/eet/Makefile.am,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- Makefile.am 19 Apr 2008 21:25:50 - 1.35 +++ Makefile.am 19 Apr 2008 21:40:32 - 1.36 @@ -5,6 +5,8 @@ MAINTAINERCLEANFILES = \ Makefile.in \ aclocal.m4 \ +autom4te.cache \ +compile \ config.guess \ config.h.in \ config.sub \ @@ -24,16 +26,16 @@ AUTHORS \ COPYING \ COPYING-PLAIN \ +autogen.sh \ eet.c.in \ -README.in \ -README \ eet.pc.in \ eet.spec.in \ eet.spec \ +README.in \ +README \ Doxyfile \ doc \ gendoc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = eet.pc - === RCS file: /cvs/e/e17/libs/eet/configure.in,v retrieving revision 1.93 retrieving revision 1.94 diff -u -3 -r1.93 -r1.94 --- configure.in19 Apr 2008 21:18:12 - 1.93 +++ configure.in19 Apr 2008 21:40:32 - 1.94 @@ -15,6 +15,7 @@ AM_PROG_CC_STDC AC_HEADER_STDC AC_C_CONST +AM_PROG_CC_C_O AC_LIBTOOL_WIN32_DLL define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/src/lib Modified Files: Makefile.am Log Message: * rename lt_auto_import to lt_enable_auto_import * remove warning with newest autoconf's (check of __attribute__) * fix maintainer-clean rule (expecially with libtool 2.2.*) * formatting of the top level Makefile.am === RCS file: /cvs/e/e17/libs/eet/src/lib/Makefile.am,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- Makefile.am 15 Apr 2008 22:31:35 - 1.22 +++ Makefile.am 19 Apr 2008 05:02:30 - 1.23 @@ -22,6 +22,6 @@ libeet_la_LIBADD = @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg @fnmatch_libs@ -lm libeet_la_DEPENDENCIES = $(top_builddir)/config.h -libeet_la_LDFLAGS = @lt_no_undefined@ @lt_auto_import@ -version-info @version_info@ +libeet_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@ EXTRA_DIST = Eet_private.h - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/src/bin Modified Files: Makefile.am Log Message: * rename lt_auto_import to lt_enable_auto_import * remove warning with newest autoconf's (check of __attribute__) * fix maintainer-clean rule (expecially with libtool 2.2.*) * formatting of the top level Makefile.am === RCS file: /cvs/e/e17/libs/eet/src/bin/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 15 Apr 2008 22:31:35 - 1.10 +++ Makefile.am 19 Apr 2008 05:02:30 - 1.11 @@ -12,5 +12,5 @@ bin_PROGRAMS = eet eet_SOURCES = eet_main.c -eet_LDADD = $(top_builddir)/src/lib/libeet.la @lt_auto_import@ +eet_LDADD = $(top_builddir)/src/lib/libeet.la @lt_enable_auto_import@ eet_DEPENDENCIES = $(top_builddir)/src/lib/libeet.la - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet
Modified Files:
Makefile.am configure.in
Log Message:
* rename lt_auto_import to lt_enable_auto_import
* remove warning with newest autoconf's (check of __attribute__)
* fix maintainer-clean rule (expecially with libtool 2.2.*)
* formatting of the top level Makefile.am
===
RCS file: /cvs/e/e17/libs/eet/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- Makefile.am 25 Jan 2008 04:40:27 - 1.33
+++ Makefile.am 19 Apr 2008 05:02:30 - 1.34
@@ -2,21 +2,37 @@
SUBDIRS = src
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
- config.h.in config.sub configure install-sh \
- ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in build-stamp configure-stamp depcomp \
- eet_docs.tar.gz \
- README \
- eet.pc \
- eet.spec
+MAINTAINERCLEANFILES = \
+Makefile.in \
+aclocal.m4 \
+config.guess \
+config.h.in \
+config.sub \
+configure \
+depcomp \
+install-sh \
+ltmain.sh \
+missing \
+eet_docs.tar.gz\
+m4/libtool.m4 \
+m4/lt~obsolete.m4 \
+m4/ltoptions.m4 \
+m4/ltsugar.m4 \
+m4/ltversion.m4
-EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN eet.c.in \
-README.in README \
-eet.pc.in \
-eet.spec.in eet.spec \
-Doxyfile \
-doc gendoc
+EXTRA_DIST = \
+AUTHORS \
+COPYING \
+COPYING-PLAIN \
+eet.c.in \
+README.in \
+README \
+eet.pc.in \
+eet.spec.in \
+eet.spec \
+Doxyfile \
+doc \
+gendoc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = eet.pc
===
RCS file: /cvs/e/e17/libs/eet/configure.in,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- configure.in15 Apr 2008 22:31:35 - 1.91
+++ configure.in19 Apr 2008 05:02:30 - 1.92
@@ -31,7 +31,7 @@
WIN32_CFLAGS=
WIN32_LIBS=
lt_no_undefined=
-lt_auto_import=
+lt_enable_auto_import=
case $host_os in
mingw|mingw32*|cegcc)
PKG_CHECK_MODULES([EVIL], [evil])
@@ -41,7 +41,7 @@
if test $host_os = cegcc ; then
WIN32_CFLAGS=-mwin32
WIN32_LIBS=-lws2
- lt_auto_import=-Wl,--enable-auto-import
+ lt_enable_auto_import=-Wl,--enable-auto-import
else
WIN32_LIBS=-lws2_32
fi
@@ -51,23 +51,23 @@
AC_SUBST(WIN32_CFLAGS)
AC_SUBST(WIN32_LIBS)
AC_SUBST(lt_no_undefined)
-AC_SUBST(lt_auto_import)
+AC_SUBST(lt_enable_auto_import)
dnl Checking for __attribute__ support
AC_MSG_CHECKING([for __attribute__])
-AC_CACHE_VAL(have___attribute__,
+AC_CACHE_VAL(_cv_have___attribute__,
[
AC_TRY_COMPILE([#include stdlib.h],
[int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
- [have___attribute__=yes],
- [have___attribute__=no])
+ [_cv_have___attribute__=yes],
+ [_cv_have___attribute__=no])
]
)
-if test x${have___attribute__} = xyes ; then
+if test x${_cv_have___attribute__} = xyes ; then
AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has
__attribute__])
fi
-AC_MSG_RESULT(${have___attribute__})
+AC_MSG_RESULT(${_cv_have___attribute__})
AC_FUNC_ALLOCA
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/src/lib Modified Files: Makefile.am Log Message: * rename 'create_shared_lib' to 'lt_no_undefined' * auto import symbols when compiling with cegcc === RCS file: /cvs/e/e17/libs/eet/src/lib/Makefile.am,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- Makefile.am 13 Apr 2008 09:17:47 - 1.21 +++ Makefile.am 15 Apr 2008 22:31:35 - 1.22 @@ -22,6 +22,6 @@ libeet_la_LIBADD = @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg @fnmatch_libs@ -lm libeet_la_DEPENDENCIES = $(top_builddir)/config.h -libeet_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@ +libeet_la_LDFLAGS = @lt_no_undefined@ @lt_auto_import@ -version-info @version_info@ EXTRA_DIST = Eet_private.h - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: configure.in Log Message: * rename 'create_shared_lib' to 'lt_no_undefined' * auto import symbols when compiling with cegcc === RCS file: /cvs/e/e17/libs/eet/configure.in,v retrieving revision 1.90 retrieving revision 1.91 diff -u -3 -r1.90 -r1.91 --- configure.in3 Apr 2008 19:47:07 - 1.90 +++ configure.in15 Apr 2008 22:31:35 - 1.91 @@ -30,7 +30,8 @@ WIN32_CFLAGS= WIN32_LIBS= -create_shared_lib= +lt_no_undefined= +lt_auto_import= case $host_os in mingw|mingw32*|cegcc) PKG_CHECK_MODULES([EVIL], [evil]) @@ -40,15 +41,17 @@ if test $host_os = cegcc ; then WIN32_CFLAGS=-mwin32 WIN32_LIBS=-lws2 + lt_auto_import=-Wl,--enable-auto-import else WIN32_LIBS=-lws2_32 fi - create_shared_lib=-no-undefined + lt_no_undefined=-no-undefined ;; esac AC_SUBST(WIN32_CFLAGS) AC_SUBST(WIN32_LIBS) -AC_SUBST(create_shared_lib) +AC_SUBST(lt_no_undefined) +AC_SUBST(lt_auto_import) dnl Checking for __attribute__ support AC_MSG_CHECKING([for __attribute__]) - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/src/bin Modified Files: Makefile.am Log Message: * rename 'create_shared_lib' to 'lt_no_undefined' * auto import symbols when compiling with cegcc === RCS file: /cvs/e/e17/libs/eet/src/bin/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 4 Nov 2007 09:10:50 - 1.9 +++ Makefile.am 15 Apr 2008 22:31:35 - 1.10 @@ -12,5 +12,5 @@ bin_PROGRAMS = eet eet_SOURCES = eet_main.c -eet_LDADD = $(top_builddir)/src/lib/libeet.la +eet_LDADD = $(top_builddir)/src/lib/libeet.la @lt_auto_import@ eet_DEPENDENCIES = $(top_builddir)/src/lib/libeet.la - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/src/lib Modified Files: Makefile.am Log Message: Eet_private.h is not a source file === RCS file: /cvs/e/e17/libs/eet/src/lib/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- Makefile.am 8 Mar 2008 07:28:12 - 1.20 +++ Makefile.am 13 Apr 2008 09:17:47 - 1.21 @@ -18,9 +18,10 @@ eet_image.c \ eet_memfile.c \ eet_dictionary.c \ -eet_utils.c \ -Eet_private.h +eet_utils.c libeet_la_LIBADD = @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg @fnmatch_libs@ -lm libeet_la_DEPENDENCIES = $(top_builddir)/config.h libeet_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@ + +EXTRA_DIST = Eet_private.h - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/src/lib Modified Files: eet_data.c eet_lib.c Log Message: cegcc (not mingw32ce) defines same structures, functions etc. in both in.h and winsock2.h. So do not include winsock2.h with that compiler === RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -3 -r1.70 -r1.71 --- eet_data.c 3 Apr 2008 19:47:07 - 1.70 +++ eet_data.c 9 Apr 2008 08:27:17 - 1.71 @@ -21,7 +21,7 @@ # include netinet/in.h #endif -#ifdef _WIN32 +#if defined(_WIN32) ! defined(__CEGCC__) # include winsock2.h #endif === RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v retrieving revision 1.100 retrieving revision 1.101 diff -u -3 -r1.100 -r1.101 --- eet_lib.c 3 Apr 2008 19:30:08 - 1.100 +++ eet_lib.c 9 Apr 2008 08:27:17 - 1.101 @@ -39,7 +39,7 @@ # include netinet/in.h #endif -#ifdef _WIN32 +#if defined(_WIN32) ! defined(__CEGCC__) # include winsock2.h #endif - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: README.in Log Message: add Windows requirement, remove trailing spaces === RCS file: /cvs/e/e17/libs/eet/README.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- README.in 3 Apr 2008 18:47:14 - 1.7 +++ README.in 3 Apr 2008 19:17:50 - 1.8 @@ -4,6 +4,7 @@ - Must: libc libm zlib libjpeg + Windows: evil ** *** @@ -34,12 +35,12 @@ make (do this as root unless you are installing in your users directories): make install - + -- BUILDING PACKAGES: RPM: To build rpm packages: - + sudo rpm -ta @[EMAIL PROTECTED]@[EMAIL PROTECTED] You will find rpm packages in your system /usr/src/redhat/* dirs (note you may - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_data.c
Log Message:
add unsued attribute when needed
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- eet_data.c 28 Mar 2008 17:17:43 - 1.69
+++ eet_data.c 3 Apr 2008 19:47:07 - 1.70
@@ -6,6 +6,12 @@
# include config.h
#endif
+#if HAVE___ATTRIBUTE__
+#define __UNUSED__ __attribute__((unused))
+#else
+#define __UNUSED__
+#endif
+
#include stdio.h
#include string.h
#include math.h
@@ -243,7 +249,7 @@
/* CHAR TYPE */
static int
-eet_data_get_char(const Eet_Dictionary *ed, const void *src, const void
*src_end, void *dst)
+eet_data_get_char(const Eet_Dictionary *ed __UNUSED__, const void *src, const
void *src_end, void *dst)
{
char *s, *d;
@@ -256,7 +262,7 @@
}
static void *
-eet_data_put_char(Eet_Dictionary *ed, const void *src, int *size_ret)
+eet_data_put_char(Eet_Dictionary *ed __UNUSED__, const void *src, int
*size_ret)
{
char *s, *d;
@@ -271,7 +277,7 @@
/* SHORT TYPE */
static int
-eet_data_get_short(const Eet_Dictionary *ed, const void *src, const void
*src_end, void *dst)
+eet_data_get_short(const Eet_Dictionary *ed __UNUSED__, const void *src, const
void *src_end, void *dst)
{
short *d;
@@ -283,7 +289,7 @@
}
static void *
-eet_data_put_short(Eet_Dictionary *ed, const void *src, int *size_ret)
+eet_data_put_short(Eet_Dictionary *ed __UNUSED__, const void *src, int
*size_ret)
{
short *s, *d;
@@ -298,7 +304,7 @@
/* INT TYPE */
static int
-eet_data_get_int(const Eet_Dictionary *ed, const void *src, const void
*src_end, void *dst)
+eet_data_get_int(const Eet_Dictionary *ed __UNUSED__, const void *src, const
void *src_end, void *dst)
{
int *d;
@@ -310,7 +316,7 @@
}
static void *
-eet_data_put_int(Eet_Dictionary *ed, const void *src, int *size_ret)
+eet_data_put_int(Eet_Dictionary *ed __UNUSED__, const void *src, int *size_ret)
{
int *s, *d;
@@ -325,7 +331,7 @@
/* LONG LONG TYPE */
static int
-eet_data_get_long_long(const Eet_Dictionary *ed, const void *src, const void
*src_end, void *dst)
+eet_data_get_long_long(const Eet_Dictionary *ed __UNUSED__, const void *src,
const void *src_end, void *dst)
{
unsigned long long *d;
@@ -337,7 +343,7 @@
}
static void *
-eet_data_put_long_long(Eet_Dictionary *ed, const void *src, int *size_ret)
+eet_data_put_long_long(Eet_Dictionary *ed __UNUSED__, const void *src, int
*size_ret)
{
unsigned long long *s, *d;
@@ -416,13 +422,13 @@
/* ALWAYS INLINED STRING TYPE */
static int
-eet_data_get_istring(const Eet_Dictionary *ed, const void *src, const void
*src_end, void *dst)
+eet_data_get_istring(const Eet_Dictionary *ed __UNUSED__, const void *src,
const void *src_end, void *dst)
{
return eet_data_get_string(NULL, src, src_end, dst);
}
static void *
-eet_data_put_istring(Eet_Dictionary *ed, const void *src, int *size_ret)
+eet_data_put_istring(Eet_Dictionary *ed __UNUSED__, const void *src, int
*size_ret)
{
return eet_data_put_string(NULL, src, size_ret);
}
@@ -1222,7 +1228,7 @@
}
static int
-eet_data_descriptor_encode_hash_cb(void *hash, const char *key, void *hdata,
void *fdata)
+eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__, const char *key,
void *hdata, void *fdata)
{
Eet_Dictionary *ed;
Eet_Data_Encode_Hash_Info*edehi;
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet
Modified Files:
configure.in
Log Message:
add unsued attribute when needed
===
RCS file: /cvs/e/e17/libs/eet/configure.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- configure.in29 Mar 2008 08:27:44 - 1.89
+++ configure.in3 Apr 2008 19:47:07 - 1.90
@@ -28,8 +28,6 @@
version_info=`expr $VMAJ + $VMIN`:$VMIC:$VMIN
AC_SUBST(version_info)
-AC_FUNC_ALLOCA
-
WIN32_CFLAGS=
WIN32_LIBS=
create_shared_lib=
@@ -51,6 +49,24 @@
AC_SUBST(WIN32_CFLAGS)
AC_SUBST(WIN32_LIBS)
AC_SUBST(create_shared_lib)
+
+dnl Checking for __attribute__ support
+AC_MSG_CHECKING([for __attribute__])
+AC_CACHE_VAL(have___attribute__,
+ [
+AC_TRY_COMPILE([#include stdlib.h],
+ [int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); }],
+ [have___attribute__=yes],
+ [have___attribute__=no])
+ ]
+)
+
+if test x${have___attribute__} = xyes ; then
+ AC_DEFINE(HAVE___ATTRIBUTE__, 1, [Define to 1 if your compiler has
__attribute__])
+fi
+AC_MSG_RESULT(${have___attribute__})
+
+AC_FUNC_ALLOCA
AC_CHECK_HEADER(zlib.h,, AC_MSG_ERROR(Cannot find zlib.h. Make sure your
CFLAGS environment variable contains include lines for the location of this
file))
AC_CHECK_HEADER(jpeglib.h,, AC_MSG_ERROR(Cannot find jpeglib.h. Make sure
your CFLAGS environment variable contains include lines for the location of
this file))
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/src/lib Modified Files: Eet.h eet_lib.c Log Message: remove trailing spaces and factorize Windows detection === RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v retrieving revision 1.50 retrieving revision 1.51 diff -u -3 -r1.50 -r1.51 --- Eet.h 28 Mar 2008 14:37:29 - 1.50 +++ Eet.h 29 Mar 2008 07:28:18 - 1.51 @@ -230,19 +230,19 @@ * Return a handle to the shared string dictionary of the Eet file * @param ef A valid eet file handle. * @return A handle to the dictionary of the file -* +* * This function returns a handle to the dictionary of an Eet file whose * handle is @p ef, if a dictionary exists. NULL is returned otherwise or * if the file handle is known to be invalid. */ EAPI Eet_Dictionary *eet_dictionary_get(Eet_File *ef); - + /** * Check if a given string comes from a given dictionary * @param ed A valid dictionary handle * @param string A valid 0 byte terminated C string * @return 1 if it is in the dictionary, 0 otherwise -* +* * This checks the given dictionary to see if the given string is actually * inside that dictionary (i.e. comes from it) and returns 1 if it does. * If the dictionary handle is invlide, the string is NULL or the string is === RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v retrieving revision 1.98 retrieving revision 1.99 diff -u -3 -r1.98 -r1.99 --- eet_lib.c 28 Mar 2008 17:29:22 - 1.98 +++ eet_lib.c 29 Mar 2008 07:28:18 - 1.99 @@ -1065,7 +1065,7 @@ if (eet_test_close((ef-data == (void *)-1) || (ef-data == NULL), ef)) return NULL; - + if (eet_test_close(ef-data_size sizeof(int) * 3, ef)) return NULL; @@ -1080,7 +1080,7 @@ eet_close(ef); break; } - + return NULL; } - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: configure.in Log Message: remove trailing spaces and factorize Windows detection === RCS file: /cvs/e/e17/libs/eet/configure.in,v retrieving revision 1.87 retrieving revision 1.88 diff -u -3 -r1.87 -r1.88 --- configure.in28 Mar 2008 14:37:29 - 1.87 +++ configure.in29 Mar 2008 07:28:18 - 1.88 @@ -34,21 +34,17 @@ WIN32_LIBS= create_shared_lib= case $host_os in - mingw|mingw32) + mingw|mingw32*|cegcc) PKG_CHECK_MODULES([EVIL], [evil]) AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed]) dnl needed for correct definition of EAPI AC_DEFINE(EFL_EET_BUILD, 1, [Define to mention that eet is built]) - WIN32_LIBS=-lws2_32 - create_shared_lib=-no-undefined - ;; - cegcc) - PKG_CHECK_MODULES([EVIL], [evil]) - AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed]) - dnl needed for correct definition of EAPI - AC_DEFINE(EFL_EET_BUILD, 1, [Define to mention that eet is built]) - WIN32_CFLAGS=-mwin32 - WIN32_LIBS=-lws2 + if test $host_os = cegcc ; then + WIN32_CFLAGS=-mwin32 + WIN32_LIBS=-lws2 + else + WIN32_LIBS=-lws2_32 + fi create_shared_lib=-no-undefined ;; esac - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/bin
Modified Files:
eet_main.c
Log Message:
remove trailing spaces and factorize Windows detection
===
RCS file: /cvs/e/e17/libs/eet/src/bin/eet_main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- eet_main.c 28 Mar 2008 14:37:29 - 1.11
+++ eet_main.c 29 Mar 2008 07:28:18 - 1.12
@@ -10,7 +10,7 @@
int i, num;
char **list;
Eet_File *ef;
-
+
ef = eet_open(file, EET_FILE_MODE_READ);
if (!ef)
{
@@ -34,7 +34,7 @@
void *data;
int size = 0;
FILE *f;
-
+
ef = eet_open(file, EET_FILE_MODE_READ);
if (!ef)
{
@@ -76,7 +76,7 @@
void *data;
int size = 0;
FILE *f;
-
+
ef = eet_open(file, EET_FILE_MODE_READ);
if (!ef)
{
@@ -112,7 +112,7 @@
void *data;
int size = 0;
FILE *f;
-
+
ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
if (!ef)
ef = eet_open(file, EET_FILE_MODE_WRITE);
@@ -156,7 +156,7 @@
void *data;
int size = 0;
FILE *f;
-
+
ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
if (!ef)
ef = eet_open(file, EET_FILE_MODE_WRITE);
@@ -202,7 +202,7 @@
do_eet_remove(const char *file, const char *key)
{
Eet_File *ef;
-
+
ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
if (!ef)
{
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: gendoc Log Message: do not overwrite eet.c as it has been modified by configure === RCS file: /cvs/e/e17/libs/eet/gendoc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- gendoc 6 Dec 2007 18:38:09 - 1.4 +++ gendoc 29 Mar 2008 08:25:43 - 1.5 @@ -1,5 +1,4 @@ #!/bin/sh -cp ./eet.c.in ./eet.c for I in `find ./src/lib -name Eet.h -print`; do cat $I ./eet.c done - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: configure.in Log Message: use correct variables for the name and version of the package === RCS file: /cvs/e/e17/libs/eet/configure.in,v retrieving revision 1.88 retrieving revision 1.89 diff -u -3 -r1.88 -r1.89 --- configure.in29 Mar 2008 07:28:18 - 1.88 +++ configure.in29 Mar 2008 08:27:44 - 1.89 @@ -116,7 +116,7 @@ echo echo echo -echo $PACKAGE $VERSION +echo $PACKAGE_NAME $PACKAGE_VERSION echo echo echo Configuration Options Summary: - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: gendoc Doxyfile eet.c.in Log Message: use INPUT entry of Doxyfile instead of adding Eet.h at the end of eet.c, update the date. remove trailing spaces. Maybe we should add Cedric as author === RCS file: /cvs/e/e17/libs/eet/gendoc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- gendoc 29 Mar 2008 08:25:43 - 1.5 +++ gendoc 29 Mar 2008 08:39:22 - 1.6 @@ -1,10 +1,4 @@ #!/bin/sh -for I in `find ./src/lib -name Eet.h -print`; do - cat $I ./eet.c -done -#for I in `find ./src/lib -name *.c -print`; do -# cat $I ./eet.c -#done rm -rf ./doc/html ./doc/latex ./doc/man doxygen cp doc/img/* doc/html/ === RCS file: /cvs/e/e17/libs/eet/Doxyfile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Doxyfile6 Dec 2007 18:38:09 - 1.4 +++ Doxyfile29 Mar 2008 08:39:22 - 1.5 @@ -1,7 +1,7 @@ PROJECT_NAME = Eet PROJECT_NUMBER = OUTPUT_DIRECTORY = doc -INPUT = eet.c +INPUT = eet.c src/lib/Eet.h IMAGE_PATH = doc/img OUTPUT_LANGUAGE= English GENERATE_HTML = YES === RCS file: /cvs/e/e17/libs/eet/eet.c.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- eet.c.in27 Sep 2005 22:10:08 - 1.9 +++ eet.c.in29 Mar 2008 08:39:22 - 1.10 @@ -1,7 +1,7 @@ -/** [EMAIL PROTECTED] +/** [EMAIL PROTECTED] eet.c @brief Eet Data Handling Library Public API Calls - + These routines are used for Eet Library interaction */ @@ -9,9 +9,9 @@ @mainpage Eet Library Documentation @image html eet.png [EMAIL PROTECTED] @VERSION@ [EMAIL PROTECTED] Carsten Haitzler [EMAIL PROTECTED] [EMAIL PROTECTED] 2000-2004 [EMAIL PROTECTED] @PACKAGE_VERSION@ [EMAIL PROTECTED] Carsten Haitzler [EMAIL PROTECTED] [EMAIL PROTECTED] 2000-2008 @@ -71,14 +71,14 @@ }; eet_init(); - + // blindly open an file for output and write strings with their NUL char ef = eet_open(test.eet, EET_FILE_MODE_WRITE); eet_write(ef, Entry 1, entries[0], strlen(entries[0]) + 1, 0); eet_write(ef, Entry 2, entries[1], strlen(entries[1]) + 1, 1); eet_write(ef, Entry 3, entries[2], strlen(entries[2]) + 1, 0); eet_close(ef); - + // open the file again and blindly get the entries we wrote ef = eet_open(test.eet, EET_FILE_MODE_READ); ret = eet_read(ef, Entry 1, size); - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet_private.h eet_data.c eet_dictionary.c eet_image.c
eet_lib.c eet_memfile.c
Log Message:
reorganise header files so that evil is better included. Please test before the
release.
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet_private.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- Eet_private.h 9 Mar 2008 16:16:40 - 1.23
+++ Eet_private.h 28 Mar 2008 17:17:43 - 1.24
@@ -5,48 +5,6 @@
#ifndef _EET_PRIVATE_H
#define _EET_PRIVATE_H
-#include stdio.h
-#include unistd.h
-#include limits.h
-#include stdlib.h
-#include time.h
-#include sys/types.h
-#include sys/stat.h
-#include fcntl.h
-#include errno.h
-#ifdef HAVE_ALLOCA_H
-# include alloca.h
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include malloc.h
-# define alloca _alloca
-#else
-# include stddef.h
-# ifdef __cplusplus
-extern C
-# endif
-void *alloca (size_t);
-#endif
-#include ctype.h
-
-#ifdef HAVE_NETINET_IN_H
-# include netinet/in.h
-#endif
-
-#ifdef HAVE_EVIL
-# include Evil.h
-#endif
-
-#include zlib.h
-#include string.h
-#include fnmatch.h
-#include jpeglib.h
-#include setjmp.h
-#include locale.h
-
#ifdef __GNUC__
# if __GNUC__ = 4
// BROKEN in gcc 4 on amd64
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- eet_data.c 9 Mar 2008 16:16:40 - 1.68
+++ eet_data.c 28 Mar 2008 17:17:43 - 1.69
@@ -2,10 +2,21 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
*/
+#ifdef HAVE_CONFIG_H
+# include config.h
+#endif
+
+#include stdio.h
+#include string.h
#include math.h
+#include ctype.h
-#ifdef HAVE_CONFIG_H
-# include config.h /* so that EAPI in Eet.h is correctly defined */
+#ifdef HAVE_NETINET_IN_H
+# include netinet/in.h
+#endif
+
+#ifdef _WIN32
+# include winsock2.h
#endif
#include Eet.h
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_dictionary.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eet_dictionary.c9 Mar 2008 16:16:40 - 1.4
+++ eet_dictionary.c28 Mar 2008 17:17:43 - 1.5
@@ -2,11 +2,13 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
*/
-#include math.h
-
#ifdef HAVE_CONFIG_H
-# include config.h /* so that EAPI in Eet.h is correctly defined */
+# include config.h
#endif
+
+#include stdio.h
+#include string.h
+#include math.h
#include Eet.h
#include Eet_private.h
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- eet_image.c 8 Mar 2008 07:28:12 - 1.18
+++ eet_image.c 28 Mar 2008 17:17:43 - 1.19
@@ -3,8 +3,30 @@
*/
#ifdef HAVE_CONFIG_H
-# include config.h /* so that EAPI in Eet.h is correctly defined */
+# include config.h
#endif
+
+#ifdef HAVE_ALLOCA_H
+# include alloca.h
+#elif defined __GNUC__
+# define alloca __builtin_alloca
+#elif defined _AIX
+# define alloca __alloca
+#elif defined _MSC_VER
+# include malloc.h
+# define alloca _alloca
+#else
+# include stddef.h
+# ifdef __cplusplus
+extern C
+# endif
+void *alloca (size_t);
+#endif
+
+#include stdio.h
+#include zlib.h
+#include jpeglib.h
+#include setjmp.h
#include Eet.h
#include Eet_private.h
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- eet_lib.c 28 Mar 2008 14:37:29 - 1.96
+++ eet_lib.c 28 Mar 2008 17:17:43 - 1.97
@@ -3,14 +3,50 @@
*/
#ifdef HAVE_CONFIG_H
-# include config.h /* so that EAPI in Eet.h is correctly defined */
+# include config.h
#endif
-#include Eet.h
-#include Eet_private.h
+#ifdef HAVE_ALLOCA_H
+# include alloca.h
+#elif defined __GNUC__
+# define alloca __builtin_alloca
+#elif defined _AIX
+# define alloca __alloca
+#elif defined _MSC_VER
+# include malloc.h
+# define alloca _alloca
+#else
+# include stddef.h
+# ifdef __cplusplus
+extern C
+# endif
+void *alloca (size_t);
+#endif
+#include stdio.h
+#include errno.h
#include sys/types.h
+#include sys/stat.h
#include sys/mman.h
+#include time.h
+#include fnmatch.h
+#include fcntl.h
+#include zlib.h
+
+#ifdef HAVE_NETINET_IN_H
+# include netinet/in.h
+#endif
+
+#ifdef _WIN32
+# include winsock2.h
+#endif
+
+#ifdef HAVE_EVIL
+# include Evil.h
+#endif
+
+#include Eet.h
+#include Eet_private.h
#ifdef HAVE_REALPATH
#undef HAVE_REALPATH
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h eet_data.c eet_image.c eet_lib.c eet_memfile.c
Log Message:
* EAPI_DEF is actually useless. go back to EAPI
before using the correct way to deal with
dllimport / dllexport on Windows
* remove some trailing spaces
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- Eet.h 6 Mar 2008 17:52:59 - 1.47
+++ Eet.h 7 Mar 2008 09:59:37 - 1.48
@@ -12,7 +12,6 @@
# else
# define EAPI __declspec(dllimport)
# endif
-# define EAPI_DEF
#else
# ifdef __GNUC__
# if __GNUC__ = 4
@@ -23,7 +22,6 @@
# else
# define EAPI
# endif
-# define EAPI_DEF EAPI
#endif
#ifdef __cplusplus
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- eet_data.c 6 Mar 2008 17:52:59 - 1.65
+++ eet_data.c 7 Mar 2008 09:59:37 - 1.66
@@ -596,7 +596,7 @@
*
* char[4] = CHnK; // untyped data ... or
* char[4] = CHKx; // typed data - x == type
- *
+ *
* int = chunk size (including magic string);
* char[] = chuck magic/name string (0 byte terminated);
* ... sub-chunks (a chunk can contain chuncks recusrively) ...
@@ -789,14 +789,14 @@
_eet_descriptor_hash_new(Eet_Data_Descriptor *edd)
{
int i;
-
+
edd-elements.hash.size = 1 6;
edd-elements.hash.buckets = calloc(1, sizeof(Eet_Data_Descriptor_Hash) *
edd-elements.hash.size);
for (i = 0; i edd-elements.num; i++)
{
Eet_Data_Element *ede;
int hash;
-
+
ede = (edd-elements.set[i]);
hash = _eet_hash_gen((char *) ede-name, 6);
if (!edd-elements.hash.buckets[hash].element)
@@ -804,7 +804,7 @@
else
{
Eet_Data_Descriptor_Hash *bucket;
-
+
bucket = calloc(1, sizeof(Eet_Data_Descriptor_Hash));
bucket-element = ede;
bucket-next = edd-elements.hash.buckets[hash].next;
@@ -817,11 +817,11 @@
_eet_descriptor_hash_free(Eet_Data_Descriptor *edd)
{
int i;
-
+
for (i = 0; i edd-elements.hash.size; i++)
{
Eet_Data_Descriptor_Hash *bucket, *pbucket;
-
+
bucket = edd-elements.hash.buckets[i].next;
while (bucket)
{
@@ -838,7 +838,7 @@
{
int hash;
Eet_Data_Descriptor_Hash *bucket;
-
+
hash = _eet_hash_gen(name, 6);
if (!edd-elements.hash.buckets[hash].element) return NULL;
if (!strcmp(edd-elements.hash.buckets[hash].element-name, name))
@@ -878,7 +878,7 @@
/*---*/
-EAPI_DEF Eet_Data_Descriptor *
+EAPI Eet_Data_Descriptor *
eet_data_descriptor_new(const char *name,
int size,
void *(*func_list_next) (void *l),
@@ -914,7 +914,7 @@
}
/* new replcement */
-EAPI_DEF Eet_Data_Descriptor *
+EAPI Eet_Data_Descriptor *
eet_data_descriptor2_new(Eet_Data_Descriptor_Class *eddc)
{
Eet_Data_Descriptor *edd;
@@ -949,7 +949,7 @@
return edd;
}
-EAPI_DEF Eet_Data_Descriptor *
+EAPI Eet_Data_Descriptor *
eet_data_descriptor3_new(Eet_Data_Descriptor_Class *eddc)
{
Eet_Data_Descriptor *edd;
@@ -988,7 +988,7 @@
return edd;
}
-EAPI_DEF void
+EAPI void
eet_data_descriptor_free(Eet_Data_Descriptor *edd)
{
_eet_descriptor_hash_free(edd);
@@ -996,8 +996,8 @@
free(edd);
}
-EAPI_DEF void
-eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
+EAPI void
+eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
const char *name, int type,
int group_type,
int offset,
@@ -1023,7 +1023,7 @@
ede-subtype = subtype;
}
-EAPI_DEF void *
+EAPI void *
eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name)
{
const Eet_Dictionary *ed = NULL;
@@ -1049,7 +1049,7 @@
return data_dec;
}
-EAPI_DEF int
+EAPI int
eet_data_write(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const
void *data, int compress)
{
Eet_Dictionary *ed;
@@ -1267,8 +1267,8 @@
for (strp = str; *strp; strp++)
{
- if (*strp == '\') sz += 2;
- else if (*strp == '\\') sz += 2;
+ if (*strp == '\') sz += 2;
+ else if (*strp == '\\') sz += 2;
else sz += 1;
}
s = malloc(sz + 1);
@@ -1295,7 +1295,7 @@
_eet_data_dump_string_escape(void *dumpdata, void dumpfunc(void *data, const
char *str), const char *str)
{
char *s;
-
+
s = _eet_data_string_escape(str);
if (s)
{
@@ -1312,7 +1312,7 @@
int in_token = 0;
int in_quote = 0;
int tlen = 0, tsize = 0;
-
+
#define TOK_ADD(x) \
{ \
tlen++; \
@@ -1323,7 +1323,7 @@
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h Eet_private.h Makefile.am eet_data.c eet_dictionary.c
eet_image.c eet_lib.c eet_memfile.c eet_utils.c
Log Message:
* define EAPI on Windows according to the following scheme:
- if Eet is built:
. if the shared lib is built, EAPI must be __declspec(dllexport)
. if the static lib is built, EAPI must be empty
- otherwise EAPI must be __declspec(dllimport)
* move config.h from Eet_private.h to source files so that
EAPI is correctly defined in Eet.h
* add notes for compilation with cegcc and mingw32ce in INSTALL
* add support for compilation with cegcc
* add indentation information for vi
* remove trailing spaces
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- Eet.h 7 Mar 2008 09:59:37 - 1.48
+++ Eet.h 8 Mar 2008 07:28:12 - 1.49
@@ -4,14 +4,19 @@
#include stdlib.h
#ifdef EAPI
-#undef EAPI
+# undef EAPI
#endif
+
#ifdef _WIN32
-# ifdef DLL_EXPORT
-# define EAPI __declspec(dllexport)
+# ifdef EFL_EET_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif /* ! DLL_EXPORT */
# else
# define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_EET_BUILD */
#else
# ifdef __GNUC__
# if __GNUC__ = 4
@@ -22,7 +27,7 @@
# else
# define EAPI
# endif
-#endif
+#endif /* ! _WIN32 */
#ifdef __cplusplus
extern C {
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet_private.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- Eet_private.h 6 Mar 2008 17:52:59 - 1.21
+++ Eet_private.h 8 Mar 2008 07:28:12 - 1.22
@@ -1,7 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
+
#ifndef _EET_PRIVATE_H
#define _EET_PRIVATE_H
-
-#include config.h
#include stdio.h
#include unistd.h
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- Makefile.am 2 Mar 2008 06:49:48 - 1.19
+++ Makefile.am 8 Mar 2008 07:28:12 - 1.20
@@ -7,6 +7,7 @@
-DPACKAGE_BIN_DIR=\$(bindir)\ \
-DPACKAGE_LIB_DIR=\$(libdir)\ \
-DPACKAGE_DATA_DIR=\$(datadir)/$(PACKAGE)\ \
[EMAIL PROTECTED]@ \
@EVIL_CFLAGS@
lib_LTLIBRARIES = libeet.la
@@ -20,6 +21,6 @@
eet_utils.c \
Eet_private.h
-libeet_la_LIBADD = @EVIL_LIBS@ -lz -ljpeg @fnmatch_libs@ @win32_libs@ -lm
+libeet_la_LIBADD = @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg @fnmatch_libs@ -lm
libeet_la_DEPENDENCIES = $(top_builddir)/config.h
libeet_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- eet_data.c 7 Mar 2008 09:59:37 - 1.66
+++ eet_data.c 8 Mar 2008 07:28:12 - 1.67
@@ -1,4 +1,12 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
+
#include math.h
+
+#ifdef HAVE_CONFIG_H
+# include config.h /* so that EAPI in Eet.h is correctly defined */
+#endif
#include Eet.h
#include Eet_private.h
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_dictionary.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eet_dictionary.c6 Mar 2008 17:52:59 - 1.2
+++ eet_dictionary.c8 Mar 2008 07:28:12 - 1.3
@@ -1,4 +1,12 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
+
#include math.h
+
+#ifdef HAVE_CONFIG_H
+# include config.h /* so that EAPI in Eet.h is correctly defined */
+#endif
#include Eet.h
#include Eet_private.h
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- eet_image.c 7 Mar 2008 09:59:37 - 1.17
+++ eet_image.c 8 Mar 2008 07:28:12 - 1.18
@@ -1,3 +1,11 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
+
+#ifdef HAVE_CONFIG_H
+# include config.h /* so that EAPI in Eet.h is correctly defined */
+#endif
+
#include Eet.h
#include Eet_private.h
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- eet_lib.c 7 Mar 2008 09:59:37 - 1.93
+++ eet_lib.c 8 Mar 2008 07:28:12 - 1.94
@@ -2,6 +2,10 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
*/
+#ifdef
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: INSTALL configure.in Log Message: * define EAPI on Windows according to the following scheme: - if Eet is built: . if the shared lib is built, EAPI must be __declspec(dllexport) . if the static lib is built, EAPI must be empty - otherwise EAPI must be __declspec(dllimport) * move config.h from Eet_private.h to source files so that EAPI is correctly defined in Eet.h * add notes for compilation with cegcc and mingw32ce in INSTALL * add support for compilation with cegcc * add indentation information for vi * remove trailing spaces === RCS file: /cvs/e/e17/libs/eet/INSTALL,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- INSTALL 20 Jan 2007 15:20:23 - 1.3 +++ INSTALL 8 Mar 2008 07:28:12 - 1.4 @@ -2,9 +2,9 @@ If you got a official release tar archive do: ./configure - + ( otherwise if you got this from enlightenment cvs do: ./autogen.sh ) - + Then to compile: make @@ -13,7 +13,29 @@ NOTE: You MUST make install Eet for it to run properly. -NOTE: for compilation with MinGW, fnmatch.h is probably missing. +NOTE: For compilation with MinGW, fnmatch.h is probably missing. That file can be found here: http://www.koders.com/c/fid2B518462CB1EED3D4E31E271DB83CD1582F6EEBE.aspx It should be installed in the mingw include directory. + +NOTE: For compilation with mingw32ce, run configure with the option + +--host=arm-wince-mingw32ce + +NOTE: For compilation with cegcc, you have to do the following steps: + +1) After having run autogen.sh, add in config.sub file: + + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + +after the mingw32ce case + +2) in config.sub, add -cegcc* after -pe*. You should have a line like: + | -cygwin* | -pe* | -cegcc* | -psos* | -moss* | -proelf* | -rtems* \ + +3) run configure with the option + +--host=arm-wince-cegcc === RCS file: /cvs/e/e17/libs/eet/configure.in,v retrieving revision 1.85 retrieving revision 1.86 diff -u -3 -r1.85 -r1.86 --- configure.in2 Mar 2008 06:49:48 - 1.85 +++ configure.in8 Mar 2008 07:28:12 - 1.86 @@ -30,17 +30,30 @@ AC_FUNC_ALLOCA -win32_libs= +WIN32_CFLAGS= +WIN32_LIBS= create_shared_lib= case $host_os in mingw|mingw32) PKG_CHECK_MODULES([EVIL], [evil]) AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed]) - win32_libs=-lws2_32 + dnl needed for correct definition of EAPI + AC_DEFINE(EFL_EET_BUILD, 1, [Define to mention that eet is built]) + WIN32_LIBS=-lws2_32 + create_shared_lib=-no-undefined + ;; + cegcc) + PKG_CHECK_MODULES([EVIL], [evil]) + AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed]) + dnl needed for correct definition of EAPI + AC_DEFINE(EFL_EET_BUILD, 1, [Define to mention that eet is built]) + WIN32_CFLAGS=-mwin32 + WIN32_LIBS=-lws2 create_shared_lib=-no-undefined ;; esac -AC_SUBST(win32_libs) +AC_SUBST(WIN32_CFLAGS) +AC_SUBST(WIN32_LIBS) AC_SUBST(create_shared_lib) AC_CHECK_HEADER(zlib.h,, AC_MSG_ERROR(Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file)) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h Eet_private.h Makefile.am eet_data.c eet_image.c
eet_lib.c
Log Message:
use evil on win32:
* remove all the specific win32 code
* replace EAPI by EAPI_DEF in front of definitions of funtions
* no need to check windows.h, winsock2.h
* sys/mmap.h will be detected automatically (thanks to evil on win32)
* use AC_CHECK_HEADERS instead of AC_CHECK_HEADERS_ONCE as this macro is too
recent (from autoconf 2.59c)
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- Eet.h 1 Mar 2008 06:38:09 - 1.45
+++ Eet.h 2 Mar 2008 06:49:48 - 1.46
@@ -6,12 +6,13 @@
#ifdef EAPI
#undef EAPI
#endif
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
+#ifdef _WIN32
+# ifdef DLL_EXPORT
# define EAPI __declspec(dllexport)
# else
# define EAPI __declspec(dllimport)
# endif
+# define EAPI_DEF
#else
# ifdef __GNUC__
# if __GNUC__ = 4
@@ -22,6 +23,7 @@
# else
# define EAPI
# endif
+# define EAPI_DEF EAPI
#endif
#ifdef __cplusplus
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet_private.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- Eet_private.h 1 Mar 2008 06:38:09 - 1.19
+++ Eet_private.h 2 Mar 2008 06:49:48 - 1.20
@@ -33,8 +33,9 @@
#ifdef HAVE_NETINET_IN_H
# include netinet/in.h
#endif
-#ifdef HAVE_WINSOCK2_H
-# include winsock2.h
+
+#ifdef HAVE_EVIL
+# include Evil.h
#endif
#include zlib.h
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- Makefile.am 1 Mar 2008 06:38:09 - 1.18
+++ Makefile.am 2 Mar 2008 06:49:48 - 1.19
@@ -6,7 +6,8 @@
-I$(top_srcdir)/src/lib \
-DPACKAGE_BIN_DIR=\$(bindir)\ \
-DPACKAGE_LIB_DIR=\$(libdir)\ \
--DPACKAGE_DATA_DIR=\$(datadir)/$(PACKAGE)\
+-DPACKAGE_DATA_DIR=\$(datadir)/$(PACKAGE)\ \
[EMAIL PROTECTED]@
lib_LTLIBRARIES = libeet.la
include_HEADERS = Eet.h
@@ -19,6 +20,6 @@
eet_utils.c \
Eet_private.h
-libeet_la_LIBADD = -lz -ljpeg @fnmatch_libs@ @winsock_libs@ -lm
+libeet_la_LIBADD = @EVIL_LIBS@ -lz -ljpeg @fnmatch_libs@ @win32_libs@ -lm
libeet_la_DEPENDENCIES = $(top_builddir)/config.h
libeet_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- eet_data.c 1 Mar 2008 06:38:09 - 1.63
+++ eet_data.c 2 Mar 2008 06:49:48 - 1.64
@@ -878,7 +878,7 @@
/*---*/
-EAPI Eet_Data_Descriptor *
+EAPI_DEF Eet_Data_Descriptor *
eet_data_descriptor_new(const char *name,
int size,
void *(*func_list_next) (void *l),
@@ -914,7 +914,7 @@
}
/* new replcement */
-EAPI Eet_Data_Descriptor *
+EAPI_DEF Eet_Data_Descriptor *
eet_data_descriptor2_new(Eet_Data_Descriptor_Class *eddc)
{
Eet_Data_Descriptor *edd;
@@ -949,7 +949,7 @@
return edd;
}
-EAPI Eet_Data_Descriptor *
+EAPI_DEF Eet_Data_Descriptor *
eet_data_descriptor3_new(Eet_Data_Descriptor_Class *eddc)
{
Eet_Data_Descriptor *edd;
@@ -988,7 +988,7 @@
return edd;
}
-EAPI void
+EAPI_DEF void
eet_data_descriptor_free(Eet_Data_Descriptor *edd)
{
_eet_descriptor_hash_free(edd);
@@ -996,7 +996,7 @@
free(edd);
}
-EAPI void
+EAPI_DEF void
eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
const char *name, int type,
int group_type,
@@ -1023,7 +1023,7 @@
ede-subtype = subtype;
}
-EAPI void *
+EAPI_DEF void *
eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name)
{
const Eet_Dictionary *ed = NULL;
@@ -1049,7 +1049,7 @@
return data_dec;
}
-EAPI int
+EAPI_DEF int
eet_data_write(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const
void *data, int compress)
{
Eet_Dictionary *ed;
@@ -2457,7 +2457,7 @@
return NULL;
}
-EAPI int
+EAPI_DEF int
eet_data_text_dump(const void *data_in,
int size_in,
void (*dumpfunc) (void *data, const char *str),
@@ -2469,7 +2469,7 @@
return 0;
}
-EAPI void *
+EAPI_DEF void *
eet_data_text_undump(const char *text,
int textlen,
int *size_ret)
@@ -2477,7 +2477,7 @@
return _eet_data_dump_parse(NULL, size_ret, text, textlen);
}
-EAPI void *
+EAPI_DEF void *
eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
const
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: configure.in Log Message: use evil on win32: * remove all the specific win32 code * replace EAPI by EAPI_DEF in front of definitions of funtions * no need to check windows.h, winsock2.h * sys/mmap.h will be detected automatically (thanks to evil on win32) * use AC_CHECK_HEADERS instead of AC_CHECK_HEADERS_ONCE as this macro is too recent (from autoconf 2.59c) === RCS file: /cvs/e/e17/libs/eet/configure.in,v retrieving revision 1.84 retrieving revision 1.85 diff -u -3 -r1.84 -r1.85 --- configure.in26 Jan 2008 05:52:47 - 1.84 +++ configure.in2 Mar 2008 06:49:48 - 1.85 @@ -30,22 +30,23 @@ AC_FUNC_ALLOCA -AC_CHECK_HEADER(zlib.h,, AC_MSG_ERROR(Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file)) -AC_CHECK_HEADER(jpeglib.h,, AC_MSG_ERROR(Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file)) - -AC_CHECK_HEADERS_ONCE(netinet/in.h sys/mman.h windows.h winsock2.h) - -winsock_libs= +win32_libs= create_shared_lib= case $host_os in mingw|mingw32) - winsock_libs=-lwsock32 + PKG_CHECK_MODULES([EVIL], [evil]) + AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed]) + win32_libs=-lws2_32 create_shared_lib=-no-undefined ;; esac - -AC_SUBST(winsock_libs) +AC_SUBST(win32_libs) AC_SUBST(create_shared_lib) + +AC_CHECK_HEADER(zlib.h,, AC_MSG_ERROR(Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file)) +AC_CHECK_HEADER(jpeglib.h,, AC_MSG_ERROR(Cannot find jpeglib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file)) + +AC_CHECK_HEADERS(netinet/in.h) AC_CHECK_HEADER(fnmatch.h,, AC_MSG_ERROR([Cannot find fnmatch.h. Make sure your CFLAGS environment variable contains include lines for the location of this file. MinGW users: see the INSTALL file])) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_lib.c
Log Message:
[win32] use the correct value for an invalid handle and check results. Remove
trailing spaces
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- eet_lib.c 21 Jan 2008 01:09:51 - 1.84
+++ eet_lib.c 24 Jan 2008 08:41:23 - 1.85
@@ -56,7 +56,7 @@
char *name;
void *data;
Eet_File_Node *next; /* FIXME: make buckets linked lists */
-
+
intoffset;
intsize;
intdata_size;
@@ -165,7 +165,7 @@
{
Eet_File*del_ef = NULL;
int i;
-
+
new_cache = *cache;
for (i = 0; i new_cache_num; i++)
{
@@ -175,7 +175,7 @@
break;
}
}
-
+
if (del_ef)
{
del_ef-delete_me_now = 1;
@@ -216,7 +216,7 @@
new_cache_alloc = *cache_alloc;
if (new_cache_num = 0)
return;
-
+
for (i = 0; i new_cache_num; i++)
{
if (new_cache[i] == ef)
@@ -322,23 +322,23 @@
{
unsigned int ibuf[5];
intname_size;
-
+
name_size = strlen(efn-name) + 1;
-
+
ibuf[0] = (int) htonl ((unsigned int) efn-offset);
ibuf[1] = (int) htonl ((unsigned int) efn-compression);
ibuf[2] = (int) htonl ((unsigned int) efn-size);
ibuf[3] = (int) htonl ((unsigned int) efn-data_size);
ibuf[4] = (int) htonl ((unsigned int) name_size);
-
-
+
+
if (fwrite(ibuf, sizeof(ibuf), 1, ef-fp) != 1)
goto write_error;
if (fwrite(efn-name, name_size, 1, ef-fp) != 1)
goto write_error;
}
}
-
+
/* write data */
for (i = 0; i num; i++)
{
@@ -351,9 +351,9 @@
/* no more writes pending */
ef-writes_pending = 0;
-
+
return EET_ERROR_NONE;
-
+
write_error:
switch (ferror(ef-fp))
{
@@ -406,7 +406,7 @@
{
int num = 0;
int i;
-
+
/*
We need to compute the list of eet file to close separately from the
cache,
due to eet_close removing them from the cache after each call.
@@ -416,7 +416,7 @@
if (eet_writers[i]-references = 0)
num++;
}
-
+
for (i = 0; i eet_readers_num; i++)
{
if (eet_readers[i]-references = 0)
@@ -426,7 +426,7 @@
if (num 0)
{
Eet_File **closelist = NULL;
-
+
closelist = alloca(num * sizeof(Eet_File *));
num = 0;
for (i = 0; i eet_writers_num; i++)
@@ -438,7 +438,7 @@
num++;
}
}
-
+
for (i = 0; i eet_readers_num; i++)
{
if (eet_readers[i]-references = 0)
@@ -669,7 +669,7 @@
}
ef = eet_cache_find((char *)file, eet_readers, eet_readers_num);
}
- else if ((mode == EET_FILE_MODE_WRITE) ||
+ else if ((mode == EET_FILE_MODE_WRITE) ||
(mode == EET_FILE_MODE_READ_WRITE))
{
ef = eet_cache_find((char *)file, eet_readers, eet_readers_num);
@@ -706,7 +706,7 @@
unlink(file);
fp = fopen(file, wb);
}
-
+
/* We found one */
if (ef (file_stat.st_mtime != ef-mtime))
{
@@ -749,10 +749,11 @@
fcntl(fileno(ef-fp), F_SETFD, FD_CLOEXEC);
#else
/* FIXME: check if that code is needed / correct */
- h = (HANDLE) _get_osfhandle (fileno(ef-fp));
- if (h == (HANDLE) -1)
+ h = (HANDLE) _get_osfhandle(fileno(ef-fp));
+ if (h == INVALID_HANDLE_VALUE)
+ return NULL;
+ if (!SetHandleInformation(h, HANDLE_FLAG_INHERIT, 0))
return NULL;
- SetHandleInformation (h, HANDLE_FLAG_INHERIT, 0);
#endif
/* if we opened for read or read-write */
if ((mode == EET_FILE_MODE_READ) || (mode == EET_FILE_MODE_READ_WRITE))
@@ -790,11 +791,11 @@
if (ef-mode == EET_FILE_MODE_READ_WRITE)
{
int i;
-
+
for (i = 0; i ef-header-directory-size; i++)
{
Eet_File_Node *efn;
-
+
for (efn = ef-header-directory-nodes[i]; efn; efn = efn-next)
{
if (!efn-free_name)
@@ -850,7 +851,7 @@
/* if not urgent to delete it - dont free it - leave it in cache */
if ((!ef-delete_me_now) (ef-mode == EET_FILE_MODE_READ))
return EET_ERROR_NONE;
-
+
/* remove from cache */
if (ef-mode == EET_FILE_MODE_READ)
eet_cache_del(ef, eet_readers, eet_readers_num, eet_readers_alloc);
@@ -865,12 +866,12 @@
if (ef-header-directory-nodes)
{
int i, num;
-
+
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Makefile.am
Log Message:
autostuff improvements:
* use non deprecated version of AC_INIT and AM_INIT_AUTOMAKE
and check the required minimal versions.
* add bzipped distribution archive
* add AC_LIBTOOL_WIN32_DLL
* forbid libtool to check fortran and c++ compilers
* compute libtool versioning from the version of the package
* pass the directories based on ${prefix} to the preoprocessor
with the -D option
* replace INCLUDES, wich is deprecated since 2001 by AM_CPPFLAGS
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Makefile.am 25 Sep 2007 18:26:49 - 1.16
+++ Makefile.am 4 Nov 2007 09:10:50 - 1.17
@@ -1,12 +1,12 @@
-## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES= -I. \
- -I$(top_srcdir)/src/lib
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-DPACKAGE_BIN_DIR=\$(bindir)\ \
+-DPACKAGE_LIB_DIR=\$(libdir)\ \
+-DPACKAGE_DATA_DIR=\$(datadir)/$(PACKAGE)\
lib_LTLIBRARIES = libeet.la
include_HEADERS = Eet.h
@@ -20,4 +20,4 @@
libeet_la_LIBADD = -lz -ljpeg @fnmatch_libs@ @winsock_libs@ -lm
libeet_la_DEPENDENCIES = $(top_builddir)/config.h
-libeet_la_LDFLAGS = @create_shared_lib@ -version-info 9:10:9
+libeet_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/bin
Modified Files:
Makefile.am
Log Message:
autostuff improvements:
* use non deprecated version of AC_INIT and AM_INIT_AUTOMAKE
and check the required minimal versions.
* add bzipped distribution archive
* add AC_LIBTOOL_WIN32_DLL
* forbid libtool to check fortran and c++ compilers
* compute libtool versioning from the version of the package
* pass the directories based on ${prefix} to the preoprocessor
with the -D option
* replace INCLUDES, wich is deprecated since 2001 by AM_CPPFLAGS
===
RCS file: /cvs/e/e17/libs/eet/src/bin/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 8 Sep 2007 09:35:40 - 1.8
+++ Makefile.am 4 Nov 2007 09:10:50 - 1.9
@@ -1,9 +1,13 @@
-## Process this file with automake to produce Makefile.in
-AM_CFLAGS = \
+MAINTAINERCLEANFILES = Makefile.in
+
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/bin \
--I$(top_srcdir)/src/lib
+-I$(top_srcdir)/src/lib \
+-DPACKAGE_BIN_DIR=\$(bindir)\ \
+-DPACKAGE_LIB_DIR=\$(libdir)\ \
+-DPACKAGE_DATA_DIR=\$(datadir)/$(PACKAGE)\
bin_PROGRAMS = eet
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet
Modified Files:
configure.in
Log Message:
autostuff improvements:
* use non deprecated version of AC_INIT and AM_INIT_AUTOMAKE
and check the required minimal versions.
* add bzipped distribution archive
* add AC_LIBTOOL_WIN32_DLL
* forbid libtool to check fortran and c++ compilers
* compute libtool versioning from the version of the package
* pass the directories based on ${prefix} to the preoprocessor
with the -D option
* replace INCLUDES, wich is deprecated since 2001 by AM_CPPFLAGS
===
RCS file: /cvs/e/e17/libs/eet/configure.in,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- configure.in25 Sep 2007 18:26:48 - 1.78
+++ configure.in4 Nov 2007 09:10:49 - 1.79
@@ -1,19 +1,33 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT(configure.in)
+AC_INIT(eet, 0.9.10.041, [EMAIL PROTECTED])
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_ISC_POSIX
-AM_INIT_AUTOMAKE(eet, 0.9.10.041)
+
+AM_INIT_AUTOMAKE(1.6 dist-bzip2)
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AM_PROG_CC_STDC
AC_HEADER_STDC
AC_C_CONST
-AM_ENABLE_SHARED
-AM_PROG_LIBTOOL
+
+AC_LIBTOOL_WIN32_DLL
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+AC_PROG_LIBTOOL
+
+VMAJ=`echo $PACKAGE_VERSION | awk -F . '{printf(%s, $1);}'`
+VMIN=`echo $PACKAGE_VERSION | awk -F . '{printf(%s, $2);}'`
+VMIC=`echo $PACKAGE_VERSION | awk -F . '{printf(%s, $3);}'`
+SNAP=`echo $PACKAGE_VERSION | awk -F . '{printf(%s, $4);}'`
+version_info=`expr $VMAJ + $VMIN`:$VMIC:$VMIN
+AC_SUBST(version_info)
+
AC_FUNC_ALLOCA
AC_CHECK_HEADER(zlib.h,, AC_MSG_ERROR(Cannot find zlib.h. Make sure your
CFLAGS environment variable contains include lines for the location of this
file))
@@ -72,35 +86,6 @@
], AC_MSG_WARN([Cannot check when cross-compiling -- assuming null is okay])
)
-if test x${bindir} = 'xNONE'; then
- if test x${prefix} = xNONE; then
-PACKAGE_BIN_DIR=${ac_default_prefix}/bin
- else
-PACKAGE_BIN_DIR=${prefix}/bin
- fi
-else
- PACKAGE_BIN_DIR=${bindir}
-fi
-AC_SUBST(PACKAGE_BIN_DIR)
-
-if test x${libdir} = 'xNONE'; then
- if test x${prefix} = xNONE; then
-PACKAGE_LIB_DIR=${ac_default_prefix}/lib
- else
-PACKAGE_LIB_DIR=${prefix}/lib
- fi
-else
- PACKAGE_LIB_DIR=${libdir}
-fi
-AC_SUBST(PACKAGE_LIB_DIR)
-
-if test x${prefix} = xNONE; then
- PACKAGE_DATA_DIR=${ac_default_prefix}/share/${PACKAGE}
-else
- PACKAGE_DATA_DIR=${prefix}/share/${PACKAGE}
-fi
-AC_SUBST(PACKAGE_DATA_DIR)
-
#AM_CHECK_DOXYGEN()
AC_OUTPUT([
@@ -128,12 +113,9 @@
echo
echo Configuration Options Summary:
echo
-#echo Build documentation..: $BUILD_DOCS
-#echo
echo Compilation..: make
echo
echo Installation.: make install
echo
echo prefix.: $prefix
-#echo documentation..: $datadir/$PACKAGE/doc
echo
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h
Log Message:
typo + removing white spaces
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- Eet.h 8 Sep 2007 07:44:03 - 1.39
+++ Eet.h 31 Oct 2007 07:13:57 - 1.40
@@ -38,7 +38,7 @@
/***/
-#define EET_T_UNKNOW 0 /** Unknown data encding type */
+#define EET_T_UNKNOW 0 /** Unknown data encoding type */
#define EET_T_CHAR 1 /** Data type: char */
#define EET_T_SHORT 2 /** Data type: short */
#define EET_T_INT3 /** Data type: int */
@@ -87,7 +87,7 @@
typedef struct _Eet_Data_Descriptor Eet_Data_Descriptor;
typedef struct _Eet_Data_Descriptor_Class Eet_Data_Descriptor_Class;
-
+
#define EET_DATA_DESCRIPTOR_CLASS_VERSION 1
struct _Eet_Data_Descriptor_Class
{
@@ -108,7 +108,7 @@
void(*hash_free) (void *h);
} func;
};
-
+
/***/
/**
@@ -707,12 +707,12 @@
EAPI Eet_Data_Descriptor *eet_data_descriptor_new(const char *name, int
size, void *(*func_list_next) (void *l), void *(*func_list_append) (void *l,
void *d), void *(*func_list_data) (void *l), void *(*func_list_free) (void *l),
void (*func_hash_foreach) (void *h, int (*func) (void *h, const char *k, void
*dt, void *fdt), void *fdt), void *(*func_hash_add) (void *h, const char *k,
void *d), void (*func_hash_free) (void *h));
/*
* FIXME:
-*
+*
* moving to this api from the old above. this will break things when the
* move happens - but be warned
*/
EAPI Eet_Data_Descriptor
*eet_data_descriptor2_new(Eet_Data_Descriptor_Class *eddc);
-
+
/**
* This function frees a data descriptor when it is not needed anymore.
* @param edd The data descriptor to free.
@@ -789,22 +789,22 @@
* generated. This callback should append to any existing text buffer and
* will be passed the pointer @p dumpdata as a parameter as well as a string
* with new text to be appended.
-*
+*
* Example:
-*
+*
* @code
-*
+*
* void output(void *data, const char *string)
* {
* printf(%s, string);
* }
-*
+*
* void dump(const char *file)
* {
* FILE *f;
* int len;
* void *data;
-*
+*
* f = fopen(file, r);
* fseek(f, 0, SEEK_END);
* len = ftell(f);
@@ -815,7 +815,7 @@
* eet_data_text_dump(data, len, output, NULL);
* }
* @endcode
-*
+*
*/
EAPI int eet_data_text_dump(const void *data_in, int size_in, void
(*dumpfunc) (void *data, const char *str), void *dumpdata);
@@ -830,7 +830,7 @@
* an encoded data lump the same way eet_data_descriptor_encode() takes an
* in-memory data struct and encodes into a binary blob. @p text is a normal
* C string.
-*
+*
*/
EAPI void *eet_data_text_undump(const char *text, int textlen, int
*size_ret);
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_utils.c
Log Message:
remove unused variables
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eet_utils.c 26 Sep 2007 00:16:31 - 1.4
+++ eet_utils.c 29 Sep 2007 09:13:22 - 1.5
@@ -59,7 +59,6 @@
_eet_string_to_double_convert(const char *src, long long *m, long *e)
{
const char *str;
- double val;
long long mantisse;
longexponent;
int nbr_decimals;
@@ -151,8 +150,6 @@
'a', 'b', 'c', 'd', 'e', 'f'};
int p;
int i;
-
- char *str = des;
if (d 0.0)
{
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/src/lib Modified Files: Eet_private.h Log Message: declare properly alloca when AC_FUNC_ALLOCA is used (see autoconf doc) === RCS file: /cvs/e/e17/libs/eet/src/lib/Eet_private.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- Eet_private.h 25 Sep 2007 18:26:49 - 1.16 +++ Eet_private.h 29 Sep 2007 09:21:43 - 1.17 @@ -12,8 +12,21 @@ #include sys/stat.h #include fcntl.h #include errno.h -#if HAVE_ALLOCA_H -#include alloca.h +#ifdef HAVE_ALLOCA_H +# include alloca.h +#elif defined __GNUC__ +# define alloca __builtin_alloca +#elif defined _AIX +# define alloca __alloca +#elif defined _MSC_VER +# include malloc.h +# define alloca _alloca +#else +# include stddef.h +# ifdef __cplusplus +extern C +# endif +void *alloca (size_t); #endif #include ctype.h - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet_private.h Makefile.am eet_data.c eet_lib.c eet_utils.c
Log Message:
* Add conversion functions to replace the use of snprintf with %a
* remove useless defines
* minor cleanups
fixes bugs #181 and #182
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet_private.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- Eet_private.h 14 Sep 2007 23:38:17 - 1.15
+++ Eet_private.h 25 Sep 2007 18:26:49 - 1.16
@@ -18,9 +18,9 @@
#include ctype.h
#ifdef HAVE_NETINET_IN_H
-#include netinet/in.h
-#elif __MINGW32__
-#include winsock.h
+# include netinet/in.h
+#elif _WIN32
+# include winsock2.h
#endif
#include zlib.h
@@ -43,6 +43,8 @@
void _eet_memfile_write_close(FILE *f);
void _eet_memfile_shutdown(void);
int _eet_hash_gen(const char *key, int hash_size);
+int _eet_string_to_double_convert(const char *src, long long *m, long *e);
+void _eet_double_to_string_convert(char *des, double d);
#ifndef PATH_MAX
#define PATH_MAX 4096
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- Makefile.am 20 Jan 2007 15:36:41 - 1.15
+++ Makefile.am 25 Sep 2007 18:26:49 - 1.16
@@ -6,8 +6,7 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES= -I. \
- -I$(top_srcdir)/src/lib \
- -I$(top_srcdir)/src/lib/include
+ -I$(top_srcdir)/src/lib
lib_LTLIBRARIES = libeet.la
include_HEADERS = Eet.h
@@ -19,6 +18,6 @@
eet_utils.c \
Eet_private.h
-libeet_la_LIBADD = -lz -ljpeg @fnmatch_libs@ @winsock_libs@
+libeet_la_LIBADD = -lz -ljpeg @fnmatch_libs@ @winsock_libs@ -lm
libeet_la_DEPENDENCIES = $(top_builddir)/config.h
libeet_la_LDFLAGS = @create_shared_lib@ -version-info 9:10:9
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- eet_data.c 14 Sep 2007 23:38:17 - 1.53
+++ eet_data.c 25 Sep 2007 18:26:49 - 1.54
@@ -1,3 +1,5 @@
+#include math.h
+
#include Eet.h
#include Eet_private.h
@@ -358,8 +360,9 @@
eet_data_get_float(void *src, void *src_end, void *dst)
{
float *d;
- float tf;
- char *s, *str, *p, *prev_locale;
+ long long mantisse;
+ long exponent;
+ char *s, *str, *p;
int len;
s = (char *)src;
@@ -369,14 +372,10 @@
while ((p (char *)src_end) (*p != 0)) {len++; p++;}
str = alloca(len + 1);
memcpy(str, s, len);
- str[len] = 0;
+ str[len] = '\0';
- prev_locale = setlocale(LC_NUMERIC, C);
-/* solaris atof is broken and doesnt understand %a format as a float */
-/* *d = (float)atof(str); */
- sscanf(str, %a, tf);
- *d = (float)tf;
- if (prev_locale) setlocale(LC_NUMERIC, prev_locale);
+ _eet_string_to_double_convert(str, mantisse, exponent);
+ *d = (float)ldexp((double)mantisse, exponent);
return len + 1;
}
@@ -384,19 +383,17 @@
static void *
eet_data_put_float(const void *src, int *size_ret)
{
- float *s;
- char *d, buf[64], *prev_locale;
- int len;
+ char buf[64];
+ char *d;
+ intlen;
- s = (float *)src;
- prev_locale = setlocale(LC_NUMERIC, C);
- snprintf(buf, sizeof(buf), %a, (double)(*s));
- if (prev_locale) setlocale(LC_NUMERIC, prev_locale);
+ _eet_double_to_string_convert(buf, (double)(*(float *)src));
len = strlen(buf);
d = malloc(len + 1);
if (!d) return NULL;
strcpy(d, buf);
*size_ret = len + 1;
+
return d;
}
@@ -404,9 +401,10 @@
static int
eet_data_get_double(void *src, void *src_end, void *dst)
{
- double *d;
- float tf;
- char *s, *str, *p, *prev_locale;
+ double *d;
+ long long mantisse;
+ long exponent;
+ char *s, *str, *p;
int len;
s = (char *)src;
@@ -416,14 +414,10 @@
while ((p (char *)src_end) (*p != 0)) {len++; p++;}
str = alloca(len + 1);
memcpy(str, s, len);
- str[len] = 0;
+ str[len] = '\0';
- prev_locale = setlocale(LC_NUMERIC, C);
-/* solaris atof is broken and doesnt understand %a format as a float */
-/* *d = (double)atof(str); */
- sscanf(str, %a, tf);
- *d = (double)tf;
- if (prev_locale) setlocale(LC_NUMERIC, prev_locale);
+ _eet_string_to_double_convert(str, mantisse, exponent);
+ *d = ldexp((double)mantisse, exponent);
return len + 1;
}
@@ -431,19 +425,17 @@
static void *
eet_data_put_double(const void *src, int *size_ret)
{
- double *s;
- char *d, buf[128], *prev_locale;
- int len;
+ charbuf[128];
+ char *d;
+ int len;
- s = (double *)src;
- prev_locale
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet
Modified Files:
configure.in eet.pc.in
Log Message:
* Add conversion functions to replace the use of snprintf with %a
* remove useless defines
* minor cleanups
fixes bugs #181 and #182
===
RCS file: /cvs/e/e17/libs/eet/configure.in,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- configure.in8 Sep 2007 09:35:40 - 1.77
+++ configure.in25 Sep 2007 18:26:48 - 1.78
@@ -72,28 +72,6 @@
], AC_MSG_WARN([Cannot check when cross-compiling -- assuming null is okay])
)
-AC_MSG_CHECKING([OS libc C99 '%a' support])
-AC_TRY_RUN([
-#include stdio.h
-int main(int argc, char **argv) {
- char buf[4096];
- float ival = 0.1234, oval = 0.0;
- snprintf(buf, sizeof(buf), %a, (double)ival);
- sscanf(buf, %a, oval);
- if (ival != oval) return -1;
- return 0;
-}
-], AC_MSG_RESULT([yes]), [
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([Unsupported Operating System!
-Your OS does not support C99's '%a' string format. Eet cannot function without
-it. Please contact your OS vendor to get updates for C99 '%a' floating point
-format read/write support or change operating systems for one with support
-for an already very old standard. (Linux is known to support this, as is
-Solaris 10)])
-], AC_MSG_WARN([Cannot check when cross-compiling -- assuming C99 '%a' support
is OK])
-)
-
if test x${bindir} = 'xNONE'; then
if test x${prefix} = xNONE; then
PACKAGE_BIN_DIR=${ac_default_prefix}/bin
@@ -115,7 +93,7 @@
PACKAGE_LIB_DIR=${libdir}
fi
AC_SUBST(PACKAGE_LIB_DIR)
-
+
if test x${prefix} = xNONE; then
PACKAGE_DATA_DIR=${ac_default_prefix}/share/${PACKAGE}
else
@@ -156,9 +134,6 @@
echo
echo Installation.: make install
echo
-echo prefix.: $prefix
-echo binaries...: $bindir
-echo libraries..: $libdir
-echo headers: $includedir
+echo prefix.: $prefix
#echo documentation..: $datadir/$PACKAGE/doc
echo
===
RCS file: /cvs/e/e17/libs/eet/eet.pc.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- eet.pc.in 22 Mar 2007 15:22:32 - 1.5
+++ eet.pc.in 25 Sep 2007 18:26:48 - 1.6
@@ -7,5 +7,5 @@
Description: Library for speedy data storage, retrieval, and compression
Version: @VERSION@
Libs: -L${libdir} -leet
-Libs.private: -lz -ljpeg
+Libs.private: -lz -ljpeg @fnmatch_libs@ @winsock_libs@ -lm
Cflags: -I${includedir}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h eet_lib.c
Log Message:
fix compilation with MinGW
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- Eet.h 17 Dec 2006 11:00:45 - 1.37
+++ Eet.h 20 Jan 2007 15:20:23 - 1.38
@@ -6,7 +6,7 @@
#ifdef EAPI
#undef EAPI
#endif
-#ifdef WIN32
+#ifdef _MSC_VER
# ifdef BUILDING_DLL
# define EAPI __declspec(dllexport)
# else
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- eet_lib.c 28 Dec 2006 15:23:47 - 1.73
+++ eet_lib.c 20 Jan 2007 15:20:23 - 1.74
@@ -3,7 +3,9 @@
*/
#include sys/types.h
+#ifndef _WIN32
#include sys/mman.h
+#endif
#include Eet.h
#include Eet_private.h
@@ -12,6 +14,22 @@
#undef HAVE_REALPATH
#endif
+#ifdef _WIN32
+
+#ifndef F_SETFD
+#define F_SETFD 2
+#endif
+
+#ifndef PROT_READ
+#define PROT_READ 1
+#endif
+
+#ifndef FD_CLOEXEC
+#define FD_CLOEXEC 1
+#endif
+
+#endif
+
#define EET_MAGIC_FILE 0x1ee7ff00
#define EET_MAGIC_FILE_HEADER 0x1ee7ff01
@@ -471,6 +489,9 @@
{
Eet_File*ef;
struct stat file_stat;
+#ifdef _WIN32
+ HANDLE h;
+#endif
if (!file)
return NULL;
@@ -558,7 +579,15 @@
if (eet_test_close(!ef-fp, ef))
return NULL;
+#ifndef _WIN32
fcntl(fileno(ef-fp), F_SETFD, FD_CLOEXEC);
+#else
+ /* FIXME: check if that code is needed / correct */
+ h = (HANDLE) _get_osfhandle (fileno(ef-fp));
+ if (h == (HANDLE) -1)
+ return NULL;
+ SetHandleInformation (h, HANDLE_FLAG_INHERIT, 0);
+#endif
/* if we opened for read or read-write */
if ((mode == EET_FILE_MODE_READ) || (mode == EET_FILE_MODE_READ_WRITE))
{
@@ -568,10 +597,29 @@
int num_entries;
int byte_entries;
int i;
+#ifdef _WIN32
+ HANDLE fm;
+#endif
+
ef-data_size = file_stat.st_size;
+#ifndef _WIN32
ef-data = mmap(NULL, ef-data_size, PROT_READ,
MAP_SHARED, fileno(ef-fp), 0);
+#else
+ fm = CreateFileMapping((HANDLE) _get_osfhandle (fileno(ef-fp)),
+ NULL,
+ PAGE_READONLY,
+ 0,
+ 0,
+ NULL);
+ ef-data = MapViewOfFile(fm,
+FILE_MAP_READ,
+0,
+0,
+ef-data_size);
+ CloseHandle(fm);
+#endif
if (eet_test_close((ef-data == (void *)-1) || (ef-data == NULL), ef))
return NULL;
@@ -825,7 +873,11 @@
}
free(ef-header);
}
+#ifndef _WIN32
if (ef-data) munmap(ef-data, ef-data_size);
+#else
+ if (ef-data) UnmapViewOfFile (ef-data);
+#endif
if (ef-fp) fclose(ef-fp);
/* zero out ram for struct - caution tactic against stale memory use */
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet
Modified Files:
INSTALL configure.in eet-config.in
Log Message:
fix compilation with MinGW
===
RCS file: /cvs/e/e17/libs/eet/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- INSTALL 2 Dec 2002 23:39:25 - 1.2
+++ INSTALL 20 Jan 2007 15:20:23 - 1.3
@@ -12,3 +12,8 @@
make install
NOTE: You MUST make install Eet for it to run properly.
+
+NOTE: for compilation with MinGW, fnmatch.h is probably missing.
+ That file can be found here:
+http://www.koders.com/c/fid2B518462CB1EED3D4E31E271DB83CD1582F6EEBE.aspx
+ It should be installed in the mingw include directory.
===
RCS file: /cvs/e/e17/libs/eet/configure.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- configure.in4 Dec 2006 12:14:17 - 1.68
+++ configure.in20 Jan 2007 15:20:23 - 1.69
@@ -21,6 +21,7 @@
AC_CHECK_HEADERS(netinet/in.h)
+winsock_libs=
case $host_os in
mingw|mingw32)
winsock_libs=-lwsock32
@@ -29,15 +30,19 @@
AC_SUBST(winsock_libs)
-AC_CHECK_HEADER(fnmatch.h,, AC_MSG_ERROR([Cannot find fnmatch.h. Make sure
your CFLAGS environment variable contains include lines for the location of
this file]))
+AC_CHECK_HEADER(fnmatch.h,, AC_MSG_ERROR([Cannot find fnmatch.h. Make sure
your CFLAGS environment variable contains include lines for the location of
this file. MinGW users: see the INSTALL file]))
+fnmatch_libs=
AC_CHECK_FUNCS(fnmatch, res=yes, res=no)
if test x$res = xno; then
- AC_CHECK_LIB(fnmatch, fnmatch, res=yes, res=no)
+ AC_CHECK_LIB(fnmatch, fnmatch, res=yes fnmatch_libs=-lfnmatch, res=no)
+dnl Test for compilation with MinGW.
+dnl fnmatch function is in the libiberty library
if test x$res = xno; then
- AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor
libfnmatch])
- else
- fnmatch_libs=-lfnmatch
+ AC_CHECK_LIB(iberty, fnmatch, res=yes fnmatch_libs=-liberty,
res=no)
+ fi
+ if test x$res = xno; then
+ AC_MSG_ERROR([Cannot find fnmatch() in neither libc nor
libfnmatch, nor libiberty])
fi
fi
===
RCS file: /cvs/e/e17/libs/eet/eet-config.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- eet-config.in 11 Jun 2006 22:37:23 - 1.7
+++ eet-config.in 20 Jan 2007 15:20:23 - 1.8
@@ -46,7 +46,7 @@
;;
--libs)
[EMAIL PROTECTED]@
- echo $libdirs -leet -lz -ljpeg
+ echo $libdirs -leet -lz -ljpeg @fnmatch_libs@ @winsock_libs@
;;
*)
echo ${usage} 12
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/src/lib Modified Files: Makefile.am Log Message: and fix the creation of the shared lib with MinGW. === RCS file: /cvs/e/e17/libs/eet/src/lib/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- Makefile.am 28 Dec 2006 15:23:47 - 1.14 +++ Makefile.am 20 Jan 2007 15:36:41 - 1.15 @@ -8,7 +8,6 @@ INCLUDES= -I. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib/include - lib_LTLIBRARIES = libeet.la include_HEADERS = Eet.h @@ -22,4 +21,4 @@ libeet_la_LIBADD = -lz -ljpeg @fnmatch_libs@ @winsock_libs@ libeet_la_DEPENDENCIES = $(top_builddir)/config.h -libeet_la_LDFLAGS = -version-info 9:10:9 +libeet_la_LDFLAGS = @create_shared_lib@ -version-info 9:10:9 - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: configure.in Log Message: and fix the creation of the shared lib with MinGW. === RCS file: /cvs/e/e17/libs/eet/configure.in,v retrieving revision 1.69 retrieving revision 1.70 diff -u -3 -r1.69 -r1.70 --- configure.in20 Jan 2007 15:20:23 - 1.69 +++ configure.in20 Jan 2007 15:36:41 - 1.70 @@ -22,9 +22,11 @@ AC_CHECK_HEADERS(netinet/in.h) winsock_libs= +create_shared_lib= case $host_os in mingw|mingw32) winsock_libs=-lwsock32 + create_shared_lib=-no-undefined ;; esac - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: configure.in Log Message: missing ac_subst === RCS file: /cvs/e/e17/libs/eet/configure.in,v retrieving revision 1.70 retrieving revision 1.71 diff -u -3 -r1.70 -r1.71 --- configure.in20 Jan 2007 15:36:41 - 1.70 +++ configure.in20 Jan 2007 16:51:48 - 1.71 @@ -31,6 +31,7 @@ esac AC_SUBST(winsock_libs) +AC_SUBST(create_shared_lib) AC_CHECK_HEADER(fnmatch.h,, AC_MSG_ERROR([Cannot find fnmatch.h. Make sure your CFLAGS environment variable contains include lines for the location of this file. MinGW users: see the INSTALL file])) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/doc Modified Files: Makefile.am Log Message: add clean rules and add files for distribution === RCS file: /cvsroot/enlightenment/e17/libs/eet/doc/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 29 Sep 2005 07:56:42 - 1.2 +++ Makefile.am 29 Sep 2005 10:15:47 - 1.3 @@ -8,7 +8,7 @@ # rule to remove all old created files doc-prepare.stamp: - @if test xhtml != x ; then \ + @if test -d html ; then \ rm -rf html/ latex/ man/ xml/; \ fi @@ -17,18 +17,32 @@ @doxygen @cp img/*.png html/ +# rules to clean +clean-local: + @rm -rf html/ latex/ man/ xml/ + +distclean-local: clean + rm -f Makefile.in + # rule to install the documentation in $(docdir) install-data-local: - @if ! test -d $(DESTDIR)$(datadir)/$(PACKAGE); then \ - mkdir $(DESTDIR)$(datadir)/$(PACKAGE); \ + @if ! test -d $(DESTDIR)$(datadir)/$(PACKAGE); then \ + mkdir $(DESTDIR)$(datadir)/$(PACKAGE); \ fi - @if ! test -d $(DESTDIR)$(docdir); then \ - mkdir $(DESTDIR)$(docdir); \ + @if ! test -d $(DESTDIR)$(docdir); then \ + mkdir $(DESTDIR)$(docdir); \ fi - @cp -pr html/ man/ latex/ xml/ $(DESTDIR)$(docdir) + @cp -pr html/ man/ latex/ xml/ $(DESTDIR)$(docdir) # rule to uninstall the documentation uninstall-local: - rm -rf $(docdir) + rm -rf $(DESTDIR)$(docdir) + + +MAINTAINERCLEANFILES = Makefile.in eet.c + +DISTCLEANFILES = Makefile.in eet.c + +EXTRA_DIST = Doxyfile eet.css foot.html head.html img/ endif --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/doc Modified Files: Makefile.am Log Message: too many rm === RCS file: /cvsroot/enlightenment/e17/libs/eet/doc/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 29 Sep 2005 10:15:47 - 1.3 +++ Makefile.am 29 Sep 2005 10:20:18 - 1.4 @@ -21,9 +21,6 @@ clean-local: @rm -rf html/ latex/ man/ xml/ -distclean-local: clean - rm -f Makefile.in - # rule to install the documentation in $(docdir) install-data-local: @if ! test -d $(DESTDIR)$(datadir)/$(PACKAGE); then \ --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h
Log Message:
doxygen doc fix. Feel free to add more informations in the @file section
===
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- Eet.h 15 Jul 2005 20:37:29 - 1.24
+++ Eet.h 27 Sep 2005 15:23:34 - 1.25
@@ -22,6 +22,14 @@
extern C {
#endif
+/**
+ * @file Eet.h
+ * @brief The file that provides the eet functions.
+ *
+ * This header provides the Eet management functions.
+ *
+ */
+
/***/
#define EET_T_UNKNOW 0 /** Unknown data encding type */
@@ -62,7 +70,7 @@
/***/
- /*
+ /**
* Initialize the EET library.
*
* @return The new init count.
---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42 plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/m4 Added Files: doxygen.m4 Log Message: installation of the doc with the autofoo. gendoc is not used anymore. The documentation is built and installed only if doxygen exists. If it's good, I'll commit the same stuff for the other packages --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet/doc Added Files: Doxyfile Makefile.am Log Message: installation of the doc with the autofoo. gendoc is not used anymore. The documentation is built and installed only if doxygen exists. If it's good, I'll commit the same stuff for the other packages --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/eet
Dir : e17/libs/eet
Modified Files:
configure.in Makefile.am eet.c.in
Log Message:
installation of the doc with the autofoo. gendoc is not used anymore. The
documentation is built and installed only if doxygen exists. If it's good, I'll
commit the same stuff for the other packages
===
RCS file: /cvsroot/enlightenment/e17/libs/eet/configure.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- configure.in25 Sep 2005 05:45:48 - 1.37
+++ configure.in27 Sep 2005 22:10:08 - 1.38
@@ -123,9 +123,14 @@
packagesrcdir=`cd $srcdir pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, ${packagesrcdir}, [Source code
directory])
+dnl Documentation
+AM_CHECK_DOXYGEN()
+
AC_OUTPUT([
Makefile
eet.pc
+eet.c
+doc/Makefile
src/Makefile
src/lib/Makefile
src/bin/Makefile
@@ -140,3 +145,29 @@
],[
chmod +x eet-config
])
+
+
+#
+## Info
+
+echo
+echo
+echo
+echo
+echo $PACKAGE $VERSION
+echo
+echo
+echo Configuration Options Summary:
+echo
+echo Build documentation..: $BUILD_DOCS
+echo
+echo Compilation..: make
+echo
+echo Installation.: make install
+echo
+echo prefix.: $prefix
+echo binaries...: $bindir
+echo libraries..: $libdir
+echo headers: $includedir
+echo documentation..: $datadir/$PACKAGE/doc
+echo
===
RCS file: /cvsroot/enlightenment/e17/libs/eet/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Makefile.am 4 Mar 2005 12:22:33 - 1.20
+++ Makefile.am 27 Sep 2005 22:10:08 - 1.21
@@ -1,6 +1,12 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = src
+if BUILD_DOCS
+SUBDIRS_DOCS = doc
+else
+SUBDIRS_DOCS =
+endif
+
+SUBDIRS = src $(SUBDIRS_DOCS)
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \
===
RCS file: /cvsroot/enlightenment/e17/libs/eet/eet.c.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- eet.c.in15 Apr 2004 07:58:37 - 1.8
+++ eet.c.in27 Sep 2005 22:10:08 - 1.9
@@ -9,7 +9,7 @@
@mainpage Eet Library Documentation
@image html eet.png
[EMAIL PROTECTED] 0.9.9
[EMAIL PROTECTED] @VERSION@
@author Carsten Haitzler [EMAIL PROTECTED]
@date 2000-2004
---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
