Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
Makefile.am edje_cc.c edje_cc_out.c edje_main.c edje_main.h
Added Files:
edje_prefix.c edje_prefix.h
Log Message:
edje is now also prefix aware.
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- Makefile.am 11 Nov 2005 06:49:57 -0000 1.30
+++ Makefile.am 10 Jul 2006 18:55:23 -0000 1.31
@@ -30,7 +30,9 @@
edje_SOURCES = \
edje_main.c \
-edje_main.h
+edje_main.h \
+edje_prefix.c \
+edje_prefix.h
edje_LDADD = \
$(top_builddir)/src/lib/libedje.la
@@ -45,7 +47,9 @@
edje_cc_parse.c \
edje_cc_mem.c \
edje_cc_handlers.c \
-edje_cc_sources.c
+edje_cc_sources.c \
+edje_prefix.c \
+edje_prefix.h
edje_cc_LDADD = \
$(top_builddir)/src/lib/libedje.la
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- edje_cc.c 11 Nov 2005 06:49:57 -0000 1.27
+++ edje_cc.c 10 Jul 2006 18:55:23 -0000 1.28
@@ -119,6 +119,8 @@
exit(-1);
}
+ e_prefix_determine(argv[0]);
+
/* check whether file_in exists */
#ifdef HAVE_REALPATH
if (!realpath(file_in, rpath) || stat(rpath, &st) || !S_ISREG(st.st_mode))
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_out.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- edje_cc_out.c 11 Mar 2006 15:34:46 -0000 1.46
+++ edje_cc_out.c 10 Jul 2006 18:55:23 -0000 1.47
@@ -623,8 +623,9 @@
if (fd >= 0)
{
snprintf(buf, sizeof(buf),
- EMBRYO_PREFIX"/bin/embryo_cc -i %s -o %s %s",
- DAT"include", tmpo, tmpn);
+ "embryo_cc -i %s -o %s %s",
+ "%s/include", tmpo, tmpn,
+ e_prefix_data_get());
ret = system(buf);
/* accept warnings in the embryo code */
if (ret < 0 || ret > 1)
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_main.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- edje_main.c 9 Oct 2005 04:22:19 -0000 1.61
+++ edje_main.c 10 Jul 2006 18:55:23 -0000 1.62
@@ -68,7 +68,9 @@
main_start(int argc, char **argv)
{
int mode = 0;
-
+ char buf[4096];
+
+ e_prefix_determine(argv[0]);
start_time = ecore_time_get();
if (!ecore_init()) return -1;
ecore_app_args_set(argc, (const char **)argv);
@@ -134,8 +136,8 @@
evas = ecore_evas_get(ecore_evas);
evas_image_cache_set(evas, 2 * 1024 * 1024);
evas_font_cache_set(evas, 512 * 1024);
- evas_font_path_append(evas, DAT"data/test/fonts");
- evas_font_path_append(evas, "fonts");
+ snprintf(buf, sizeof(buf), "%s/data/test/fonts", e_prefix_data_get());
+ evas_font_path_append(evas, buf);
return 1;
}
@@ -185,13 +187,15 @@
bg_setup(void)
{
Evas_Object *o;
+ char buf[4096];
o = evas_object_image_add(evas);
evas_object_move(o, 0, 0);
evas_object_resize(o, startw, starth);
evas_object_layer_set(o, -999);
evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_image_file_set(o, DAT"data/test/images/bg.png", NULL);
+ snprintf(buf, sizeof(buf), "%s/data/test/images/bg.png",
e_prefix_data_get());
+ evas_object_image_file_set(o, buf, NULL);
evas_object_image_fill_set(o, 0, 0, 128, 128);
evas_object_pass_events_set(o, 1);
evas_object_show(o);
@@ -204,7 +208,8 @@
evas_object_resize(o, startw, starth);
evas_object_layer_set(o, -999);
evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_image_file_set(o, DAT"data/test/images/shadow.png", NULL);
+ snprintf(buf, sizeof(buf), "%s/data/test/images/shadow.png",
e_prefix_data_get());
+ evas_object_image_file_set(o, buf, NULL);
evas_object_image_smooth_scale_set(o, 0);
evas_object_image_fill_set(o, 0, 0, startw, starth);
evas_object_pass_events_set(o, 1);
@@ -469,18 +474,22 @@
list_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Collection *co;
+ char buf[4096];
co = data;
- evas_object_image_file_set(co->bg, DAT"data/test/images/item_selected.png",
NULL);
+ snprintf(buf, sizeof(buf), "%s/data/test/images/item_selected.png",
e_prefix_data_get());
+ evas_object_image_file_set(co->bg, buf, NULL);
}
static void
list_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
Collection *co;
+ char buf[4096];
co = data;
- evas_object_image_file_set(co->bg, DAT"data/test/images/item_normal.png",
NULL);
+ snprintf(buf, sizeof(buf), "%s/data/test/images/item_normal.png",
e_prefix_data_get());
+ evas_object_image_file_set(co->bg, buf, NULL);
test_setup(co->file, co->part);
evas_object_color_set(co->bg, 255, 255, 255, 128);
evas_object_color_set(co->text, 0, 0, 0, 128);
@@ -566,6 +575,7 @@
Evas_Coord maxw = 128;
Collection *co_head;
Evas_List *collections = NULL;
+ char buf[4096];
entries = edje_file_collection_list(file);
// printf("%s\n", edje_file_data_get(file, "My Data");
@@ -585,7 +595,8 @@
o = evas_object_image_add(evas);
evas_object_layer_set(o, 10);
evas_object_image_border_set(o, 10, 10, 10, 10);
- evas_object_image_file_set(o, DAT"data/test/images/item_title.png",
NULL);
+ snprintf(buf, sizeof(buf), "%s/data/test/images/item_title.png",
e_prefix_data_get());
+ evas_object_image_file_set(o, buf, NULL);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
list_head_down_cb, co);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
list_head_up_cb, co);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE,
list_head_move_cb, co);
@@ -623,7 +634,8 @@
o = evas_object_image_add(evas);
evas_object_layer_set(o, 10);
evas_object_image_border_set(o, 10, 10, 10, 10);
- evas_object_image_file_set(o,
DAT"data/test/images/item_normal.png", NULL);
+ snprintf(buf, sizeof(buf), "%s/data/test/images/item_normal.png",
e_prefix_data_get());
+ evas_object_image_file_set(o, buf, NULL);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
list_down_cb, co);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
list_up_cb, co);
co->bg = o;
@@ -698,7 +710,7 @@
{
Evas_Object *o;
Demo_Edje *de;
- char buf[1024];
+ char buf[4096];
Evas_Coord tw, th, w, h;
Evas_Coord xx, yy, ww, hh;
@@ -720,7 +732,8 @@
edjes = evas_list_append(edjes, de);
o = evas_object_image_add(evas);
- evas_object_image_file_set(o, DAT"data/test/images/border.png", NULL);
+ snprintf(buf, sizeof(buf), "%s/data/test/images/border.png",
e_prefix_data_get());
+ evas_object_image_file_set(o, buf, NULL);
evas_object_image_smooth_scale_set(o, 0);
evas_object_color_set(o, 255, 255, 255, 255);
evas_object_image_border_set(o, 26, 26, 26, 26);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_main.h 27 Dec 2005 17:17:31 -0000 1.4
+++ edje_main.h 10 Jul 2006 18:55:23 -0000 1.5
@@ -31,7 +31,6 @@
#endif
#include "edje_private.h"
-
-#define DAT PACKAGE_DATA_DIR"/"
+#include "edje_prefix.h"
#endif
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
