Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files
it seems like edje version would be more understandable here
On Thu, Aug 29, 2013 at 2:18 PM, Boris Faure - Enlightenment Git
no-re...@enlightenment.org wrote:
billiob pushed a commit to branch master.
commit 18ee1e1789a2b955ae1d6d836e48e8b8b839d93b
Author: Boris Faure bill...@gmail.com
Date: Thu Aug 29 15:11:12 2013 +0200
edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files
---
ChangeLog| 4
src/bin/edje/edje_cc_parse.c | 20 ++--
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 99658c5..9166cb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-29 Boris Faure
+
+ * Edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files
+
2013-08-29 Cedric Bail
* Evas: add interceptor for focus_set.
diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c
index 6950655..946149a 100644
--- a/src/bin/edje/edje_cc_parse.c
+++ b/src/bin/edje/edje_cc_parse.c
@@ -843,23 +843,31 @@ compile(void)
buf2[0] = '\0';
if (getenv(EFL_RUN_IN_TREE))
{
- snprintf(buf2, sizeof(buf2), %s/src/bin/edje/epp/epp
EPP_EXT,
+ snprintf(buf2, sizeof(buf2),
+ %s/src/bin/edje/epp/epp EPP_EXT,
PACKAGE_BUILD_DIR);
if (!ecore_file_exists(buf2))
buf2[0] = '\0';
}
if (buf2[0] == '\0')
- snprintf(buf2, sizeof(buf2), %s/edje/utils/ MODULE_ARCH
/epp EPP_EXT,
+ snprintf(buf2, sizeof(buf2),
+ %s/edje/utils/ MODULE_ARCH /epp EPP_EXT,
eina_prefix_lib_get(pfx));
if (ecore_file_exists(buf2))
{
if (anotate)
- snprintf(buf, sizeof(buf), %s -anotate -a %s %s -I%s %s
-o %s,
-buf2, watchfile ? watchfile : /dev/null,
file_in, inc, def, tmpn);
+ snprintf(buf, sizeof(buf), %s -anotate -a %s %s -I%s %s
-o %s
+ -DEINA_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d,
+buf2, watchfile ? watchfile : /dev/null,
file_in,
+inc, def, tmpn,
+EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
else
- snprintf(buf, sizeof(buf), %s -a %s %s -I%s %s -o %s,
-buf2, watchfile ? watchfile : /dev/null,
file_in, inc, def, tmpn);
+ snprintf(buf, sizeof(buf), %s -a %s %s -I%s %s -o %s
+ -DEINA_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d,
+buf2, watchfile ? watchfile : /dev/null,
file_in,
+inc, def, tmpn,
+EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
ret = system(buf);
}
else
--
--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk
--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files
Or EFL_VERSION which is the only thing that makes sense in my pov.
--
Tom.
On 29/08/13 14:21, Michael Blumenkrantz wrote:
it seems like edje version would be more understandable here
On Thu, Aug 29, 2013 at 2:18 PM, Boris Faure - Enlightenment Git
no-re...@enlightenment.org mailto:no-re...@enlightenment.org wrote:
billiob pushed a commit to branch master.
commit 18ee1e1789a2b955ae1d6d836e48e8b8b839d93b
Author: Boris Faure bill...@gmail.com mailto:bill...@gmail.com
Date: Thu Aug 29 15:11:12 2013 +0200
edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files
---
ChangeLog| 4
src/bin/edje/edje_cc_parse.c | 20 ++--
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 99658c5..9166cb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-29 Boris Faure
+
+ * Edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files
+
2013-08-29 Cedric Bail
* Evas: add interceptor for focus_set.
diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c
index 6950655..946149a 100644
--- a/src/bin/edje/edje_cc_parse.c
+++ b/src/bin/edje/edje_cc_parse.c
@@ -843,23 +843,31 @@ compile(void)
buf2[0] = '\0';
if (getenv(EFL_RUN_IN_TREE))
{
- snprintf(buf2, sizeof(buf2), %s/src/bin/edje/epp/epp
EPP_EXT,
+ snprintf(buf2, sizeof(buf2),
+ %s/src/bin/edje/epp/epp EPP_EXT,
PACKAGE_BUILD_DIR);
if (!ecore_file_exists(buf2))
buf2[0] = '\0';
}
if (buf2[0] == '\0')
- snprintf(buf2, sizeof(buf2), %s/edje/utils/ MODULE_ARCH
/epp EPP_EXT,
+ snprintf(buf2, sizeof(buf2),
+ %s/edje/utils/ MODULE_ARCH /epp EPP_EXT,
eina_prefix_lib_get(pfx));
if (ecore_file_exists(buf2))
{
if (anotate)
- snprintf(buf, sizeof(buf), %s -anotate -a %s %s
-I%s %s -o %s,
-buf2, watchfile ? watchfile : /dev/null,
file_in, inc, def, tmpn);
+ snprintf(buf, sizeof(buf), %s -anotate -a %s %s
-I%s %s -o %s
+ -DEINA_VERSION_MAJOR=%d
-DEFL_VERSION_MINOR=%d,
+buf2, watchfile ? watchfile : /dev/null,
file_in,
+inc, def, tmpn,
+EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
else
- snprintf(buf, sizeof(buf), %s -a %s %s -I%s %s -o %s,
-buf2, watchfile ? watchfile : /dev/null,
file_in, inc, def, tmpn);
+ snprintf(buf, sizeof(buf), %s -a %s %s -I%s %s -o %s
+ -DEINA_VERSION_MAJOR=%d
-DEFL_VERSION_MINOR=%d,
+buf2, watchfile ? watchfile : /dev/null,
file_in,
+inc, def, tmpn,
+EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
ret = system(buf);
}
else
--
--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft
technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk
--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk
--
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files
On 13-08-29 14:21, Michael Blumenkrantz wrote: it seems like edje version would be more understandable here At first I wanted set those to EFL_VERSION_MAJOR/MINOR but since we're using EINA_VERSION_MAJOR/MINOR. I thought it'd made sense to have the same constructions everywhere. On Thu, Aug 29, 2013 at 2:18 PM, Boris Faure - Enlightenment Git no-re...@enlightenment.org wrote: billiob pushed a commit to branch master. commit 18ee1e1789a2b955ae1d6d836e48e8b8b839d93b Author: Boris Faure bill...@gmail.com Date: Thu Aug 29 15:11:12 2013 +0200 edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files -- Boris Faure Pointer Arithmetician -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files
On 13-08-29 14:24, Tom Hacohen wrote: Or EFL_VERSION which is the only thing that makes sense in my pov. I almost did it… + -DEINA_VERSION_MAJOR=%d DEFL_VERSION_MINOR=%d, It's now done correctly. -- Boris Faure Pointer Arithmetician -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files
I guess I missed the place where we started ignoring the rest of the libs and only checking eina version everywhere? On Thu, Aug 29, 2013 at 2:27 PM, Boris Faure bo...@fau.re wrote: On 13-08-29 14:21, Michael Blumenkrantz wrote: it seems like edje version would be more understandable here At first I wanted set those to EFL_VERSION_MAJOR/MINOR but since we're using EINA_VERSION_MAJOR/MINOR. I thought it'd made sense to have the same constructions everywhere. On Thu, Aug 29, 2013 at 2:18 PM, Boris Faure - Enlightenment Git no-re...@enlightenment.org wrote: billiob pushed a commit to branch master. commit 18ee1e1789a2b955ae1d6d836e48e8b8b839d93b Author: Boris Faure bill...@gmail.com Date: Thu Aug 29 15:11:12 2013 +0200 edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files -- Boris Faure Pointer Arithmetician -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
