From 5c5bab8886e54ed9c0787d6c4b3edbdc284d527f Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 16 Aug 2010 09:08:49 +0000 Subject: [PATCH] edje -> knocked off too for 1.0.0 alpha SVN revision: 51177 --- legacy/edje/README | 102 ++++++++--------------------- legacy/edje/configure.ac | 47 +++++++------ legacy/edje/doc/img/elementary.png | Bin 7313 -> 0 bytes legacy/edje/src/lib/Edje.h | 4 +- 4 files changed, 54 insertions(+), 99 deletions(-) delete mode 100644 legacy/edje/doc/img/elementary.png 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 79754891f19704929cf6198da9c17f7f12a7601b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7313 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