summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-02-29 07:30:31 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-02-29 07:32:42 -0500
commit9ad7ddbcd425702077b7cbf17c9de0f97e1ec956 (patch)
tree11a19c754d331b0800f473cb8df4b6ff7035d166
parenta761171009521587a8136fb51e2383757143a29a (diff)
downloadefl-9ad7ddbcd425702077b7cbf17c9de0f97e1ec956.tar.gz
efl+edje: add EFL_VERSION_1_18 define for detecting 1.18 feature support
this define means that any 1.18 feature can now be detected by testing for the presence of this define, even before the release has gone out for future (non-bugfix) releases, further defines should be created in addition to this one in order to provide detection for features in each version
-rw-r--r--src/bin/edje/edje_cc_parse.c15
-rw-r--r--src/lib/efl/Efl.h2
2 files changed, 13 insertions, 4 deletions
diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c
index c7ea53a723..31eab3245b 100644
--- a/src/bin/edje/edje_cc_parse.c
+++ b/src/bin/edje/edje_cc_parse.c
@@ -2,6 +2,7 @@
# include <config.h>
#endif
+
#include <string.h>
#include <ctype.h>
#include <limits.h>
@@ -22,6 +23,11 @@
# define EPP_EXT
#endif
+#define EDJE_1_18_SUPPORTED " -DEFL_VERSION_1_18=1 "
+
+#define EDJE_CC_EFL_VERSION_SUPPORTED \
+ EDJE_1_18_SUPPORTED
+
static void new_object(void);
static void new_statement(void);
static char *perform_math (char *input);
@@ -981,19 +987,22 @@ compile(void)
inc = ecore_file_dir_get(file_in);
if (depfile)
snprintf(buf, sizeof(buf), "%s -MMD %s -MT %s %s -I%s %s -o %s"
- " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d",
+ " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d"
+ EDJE_CC_EFL_VERSION_SUPPORTED,
buf2, depfile, file_out, file_in,
inc ? inc : "./", def, clean_file,
EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
else if (annotate)
snprintf(buf, sizeof(buf), "%s -annotate -a %s %s -I%s %s -o %s"
- " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d",
+ " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d"
+ EDJE_CC_EFL_VERSION_SUPPORTED,
buf2, watchfile ? watchfile : "/dev/null", file_in,
inc ? inc : "./", def, clean_file,
EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
else
snprintf(buf, sizeof(buf), "%s -a %s %s -I%s %s -o %s"
- " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d",
+ " -DEFL_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d"
+ EDJE_CC_EFL_VERSION_SUPPORTED,
buf2, watchfile ? watchfile : "/dev/null", file_in,
inc ? inc : "./", def, clean_file,
EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 7f853f95bd..82352fd234 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -33,7 +33,7 @@ extern "C" {
# endif
#endif /* ! _WIN32 */
-
+#define EFL_VERSION_1_18 1
/**
* @ingroup Efl