Re: [E-devel] E SVN: discomfitor IN trunk/edje: . src/bin src/bin/epp

[<uni...@gm...>]

Why revert the Windows CE stuff? What if someone is using Windows CE? Should be fine to leave as a just in case.

Sent from my Cellular South HTC Desire

----- Reply message -----
From: "Vincent Torri" <vt...@un...>
Date: Tue, Feb 22, 2011 11:56 pm
Subject: [E-devel] E SVN: discomfitor IN trunk/edje: . src/bin src/bin/epp
To: <enl...@li...>



On Tue, 22 Feb 2011, Enlightenment SVN wrote:

> Log:
> edje: change epp installdir
>
>
> Author:       discomfitor
> Date:         2011-02-22 18:51:32 -0800 (Tue, 22 Feb 2011)
> New Revision: 57252
> Trac:         http://trac.enlightenment.org/e/changeset/57252
>
> Modified:
>  trunk/edje/configure.ac trunk/edje/src/bin/edje_cc_parse.c.in trunk/edje/src/bin/epp/Makefile.am
>
> Modified: trunk/edje/configure.ac
> ===================================================================
> --- trunk/edje/configure.ac	2011-02-23 00:45:53 UTC (rev 57251)
> +++ trunk/edje/configure.ac	2011-02-23 02:51:32 UTC (rev 57252)
> @@ -294,12 +294,9 @@
>    PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
>    EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
> fi
> -AC_PATH_PROG([EPP], [epp])
> -AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes" -a -z "$EPP"])
> -if test -z "$EPP" ; then
> -   EPP=${prefix}/bin/epp
> -   AC_SUBST(EPP)
> -fi
> +AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"])
> +EPPDIR=${prefix}/lib/edje/utils

do not do that. The value of prefix is not known at configure time. In 
addition, do not use $prefix/lib/edje in configure.ac but $libdir/$PACKAGE 
in Makefile.am with a macro. Use that macro in edje_cc_parse (so no need 
to have a edje_cc_parse.c.in

and don't forget to revert your changes about Windows CE

> +AC_SUBST(EPPDIR)
>
> if test "x$have_edje_decc" = "xyes"; then
>    PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
>
> Modified: trunk/edje/src/bin/edje_cc_parse.c.in
> ===================================================================
> --- trunk/edje/src/bin/edje_cc_parse.c.in	2011-02-23 00:45:53 UTC (rev 57251)
> +++ trunk/edje/src/bin/edje_cc_parse.c.in	2011-02-23 02:51:32 UTC (rev 57252)
> @@ -693,9 +693,9 @@
> 	 * Run the input through the C pre-processor.
> 	 */
>         ret = -1;
> -   if (ecore_file_exists("@EPP@"))
> +   if (ecore_file_exists("@EPPDIR@/epp"))
>      {
> -        snprintf(buf, sizeof(buf), "@EPP@ -I%s %s -P -o %s - < %s",
> +        snprintf(buf, sizeof(buf), "@EPPDIR@/epp -I%s %s -P -o %s - < %s",
>                  inc, def, tmpn, file_in);
>          ret = system(buf);
>      }
>
> Modified: trunk/edje/src/bin/epp/Makefile.am
> ===================================================================
> --- trunk/edje/src/bin/epp/Makefile.am	2011-02-23 00:45:53 UTC (rev 57251)
> +++ trunk/edje/src/bin/epp/Makefile.am	2011-02-23 02:51:32 UTC (rev 57252)
> @@ -18,7 +18,8 @@
> #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
>
> MAINTAINERCLEANFILES = Makefile.in
> -bin_PROGRAMS = epp
> +eppdir = @EPPDIR@
> +epp_PROGRAMS = epp
>
> epp_SOURCES = \
> 	cpplib.h \
>
>
> ------------------------------------------------------------------------------
> Free Software Download: Index, Search & Analyze Logs and other IT data in
> Real-Time with Splunk. Collect, index and harness all the fast moving IT data
> generated by your applications, servers and devices whether physical, virtual
> or in the cloud. Deliver compliance at lower cost and gain new business
> insights. http://p.sf.net/sfu/splunk-dev2dev
> _______________________________________________
> enlightenment-svn mailing list
> enl...@li...
> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
>
>

------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in 
Real-Time with Splunk. Collect, index and harness all the fast moving IT data 
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business 
insights. http://p.sf.net/sfu/splunk-dev2dev 
_______________________________________________
enlightenment-devel mailing list
enl...@li...
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel