summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2010-08-16 09:08:49 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-08-16 09:08:49 +0000
commit5c5bab8886e54ed9c0787d6c4b3edbdc284d527f (patch)
tree412c2c8f6511416a03c9135d1e30bd7367e7b504 /legacy
parent424b7ed6b7bd136c5292e1e922f81122bbffe6c0 (diff)
edje -> knocked off too for 1.0.0 alpha
SVN revision: 51177
Diffstat (limited to 'legacy')
-rw-r--r--legacy/edje/README108
-rw-r--r--legacy/edje/configure.ac47
-rw-r--r--legacy/edje/doc/img/elementary.pngbin7313 -> 0 bytes
-rw-r--r--legacy/edje/src/lib/Edje.h4
4 files changed, 57 insertions, 102 deletions
diff --git a/legacy/edje/README b/legacy/edje/README
index 839bbcb7da..543a4eba73 100644
--- a/legacy/edje/README
+++ b/legacy/edje/README
@@ -1,82 +1,38 @@
1Edje 0.5.0 1Edje 1.0.0 ALPHA
2 2
3******************************************************************************
4
5 FOR ANY ISSUES PLEASE EMAIL:
6 enlightenment-devel@lists.sourceforge.net
7
8******************************************************************************
9
3Requirements: 10Requirements:
4------------- 11-------------
5 12
6Must: 13Must:
7 libc libm eet ecore ecore-evas ecore-job ecore-file embryo evas 14 libc
8 15 libm
9A graphical layout and animation library for animated resizable, compressed and 16 eet (at least 1.4.0)
10scalable themes. 17 ecore (at least 1.0.0)
11 18 ecore-evas (at least 1.0.0)
12It's current under development and isn't complete. See src/lib/edje_private.h 19 ecore-file (at least 1.0.0)
13for a list of FIXME's to do. Hopefully it will be complete in a few weeks. 20 embryo (at least 1.0.0)
14 21 evas (at least 1.0.0)
15Quick start-up guide: 22
16 23Edje is a graphical layout and animation library for animated resizable,
171. You need eet from the HEAD cvs branch (must be up-to-date) 24compressed and scalable themes. It is meant to abstract UI from the
18 25programmer to make it possible to plug in any replacement look at feel
19 cvs co e17/libs/eet 26that can be generated any time after an application or library has
20 cd e17/libs/eet 27already been developed, thus allowing full flexibility of look and
21 ./autogen.sh 28feel without having to involve the software developers.
22 make 29
23 sudo make install 30------------------------------------------------------------------------------
24 cd 31COMPILING AND INSTALLING:
25 32
262. You need evas from the HEAD branch built with eet loader support. 33 ./configure
27
28 cvs co e17/libs/evas
29 cd e17/libs/evas
30 ./autogen.sh
31 make 34 make
32 sudo make install 35(as root unless you are installing in your users directories):
33 cd 36 make install
34 37
353. You need ecore from the HEAD cvs branch 38
36
37 cvs co e17/libs/ecore
38 cd e17/libs/ecore
39 ./autogen.sh
40 make
41 sudo make install
42 cd
43
444. You need embryo from the HEAD cvs branch
45
46 cvs co e17/libs/embryo
47 cd e17/libs/embryo
48 ./autogen.sh
49 make
50 sudo make install
51 cd
52
535. You already have Edje. now build it:
54
55 ./autogen.sh
56 make
57 sudo make install
58
59You now want to go test it out. first you'll need to make an Edje EET file.
60
61 cd data
62 ./e_logo.sh
63
64Now you can view the Edje you just built:
65
66 edje ./e_logo.edj
67
68You can view multiple files at once with the Edje test program:
69
70 edje ./e_logo.edj ./e_logo.edj ./e_logo.edj
71
72to view the same one 3 times.
73
74You can read the source file that builds the Edje EET file by looking at:
75
76 data/src/e_logo.edc
77
78Another test file is also there:
79
80 data/src/test.edc
81
82The test file doesn't build anything useful at the moment.
diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac
index 0ee6c4fa6f..f1c12fb455 100644
--- a/legacy/edje/configure.ac
+++ b/legacy/edje/configure.ac
@@ -1,25 +1,24 @@
1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 1##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [0]) 3m4_define([v_maj], [1])
4m4_define([v_min], [9]) 4m4_define([v_min], [0])
5m4_define([v_mic], [99]) 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 || 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-07]) 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])])
16m4_define([lt_rev], m4_eval(v_maj + v_min)) 15m4_define([lt_rev], m4_eval(v_maj + v_min))
17m4_define([lt_cur], v_mic) 16m4_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([edje], [v_ver], [enlightenment-devel@lists.sourceforge.net]) 21AC_INIT([edje], [v_ver-alpha], [enlightenment-devel@lists.sourceforge.net])
23AC_PREREQ([2.52]) 22AC_PREREQ([2.52])
24AC_CONFIG_SRCDIR([configure.ac]) 23AC_CONFIG_SRCDIR([configure.ac])
25AC_CONFIG_MACRO_DIR([m4]) 24AC_CONFIG_MACRO_DIR([m4])
@@ -246,48 +245,48 @@ fi
246 245
247PKG_CHECK_MODULES([MINIMAL], 246PKG_CHECK_MODULES([MINIMAL],
248 [ 247 [
249 eina-0 248 eina >= 1.0.0
250 eet >= 1.2.3 249 eet >= 1.4.0
251 ]) 250 ])
252 251
253PKG_CHECK_MODULES([EDJE], 252PKG_CHECK_MODULES([EDJE],
254 [ 253 [
255 eina-0 254 eina >= 1.0.0
256 eet >= 1.2.3 255 eet >= 1.4.0
257 evas >= 0.9.9 256 evas >= 1.0.0
258 ecore >= 0.9.9 257 ecore >= 1.0.0
259 ecore-file >= 0.9.9 258 ecore-file >= 1.0.0
260 embryo >= 0.9.1 259 embryo >= 1.0.0
261 ]) 260 ])
262 261
263EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}" 262EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}"
264EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}" 263EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}"
265 264
266requirement_edje="embryo ecore evas eet eina-0 ${requirement_edje}" 265requirement_edje="embryo >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_edje}"
267requirement_edje="${requirement_lua} ${requirement_edje}" 266requirement_edje="${requirement_lua} ${requirement_edje}"
268 267
269have_ecore_imf="no" 268have_ecore_imf="no"
270PKG_CHECK_MODULES([ECORE_IMF], 269PKG_CHECK_MODULES([ECORE_IMF],
271 [ 270 [
272 ecore-imf >= 0.9.9 271 ecore-imf >= 1.0.0
273 ecore-imf-evas >= 0.9.9 272 ecore-imf-evas >= 1.0.0
274 ], 273 ],
275 [ 274 [
276 AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry]) 275 AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry])
277 have_ecore_imf="yes" 276 have_ecore_imf="yes"
278 requirement_edje="ecore-imf-evas ecore-imf ${requirement_edje}" 277 requirement_edje="ecore-imf-evas >= 1.0.0 ecore-imf >= 1.0.0 ${requirement_edje}"
279 ], 278 ],
280 [have_ecore_imf="no"]) 279 [have_ecore_imf="no"])
281 280
282# Dependencies for the binaries 281# Dependencies for the binaries
283 282
284if test "x$have_edje_cc" = "xyes"; then 283if test "x$have_edje_cc" = "xyes"; then
285 PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 0.9.9]) 284 PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 1.0.0])
286 PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 0.9.9]) 285 PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 1.0.0])
287fi 286fi
288 287
289if test "x$have_edje_player" = "xyes"; then 288if test "x$have_edje_player" = "xyes"; then
290 PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 0.9.9]) 289 PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 1.0.0])
291fi 290fi
292 291
293 292
diff --git a/legacy/edje/doc/img/elementary.png b/legacy/edje/doc/img/elementary.png
deleted file mode 100644
index 79754891f1..0000000000
--- a/legacy/edje/doc/img/elementary.png
+++ /dev/null
Binary files differ
diff --git a/legacy/edje/src/lib/Edje.h b/legacy/edje/src/lib/Edje.h
index d7bf4a4e68..5f2afbc7f7 100644
--- a/legacy/edje/src/lib/Edje.h
+++ b/legacy/edje/src/lib/Edje.h
@@ -38,8 +38,8 @@
38extern "C" { 38extern "C" {
39#endif 39#endif
40 40
41#define EDJE_VERSION_MAJOR 0 41#define EDJE_VERSION_MAJOR 1
42#define EDJE_VERSION_MINOR 9 42#define EDJE_VERSION_MINOR 0
43 43
44 typedef struct _Edje_Version 44 typedef struct _Edje_Version
45 { 45 {