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 @@ -Edje 0.5.0 +Edje 1.0.0 ALPHA +****************************************************************************** + + FOR ANY ISSUES PLEASE EMAIL: + enlightenment-devel@lists.sourceforge.net + +****************************************************************************** + Requirements: ------------- Must: - libc libm eet ecore ecore-evas ecore-job ecore-file embryo evas + libc + libm + eet (at least 1.4.0) + ecore (at least 1.0.0) + ecore-evas (at least 1.0.0) + ecore-file (at least 1.0.0) + embryo (at least 1.0.0) + evas (at least 1.0.0) -A graphical layout and animation library for animated resizable, compressed and -scalable themes. +Edje is a graphical layout and animation library for animated resizable, +compressed and scalable themes. It is meant to abstract UI from the +programmer to make it possible to plug in any replacement look at feel +that can be generated any time after an application or library has +already been developed, thus allowing full flexibility of look and +feel without having to involve the software developers. -It's current under development and isn't complete. See src/lib/edje_private.h -for a list of FIXME's to do. Hopefully it will be complete in a few weeks. +------------------------------------------------------------------------------ +COMPILING AND INSTALLING: -Quick start-up guide: - -1. You need eet from the HEAD cvs branch (must be up-to-date) - - cvs co e17/libs/eet - cd e17/libs/eet - ./autogen.sh + ./configure make - sudo make install - cd - -2. You need evas from the HEAD branch built with eet loader support. - - cvs co e17/libs/evas - cd e17/libs/evas - ./autogen.sh - make - sudo make install - cd - -3. You need ecore from the HEAD cvs branch - - cvs co e17/libs/ecore - cd e17/libs/ecore - ./autogen.sh - make - sudo make install - cd - -4. You need embryo from the HEAD cvs branch - - cvs co e17/libs/embryo - cd e17/libs/embryo - ./autogen.sh - make - sudo make install - cd - -5. You already have Edje. now build it: - - ./autogen.sh - make - sudo make install - -You now want to go test it out. first you'll need to make an Edje EET file. - - cd data - ./e_logo.sh - -Now you can view the Edje you just built: - - edje ./e_logo.edj - -You can view multiple files at once with the Edje test program: - - edje ./e_logo.edj ./e_logo.edj ./e_logo.edj - -to view the same one 3 times. - -You can read the source file that builds the Edje EET file by looking at: - - data/src/e_logo.edc - -Another test file is also there: - - data/src/test.edc - -The test file doesn't build anything useful at the moment. +(as root unless you are installing in your users directories): + make install + + 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 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -m4_define([v_maj], [0]) -m4_define([v_min], [9]) -m4_define([v_mic], [99]) +m4_define([v_maj], [1]) +m4_define([v_min], [0]) +m4_define([v_mic], [0]) m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) m4_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']))]) ##-- When released, remove the dnl on the below line -dnl m4_undefine([v_rev]) +m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line -m4_define([relname], [ver-pre-svn-07]) -m4_define([v_rel], [-release relname]) +dnl m4_define([relname], [ver-pre-svn-07]) +dnl m4_define([v_rel], [-release relname]) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -m4_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])]) +m4_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])]) m4_define([lt_rev], m4_eval(v_maj + v_min)) m4_define([lt_cur], v_mic) m4_define([lt_age], v_min) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -AC_INIT([edje], [v_ver], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([edje], [v_ver-alpha], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ([2.52]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) @@ -246,48 +245,48 @@ fi PKG_CHECK_MODULES([MINIMAL], [ - eina-0 - eet >= 1.2.3 + eina >= 1.0.0 + eet >= 1.4.0 ]) PKG_CHECK_MODULES([EDJE], [ - eina-0 - eet >= 1.2.3 - evas >= 0.9.9 - ecore >= 0.9.9 - ecore-file >= 0.9.9 - embryo >= 0.9.1 + eina >= 1.0.0 + eet >= 1.4.0 + evas >= 1.0.0 + ecore >= 1.0.0 + ecore-file >= 1.0.0 + embryo >= 1.0.0 ]) EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}" EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}" -requirement_edje="embryo ecore evas eet eina-0 ${requirement_edje}" +requirement_edje="embryo >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_edje}" requirement_edje="${requirement_lua} ${requirement_edje}" have_ecore_imf="no" PKG_CHECK_MODULES([ECORE_IMF], [ - ecore-imf >= 0.9.9 - ecore-imf-evas >= 0.9.9 + ecore-imf >= 1.0.0 + ecore-imf-evas >= 1.0.0 ], [ AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support for Edje Entry]) have_ecore_imf="yes" - requirement_edje="ecore-imf-evas ecore-imf ${requirement_edje}" + requirement_edje="ecore-imf-evas >= 1.0.0 ecore-imf >= 1.0.0 ${requirement_edje}" ], [have_ecore_imf="no"]) # Dependencies for the binaries if test "x$have_edje_cc" = "xyes"; then - PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 0.9.9]) - PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 0.9.9]) + PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 1.0.0]) + PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 1.0.0]) fi if test "x$have_edje_player" = "xyes"; then - PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 0.9.9]) + PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 1.0.0]) fi diff --git a/legacy/edje/doc/img/elementary.png b/legacy/edje/doc/img/elementary.png deleted file mode 100644 index 79754891f1..0000000000 Binary files a/legacy/edje/doc/img/elementary.png and /dev/null 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 @@ extern "C" { #endif -#define EDJE_VERSION_MAJOR 0 -#define EDJE_VERSION_MINOR 9 +#define EDJE_VERSION_MAJOR 1 +#define EDJE_VERSION_MINOR 0 typedef struct _Edje_Version {