Enlightenment CVS committal Author : raster Project : e17 Module : test
Dir : e17/test/orig/ecore Modified Files: Makefile ecore_config.c ecore_dbus_hal_test.c ecore_dbus_receiver_test.c ecore_dbus_test.c ecore_dbus_test.h ecore_evas_test.c ecore_evas_test.h ecore_evas_test_app.c ecore_evas_test_bg.c ecore_evas_test_calibrate.c ecore_test.c Log Message: tests build =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile 28 Oct 2006 09:01:59 -0000 1.1 +++ Makefile 28 Oct 2006 10:35:30 -0000 1.2 @@ -1,20 +1,44 @@ -FLAGS = `eet-config --cflags` -LIBS = `eet-config --libs` +FLAGS = `ecore-config --cflags` +LIBS = `ecore-config --libs` -BINS = eet eet_bench +BINS = ecore_config ecore_evas_test ecore_test ecore_dbus_test ecore_dbus_hal_test ecore_dbus_receiver_test all: $(BINS) -eet_SRCS = eet_main.c -eet_OBJS = $(eet_SRCS:.c=.o) -eet: $(eet_OBJS) +ecore_config_SRCS = ecore_config.c +ecore_config_OBJS = $(ecore_config_SRCS:.c=.o) +ecore_config: $(ecore_config_OBJS) $(RM) $@ - $(CC) $(LIBS) $(CFLAGS) $(LDFLAGS) $(eet_OBJS) -o $@ + $(CC) $(LIBS) $(CFLAGS) $(LDFLAGS) $(ecore_config_OBJS) -o $@ -eet_bench_SRCS = eet_bench_main.c -eet_bench_OBJS = $(eet_bench_SRCS:.c=.o) -eet_bench: $(eet_bench_OBJS) +ecore_evas_test_SRCS = ecore_evas_test.c ecore_evas_test_app.c ecore_evas_test_bg.c ecore_evas_test_calibrate.c +ecore_evas_test_OBJS = $(ecore_evas_test_SRCS:.c=.o) +ecore_evas_test: $(ecore_evas_test_OBJS) $(RM) $@ - $(CC) $(LIBS) $(CFLAGS) $(LDFLAGS) $(eet_bench_OBJS) -o $@ + $(CC) $(LIBS) $(CFLAGS) $(LDFLAGS) $(ecore_evas_test_OBJS) -o $@ + +ecore_test_SRCS = ecore_test.c +ecore_test_OBJS = $(ecore_test_SRCS:.c=.o) +ecore_test: $(ecore_test_OBJS) + $(RM) $@ + $(CC) $(LIBS) $(CFLAGS) $(LDFLAGS) $(ecore_test_OBJS) -o $@ + +ecore_dbus_test_SRCS = ecore_dbus_test.c +ecore_dbus_test_OBJS = $(ecore_dbus_test_SRCS:.c=.o) +ecore_dbus_test: $(ecore_dbus_test_OBJS) + $(RM) $@ + $(CC) $(LIBS) $(CFLAGS) $(LDFLAGS) $(ecore_dbus_test_OBJS) -o $@ + +ecore_dbus_hal_test_SRCS = ecore_dbus_hal_test.c +ecore_dbus_hal_test_OBJS = $(ecore_dbus_hal_test_SRCS:.c=.o) +ecore_dbus_hal_test: $(ecore_dbus_hal_test_OBJS) + $(RM) $@ + $(CC) $(LIBS) $(CFLAGS) $(LDFLAGS) $(ecore_dbus_hal_test_OBJS) -o $@ + +ecore_dbus_receiver_test_SRCS = ecore_dbus_receiver_test.c +ecore_dbus_receiver_test_OBJS = $(ecore_dbus_receiver_test_SRCS:.c=.o) +ecore_dbus_receiver_test: $(ecore_dbus_receiver_test_OBJS) + $(RM) $@ + $(CC) $(LIBS) $(CFLAGS) $(LDFLAGS) $(ecore_dbus_receiver_test_OBJS) -o $@ ############################################################################ #### boilerplate =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/ecore_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_config.c 28 Oct 2006 10:11:02 -0000 1.1 +++ ecore_config.c 28 Oct 2006 10:35:30 -0000 1.2 @@ -1,17 +1,14 @@ -#include "config.h" #include "Ecore.h" #include <stdio.h> #include <string.h> #include <stdlib.h> -#ifdef BUILD_ECORE_CONFIG #include <unistd.h> #include <getopt.h> #include <Eet.h> -#include "Ecore_Config.h" -#include "Ecore_Data.h" -#include "ecore_config_private.h" +#include <Ecore_Config.h> +#include <Ecore_Data.h> // strcmp for paths - for sorting folders before files int @@ -326,11 +323,3 @@ return ret; } -#else -int -main(int argc, const char **argv) -{ - printf("Ecore_config module not compiled. This program is empty.\n"); - return -1; -} -#endif =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/ecore_dbus_hal_test.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_dbus_hal_test.c 28 Oct 2006 10:11:02 -0000 1.1 +++ ecore_dbus_hal_test.c 28 Oct 2006 10:35:30 -0000 1.2 @@ -3,8 +3,6 @@ */ #include "ecore_dbus_test.h" -#ifdef BUILD_ECORE_DBUS - static int ecore_dbus_event_server_add(void *udata, int ev_type, void *ev); static int ecore_dbus_event_server_del(void *udata, int ev_type, void *ev); @@ -160,11 +158,3 @@ } return "UNKNOWN"; } -#else -int -main(int argc, const char **argv) -{ - printf("Ecore_DBus module not compiled. This program is empty.\n"); - return -1; -} -#endif =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/ecore_dbus_receiver_test.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_dbus_receiver_test.c 28 Oct 2006 10:11:02 -0000 1.1 +++ ecore_dbus_receiver_test.c 28 Oct 2006 10:35:30 -0000 1.2 @@ -3,8 +3,6 @@ */ #include "ecore_dbus_test.h" -#ifdef BUILD_ECORE_DBUS - static int ecore_dbus_event_server_add(void *udata, int ev_type, void *ev); static int ecore_dbus_event_server_del(void *udata, int ev_type, void *ev); static int ecore_dbus_event_method_call(void *udata, int ev_type, void *ev); @@ -141,12 +139,3 @@ obj = ecore_dbus_object_add(svr, "/org/enlightenment/test"); ecore_dbus_object_method_add(obj, "org.enlightenment.Test", "Test", _test_object_test, NULL); } - -#else -int -main(int argc, const char **argv) -{ - printf("Ecore_DBus module not compiled. This program is empty.\n"); - return -1; -} -#endif =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/ecore_dbus_test.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_dbus_test.c 28 Oct 2006 10:11:02 -0000 1.1 +++ ecore_dbus_test.c 28 Oct 2006 10:35:30 -0000 1.2 @@ -3,8 +3,6 @@ */ #include "ecore_dbus_test.h" -#ifdef BUILD_ECORE_DBUS - static int ecore_dbus_event_server_add(void *udata, int ev_type, void *ev); static int ecore_dbus_event_server_del(void *udata, int ev_type, void *ev); @@ -179,14 +177,3 @@ } printf("---------------\n"); } - -#else -int -main(int argc, const char **argv) -{ - printf("Ecore_DBus module not compiled. This program is empty.\n"); - return -1; -} -#endif - - =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/ecore_dbus_test.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_dbus_test.h 28 Oct 2006 10:11:02 -0000 1.1 +++ ecore_dbus_test.h 28 Oct 2006 10:35:30 -0000 1.2 @@ -4,15 +4,12 @@ #ifndef _ECORE_DBUS_TEST_H #define _ECORE_DBUS_TEST_H -#include "config.h" #include <stdlib.h> #include <stdio.h> #include <string.h> -#ifdef BUILD_ECORE_DBUS -#include "Ecore.h" -#include "Ecore_Data.h" -#include "Ecore_DBus.h" -#endif +#include <Ecore.h> +#include <Ecore_Data.h> +#include <Ecore_DBus.h> #endif =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/ecore_evas_test.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_evas_test.c 28 Oct 2006 10:11:02 -0000 1.1 +++ ecore_evas_test.c 28 Oct 2006 10:35:30 -0000 1.2 @@ -1,7 +1,5 @@ #include "ecore_evas_test.h" -#ifdef BUILD_ECORE_EVAS - int main(int argc, const char **argv) { @@ -17,11 +15,3 @@ return 0; } -#else -int -main(int argc, const char **argv) -{ - printf("Ecore_evas module not compiled. This program is empty.\n"); - return -1; -} -#endif =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/ecore_evas_test.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_evas_test.h 28 Oct 2006 10:11:02 -0000 1.1 +++ ecore_evas_test.h 28 Oct 2006 10:35:30 -0000 1.2 @@ -1,20 +1,17 @@ #ifndef _ECORE_EVAS_TEST_H #define _ECORE_EVAS_TEST_H -#include "config.h" #include "Ecore.h" #include <math.h> #include <stdlib.h> #include <stdio.h> #include <string.h> -#ifdef BUILD_ECORE_EVAS #include "Ecore_Evas.h" -#include "Ecore_Fb.h" -#define IM PACKAGE_DATA_DIR"/images/" -#define PT PACKAGE_DATA_DIR"/pointers/" -#define FN PACKAGE_DATA_DIR"/fonts/" +#define IM "data/images/" +#define PT "data/pointers/" +#define FN "data/fonts/" extern double start_time; extern Ecore_Evas *ee; @@ -33,7 +30,5 @@ int app_start(int argc, const char **argv); void app_finish(void); - -#endif #endif =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/ecore_evas_test_app.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_evas_test_app.c 28 Oct 2006 10:11:02 -0000 1.1 +++ ecore_evas_test_app.c 28 Oct 2006 10:35:30 -0000 1.2 @@ -1,7 +1,5 @@ #include "ecore_evas_test.h" -#ifdef BUILD_ECORE_EVAS - double start_time = 0.0; Ecore_Evas *ee = NULL; Evas *evas = NULL; @@ -131,13 +129,7 @@ return 0; } else { -#ifdef BUILD_ECORE_X ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320); -#else -#ifdef BUILD_ECORE_FB - ee = ecore_evas_fb_new(NULL, 270, 240, 320); -#endif -#endif evas = ecore_evas_get(ee); } if (!ee) return -1; @@ -180,5 +172,3 @@ { ecore_main_loop_quit(); } - -#endif =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/ecore_evas_test_bg.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_evas_test_bg.c 28 Oct 2006 10:11:02 -0000 1.1 +++ ecore_evas_test_bg.c 28 Oct 2006 10:35:30 -0000 1.2 @@ -1,7 +1,5 @@ #include "ecore_evas_test.h" -#ifdef BUILD_ECORE_EVAS - Evas_Object *o_bg_rect = NULL; Evas_Object *o_logo = NULL; Ecore_Timer *anim_timer = NULL; @@ -364,40 +362,33 @@ } if (!strcmp(ev->keyname, "Up")) { -#ifdef BUILD_ECORE_FB #if 0 double br; br = ecore_fb_backlight_brightness_get(); ecore_fb_backlight_brightness_set(br + 0.1); #endif -#endif } if (!strcmp(ev->keyname, "Down")) { -#ifdef BUILD_ECORE_FB #if 0 double br; br = ecore_fb_backlight_brightness_get(); ecore_fb_backlight_brightness_set(br - 0.1); #endif -#endif } if (!strcmp(ev->keyname, "F2")) { -#ifdef BUILD_ECORE_FB #if 0 if (ecore_fb_backlight_get()) ecore_fb_backlight_set(0); else ecore_fb_backlight_set(1); #endif -#endif } if (!strcmp(ev->keyname, "F3")) { -#ifdef BUILD_ECORE_FB #if 0 static int v = 0; @@ -406,23 +397,18 @@ if (!v) v = 1; else v = 0; #endif -#endif } if (!strcmp(ev->keyname, "Left")) { -#ifdef BUILD_ECORE_FB #if 0 ecore_fb_led_blink_set(0.1); #endif -#endif } if (!strcmp(ev->keyname, "Right")) { -#ifdef BUILD_ECORE_FB #if 0 ecore_fb_led_blink_set(0.5); #endif -#endif } if ((!strcmp(ev->keyname, "p")) || (!strcmp(ev->keyname, "Return"))) @@ -434,11 +420,9 @@ ecore_evas_cursor_set(ee, PT"mouse_pointer.png", 1000000, 2, 2); else ecore_evas_cursor_set(ee, NULL, 0, 0, 0); -#ifdef BUILD_ECORE_FB #if 0 printf("%3.3f\n", ecore_fb_light_sensor_get()); #endif -#endif } } @@ -450,4 +434,3 @@ ev = event_info; printf("UP %s\n", ev->keyname); } -#endif =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/ecore_evas_test_calibrate.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_evas_test_calibrate.c 28 Oct 2006 10:11:02 -0000 1.1 +++ ecore_evas_test_calibrate.c 28 Oct 2006 10:35:30 -0000 1.2 @@ -1,7 +1,5 @@ #include "ecore_evas_test.h" -#ifdef BUILD_ECORE_EVAS - static Evas_Object *o_events = NULL; static Evas_Object *o_crosshair = NULL; static Evas_Object *o_text = NULL; @@ -92,11 +90,9 @@ if (rot == 0) { -#ifdef BUILD_ECORE_FB #if 0 ecore_fb_touch_screen_calibrate_set(xscale, xtrans, yscale, ytrans, xyswap); #endif -#endif } else if (rot == 270) { @@ -104,11 +100,9 @@ evas_output_size_get(evas, &ow, &oh); ytrans = oh - (ytrans + ((oh * yscale) / 256)); -#ifdef BUILD_ECORE_FB #if 0 ecore_fb_touch_screen_calibrate_set(yscale, ytrans, xscale, xtrans, xyswap); #endif -#endif } evas_object_del(o_crosshair); @@ -126,11 +120,9 @@ { Evas_Object *o; -#ifdef BUILD_ECORE_FB #if 0 ecore_fb_touch_screen_calibrate_set(256, 0, 256, 0, 0); #endif -#endif o = evas_object_rectangle_add(evas); evas_object_layer_set(o, 1000000); @@ -288,4 +280,3 @@ tmp_input[((tmp_input_count & 0x7) * 2) + 1] = ev->cur.output.y; tmp_input_count++; } -#endif =================================================================== RCS file: /cvs/e/e17/test/orig/ecore/ecore_test.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_test.c 28 Oct 2006 10:11:02 -0000 1.1 +++ ecore_test.c 28 Oct 2006 10:35:30 -0000 1.2 @@ -1,23 +1,10 @@ -#include "config.h" -#include "Ecore.h" -#ifdef BUILD_ECORE_JOB -#include "Ecore_Job.h" -#endif -#ifdef BUILD_ECORE_X -#include "Ecore_X.h" -#endif -#ifdef BUILD_ECORE_FB -#include "Ecore_Fb.h" -#endif -#ifdef BUILD_ECORE_EVAS -#include "Ecore_Evas.h" -#endif -#ifdef BUILD_ECORE_CON -#include "Ecore_Con.h" -#endif -#ifdef BUILD_ECORE_IPC -#include "Ecore_Ipc.h" -#endif +#include <Ecore.h> +#include <Ecore_Job.h> +#include <Ecore_X.h> +#include <Ecore_Fb.h> +#include <Ecore_Evas.h> +#include <Ecore_Con.h> +#include <Ecore_Ipc.h> #include <math.h> #include <stdlib.h> @@ -50,32 +37,27 @@ int handler_ipc_client_add(void *data, int type, void *event) { -#ifdef BUILD_ECORE_IPC Ecore_Ipc_Event_Client_Add *e; e = event; printf("!!! client %p connected to server!\n", e->client); return 1; -#endif } int handler_ipc_client_del(void *data, int type, void *event) { -#ifdef BUILD_ECORE_IPC Ecore_Ipc_Event_Client_Del *e; e = event; printf("!!! client %p disconnected from server!\n", e->client); return 1; -#endif } int handler_ipc_client_data(void *data, int type, void *event) { -#ifdef BUILD_ECORE_IPC Ecore_Ipc_Event_Client_Data *e; e = event; @@ -86,26 +68,22 @@ /* or we can end a server by: */ /* ecore_ipc_server_del(ecore_ipc_client_server_get(e->client)); */ return 1; -#endif } int handler_ipc_server_add(void *data, int type, void *event) { -#ifdef BUILD_ECORE_IPC Ecore_Ipc_Event_Server_Add *e; e = event; printf("!!! client made successful connect to server %p!\n", e->server); return 1; -#endif } int handler_ipc_server_del(void *data, int type, void *event) { -#ifdef BUILD_ECORE_IPC Ecore_Ipc_Event_Server_Del *e; e = event; @@ -113,13 +91,11 @@ /* clean up our server connection since it went away */ ecore_ipc_server_del(e->server); return 1; -#endif } int handler_ipc_server_data(void *data, int type, void *event) { -#ifdef BUILD_ECORE_IPC Ecore_Ipc_Event_Server_Data *e; static int count = 0; @@ -133,39 +109,33 @@ ecore_ipc_server_del(e->server); } return 1; -#endif } /**** ECORE_CON TEST CODE */ int handler_client_add(void *data, int type, void *event) { -#ifdef BUILD_ECORE_CON Ecore_Con_Event_Client_Add *e; e = event; printf("!!! client %p connected to server!\n", e->client); return 1; -#endif } int handler_client_del(void *data, int type, void *event) { -#ifdef BUILD_ECORE_CON Ecore_Con_Event_Client_Del *e; e = event; printf("!!! client %p disconnected from server!\n", e->client); return 1; -#endif } int handler_client_data(void *data, int type, void *event) { -#ifdef BUILD_ECORE_CON Ecore_Con_Event_Client_Data *e; e = event; @@ -176,26 +146,22 @@ /* or we can end a server by: */ /* ecore_con_server_del(ecore_con_client_server_get(e->client)); */ return 1; -#endif } int handler_server_add(void *data, int type, void *event) { -#ifdef BUILD_ECORE_CON Ecore_Con_Event_Server_Add *e; e = event; printf("!!! client made successful connect to server %p!\n", e->server); return 1; -#endif } int handler_server_del(void *data, int type, void *event) { -#ifdef BUILD_ECORE_CON Ecore_Con_Event_Server_Del *e; e = event; @@ -203,13 +169,11 @@ /* clean up our server connection since it went away */ ecore_con_server_del(e->server); return 1; -#endif } int handler_server_data(void *data, int type, void *event) { -#ifdef BUILD_ECORE_CON Ecore_Con_Event_Server_Data *e; static int count = 0; @@ -223,18 +187,15 @@ ecore_con_server_del(e->server); } return 1; -#endif } /* NB: also tests ECORE_JOB */ -#ifdef BUILD_ECORE_JOB void job_call(void *data) { printf("!! Job done \"%s\"!\n", (char *)data); } -#endif int idle_enterer(void *data) @@ -255,11 +216,9 @@ { printf("Q- Timer tick %3.8f\n", ecore_time_get() - start_time); /* test ecore_job */ -#ifdef BUILD_ECORE_JOB ecore_job_add(job_call, "1"); ecore_job_add(job_call, "2"); ecore_job_add(job_call, "3"); -#endif return 1; } @@ -271,7 +230,6 @@ ecore_timer_add(2.0, timer, NULL); } -#ifdef BUILD_ECORE_X /**** ECORE_X TEST CODE */ Ecore_X_Window win = 0; @@ -593,9 +551,7 @@ */ } -#endif -#ifdef BUILD_ECORE_EVAS /* choose: TEST_X, TEST_FB */ #define TEST_X @@ -773,7 +729,6 @@ ecore_evas_show(ee); return 1; } -#endif /**** MAIN */ int @@ -792,7 +747,6 @@ setup_ecore_test(); #endif -#ifdef BUILD_ECORE_CON #if 0 /* init ecore_con */ ecore_con_init(); @@ -827,9 +781,7 @@ } } #endif -#endif -#ifdef BUILD_ECORE_IPC #if 1 /* init ecore_ipc */ ecore_ipc_init(); @@ -861,42 +813,29 @@ } } #endif -#endif -#ifdef BUILD_ECORE_EVAS /* init ecore_evas */ /* if (!ecore_evas_init()) return -1; */ -#endif /* setup a callback to handle a systsme signal to quit */ ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, handler_signal_exit, NULL); -#ifdef BUILD_ECORE_X /* setup to test ecore_x module things */ if (!ecore_x_init(NULL)) return -1; setup_ecore_x_test(); -#endif -#ifdef BUILD_ECORE_EVAS /* setup to test ecore_evas module */ /* if (!setup_ecore_evas_test()) return -1; */ -#endif /* run the main loop */ ecore_main_loop_begin(); -#ifdef BUILD_ECORE_EVAS /* shut down ecore_evas */ ecore_evas_shutdown(); -#endif -#ifdef BUILD_ECORE_IPC /* shut down ecore_ipc */ ecore_ipc_shutdown(); -#endif -#ifdef BUILD_ECORE_CON /* shut down ecore_con */ ecore_con_shutdown(); -#endif /* shut down ecore */ ecore_shutdown(); return 0; ------------------------------------------------------------------------- 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