summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-08-12 18:34:40 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-08-12 18:34:40 +0000
commit48caf5578b59b0b17688c11e244ce6ee7d09a1dd (patch)
treef57a4e8a4cc307bb2fb5cc012d70413eb244d996
parent90abdd84083a9dea8a49b959dcf5ce15aeda030f (diff)
python-ecore 1.7.0
sync with C version, including in version. cython and python versions updated to what I have in my machine, at least it's known to work. SVN revision: 75167
-rw-r--r--README10
-rw-r--r--configure.ac39
2 files changed, 24 insertions, 25 deletions
diff --git a/README b/README
index fa1d85f..55e76e6 100644
--- a/README
+++ b/README
@@ -3,11 +3,11 @@
3REQUIREMENTS 3REQUIREMENTS
4============ 4============
5 5
6 * Evas >= 1.0.0 6 * Evas >= 1.7.0
7 * Ecore >= 1.0.0 7 * Ecore >= 1.7.0
8 * Cython >= 0.13 8 * Python-Evas >= 1.7.0
9 * Python-Evas >= 0.7.3 9 * Cython >= 0.16 (not required with release tarballs)
10 * Python >= 2.4 10 * Python >= 2.7 (tested version, may work with older or newer)
11 11
12 12
13BUILDING AND INSTALLING 13BUILDING AND INSTALLING
diff --git a/configure.ac b/configure.ac
index 0cfd30d..fdaadf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,25 +1,24 @@
1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [0]) 3m4_define([v_maj], [1])
4m4_define([v_min], [7]) 4m4_define([v_min], [7])
5m4_define([v_mic], [3]) 5m4_define([v_mic], [0])
6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) 7m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line
9dnl m4_undefine([v_rev]) 9m4_undefine([v_rev])
10##-- When doing snapshots - change soname. remove dnl on below line 10##-- When doing snapshots - change soname. remove dnl on below line
11m4_define([relname], [ver-pre-svn-08]) 11dnl m4_define([relname], [ver-pre-svn-07])
12m4_define([v_rel], [-release relname]) 12dnl m4_define([v_rel], [-release relname])
13##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 13##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
14m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], 14m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])])
15[m4_define([v_ver], [v_maj.v_min.v_mic])]) 15m4_define([lt_cur], m4_eval(v_maj + v_min))
16m4_define([lt_rev], m4_eval(v_maj + v_min)) 16m4_define([lt_rev], v_mic)
17m4_define([lt_cur], v_mic)
18m4_define([lt_age], v_min) 17m4_define([lt_age], v_min)
19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 18##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
20##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
21 20
22AC_INIT([python-ecore], [v_ver], [enlightenment-devel@lists.sourceforge.net]) 21AC_INIT([python-ecore], [v_ver-alpha], [enlightenment-devel@lists.sourceforge.net])
23AC_PREREQ([2.65]) 22AC_PREREQ([2.65])
24AC_CONFIG_SRCDIR([configure.ac]) 23AC_CONFIG_SRCDIR([configure.ac])
25AC_CONFIG_MACRO_DIR([m4]) 24AC_CONFIG_MACRO_DIR([m4])
@@ -62,14 +61,14 @@ else
62fi 61fi
63AC_SUBST(pkgconfig_requires_private) 62AC_SUBST(pkgconfig_requires_private)
64 63
65pkgconfig_ecore_requires_libs="ecore >= 1.0.0" 64pkgconfig_ecore_requires_libs="ecore >= 1.7.0"
66AC_SUBST(pkgconfig_ecore_requires_libs) 65AC_SUBST(pkgconfig_ecore_requires_libs)
67PKG_CHECK_MODULES([ECORE], [$pkgconfig_ecore_requires_libs]) 66PKG_CHECK_MODULES([ECORE], [$pkgconfig_ecore_requires_libs])
68wanted_cython_files="${srcdir}/ecore/ecore.c_ecore.pyx" 67wanted_cython_files="${srcdir}/ecore/ecore.c_ecore.pyx"
69 68
70have_ecore_x="no" 69have_ecore_x="no"
71want_ecore_x="auto" 70want_ecore_x="auto"
72pkgconfig_ecore_x_requires_libs="ecore-x >= 1.0.0" 71pkgconfig_ecore_x_requires_libs="ecore-x >= 1.7.0"
73AC_SUBST(pkgconfig_ecore_x_requires_libs) 72AC_SUBST(pkgconfig_ecore_x_requires_libs)
74 73
75AC_ARG_ENABLE([ecore-x], 74AC_ARG_ENABLE([ecore-x],
@@ -96,7 +95,7 @@ AM_CONDITIONAL(WANT_ECORE_X,
96 95
97have_ecore_imf="no" 96have_ecore_imf="no"
98want_ecore_imf="auto" 97want_ecore_imf="auto"
99pkgconfig_ecore_imf_requires_libs="ecore-imf >= 1.0.0" 98pkgconfig_ecore_imf_requires_libs="ecore-imf >= 1.7.0"
100AC_SUBST(pkgconfig_ecore_imf_requires_libs) 99AC_SUBST(pkgconfig_ecore_imf_requires_libs)
101AC_ARG_ENABLE([ecore-imf], 100AC_ARG_ENABLE([ecore-imf],
102 [AC_HELP_STRING([--disable-ecore-imf], 101 [AC_HELP_STRING([--disable-ecore-imf],
@@ -122,7 +121,7 @@ AM_CONDITIONAL(WANT_ECORE_IMF,
122 121
123have_ecore_win32="no" 122have_ecore_win32="no"
124want_ecore_win32="auto" 123want_ecore_win32="auto"
125pkgconfig_ecore_win32_requires_libs="ecore-win32 >= 1.0.0" 124pkgconfig_ecore_win32_requires_libs="ecore-win32 >= 1.7.0"
126AC_SUBST(pkgconfig_ecore_win32_requires_libs) 125AC_SUBST(pkgconfig_ecore_win32_requires_libs)
127AC_ARG_ENABLE([ecore-win32], 126AC_ARG_ENABLE([ecore-win32],
128 [AC_HELP_STRING([--disable-ecore-win32], 127 [AC_HELP_STRING([--disable-ecore-win32],
@@ -148,7 +147,7 @@ AM_CONDITIONAL(WANT_ECORE_WIN32,
148 147
149have_ecore_file="no" 148have_ecore_file="no"
150want_ecore_file="auto" 149want_ecore_file="auto"
151pkgconfig_ecore_file_requires_libs="ecore-file >= 1.0.0" 150pkgconfig_ecore_file_requires_libs="ecore-file >= 1.7.0"
152AC_SUBST(pkgconfig_ecore_file_requires_libs) 151AC_SUBST(pkgconfig_ecore_file_requires_libs)
153AC_ARG_ENABLE([ecore-file], 152AC_ARG_ENABLE([ecore-file],
154 [AC_HELP_STRING([--disable-ecore-file], 153 [AC_HELP_STRING([--disable-ecore-file],
@@ -174,7 +173,7 @@ AM_CONDITIONAL(WANT_ECORE_FILE,
174 173
175have_ecore_evas="no" 174have_ecore_evas="no"
176want_ecore_evas="auto" 175want_ecore_evas="auto"
177pkgconfig_ecore_evas_requires_libs="ecore-evas >= 1.0.0" 176pkgconfig_ecore_evas_requires_libs="ecore-evas >= 1.7.0"
178AC_SUBST(pkgconfig_ecore_evas_requires_libs) 177AC_SUBST(pkgconfig_ecore_evas_requires_libs)
179AC_ARG_ENABLE([ecore-evas], 178AC_ARG_ENABLE([ecore-evas],
180 [AC_HELP_STRING([--disable-ecore-evas], 179 [AC_HELP_STRING([--disable-ecore-evas],
@@ -193,7 +192,7 @@ if test "x$want_ecore_evas" = "xyes" -a "x$have_ecore_evas" = "xno"; then
193 AC_MSG_ERROR([ecore-evas support requested, but not found by pkg-config: $pkgconfig_ecore_evas_requires_libs]) 192 AC_MSG_ERROR([ecore-evas support requested, but not found by pkg-config: $pkgconfig_ecore_evas_requires_libs])
194fi 193fi
195CYTHON_ECORE_EVAS_INCLUDEDIR="" 194CYTHON_ECORE_EVAS_INCLUDEDIR=""
196python_evas_version="0.7.3" 195python_evas_version="1.7.0"
197if test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes"; then 196if test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes"; then
198 pkgconfig_python_evas_requires_libs="python-evas >= ${python_evas_version}" 197 pkgconfig_python_evas_requires_libs="python-evas >= ${python_evas_version}"
199 AC_SUBST(pkgconfig_python_evas_requires_libs) 198 AC_SUBST(pkgconfig_python_evas_requires_libs)
@@ -210,10 +209,10 @@ AM_CONDITIONAL(WANT_ECORE_EVAS,
210 [test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes" -a "x${have_python_evas}" = "xyes"]) 209 [test "x$want_ecore_evas" != "xno" -a "x${have_ecore_evas}" = "xyes" -a "x${have_python_evas}" = "xyes"])
211AC_SUBST(CYTHON_ECORE_EVAS_INCLUDEDIR) 210AC_SUBST(CYTHON_ECORE_EVAS_INCLUDEDIR)
212 211
213AM_PATH_PYTHON(2.5) 212AM_PATH_PYTHON(2.7)
214AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) 213AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
215 214
216cython_required_version=0.13 215cython_required_version=0.16
217AM_CHECK_CYTHON([$cython_required_version], [:], [:]) 216AM_CHECK_CYTHON([$cython_required_version], [:], [:])
218 217
219have_cython_precompiled=no 218have_cython_precompiled=no