summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile_Efl_Js.am77
-rw-r--r--src/Makefile_Eolian_Js.am10
-rw-r--r--src/bindings/js/efl_js/efl_js.cc8
-rwxr-xr-xsrc/tests/eolian_js/eolian_js_suite.js3
5 files changed, 44 insertions, 56 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index cbf258e..9e12fdc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,7 +85,7 @@ am__v_CP_0 = @echo " CP " $@;
85CP = cp 85CP = cp
86if EFL_ENABLE_TESTS 86if EFL_ENABLE_TESTS
87if HAVE_NODEJS 87if HAVE_NODEJS
88AM_TESTS_ENVIRONMENT += NODE_PATH='$(abs_builddir)/lib/efl_js:$(abs_builddir)/tests/eolian_js:$(abs_builddir)/tests/efl_js'; export NODE_PATH; 88AM_TESTS_ENVIRONMENT += NODE_PATH='$(abs_builddir)/bin/efl_js:$(abs_builddir)/tests/eolian_js:$(abs_builddir)/tests/efl_js'; export NODE_PATH;
89endif 89endif
90endif 90endif
91endif 91endif
diff --git a/src/Makefile_Efl_Js.am b/src/Makefile_Efl_Js.am
index 734c9ed..64c643a 100644
--- a/src/Makefile_Efl_Js.am
+++ b/src/Makefile_Efl_Js.am
@@ -2,14 +2,14 @@ if HAVE_JS
2 2
3if HAVE_NODEJS 3if HAVE_NODEJS
4 4
5noinst_lib_LTLIBRARIES = lib/efl_js/libefl_node_js.la 5noinst_lib_LTLIBRARIES = bindings/js/efl_js/libefl_js.la
6noinst_libdir = $(libdir)/efl_js 6noinst_libdir = $(libdir)/efl_js
7 7
8$(top_builddir)/src/lib/efl_js/efl.node: lib/efl_js/libefl_node_js.la 8bin/efl_js/efl.node: bindings/js/efl_js/libefl_js.la
9 $(AM_V_CP)$(CP) $(top_builddir)/src/lib/efl_js/.libs/libefl_node_js.so $(top_builddir)/src/lib/efl_js/efl.node 9 $(AM_V_CP)$(CP) bindings/js/efl_js/.libs/libefl_js.so bin/efl_js/efl.node
10 10
11eflnodedir = $(libdir)/node_modules 11eflnodedir = $(libdir)/node_modules
12eflnode_DATA = $(top_builddir)/src/lib/efl_js/efl.node 12eflnode_DATA = bin/efl_js/efl.node
13 13
14CLEANFILES += ${eflnodedir_DATA} 14CLEANFILES += ${eflnodedir_DATA}
15EXTRA_DIST2 += ${eflnodedir_DATA} 15EXTRA_DIST2 += ${eflnodedir_DATA}
@@ -133,9 +133,9 @@ installed_efljsheadersdir = $(includedir)/efl-js-@VMAJ@
133dist_installed_efljsheaders_DATA = \ 133dist_installed_efljsheaders_DATA = \
134bindings/js/efl_js/Efl_Js.hh 134bindings/js/efl_js/Efl_Js.hh
135 135
136lib_LTLIBRARIES += lib/efl_js/libefl_js.la 136#lib_LTLIBRARIES += lib/efl_js/libefl_js.la
137 137
138lib_efl_js_libefl_js_la_SOURCES = \ 138bindings_js_efl_js_libefl_js_la_SOURCES = \
139bindings/js/eina_js/eina_js_container.cc \ 139bindings/js/eina_js/eina_js_container.cc \
140bindings/js/eina_js/eina_js_value.cc \ 140bindings/js/eina_js/eina_js_value.cc \
141bindings/js/eina_js/eina_js_error.cc \ 141bindings/js/eina_js/eina_js_error.cc \
@@ -157,14 +157,15 @@ bindings/js/eldbus_js/eldbus_js_connection.cc \
157bindings/js/eldbus_js/eldbus_js_message.cc \ 157bindings/js/eldbus_js/eldbus_js_message.cc \
158bindings/js/eldbus_js/eldbus_js_object_mapper.cc \ 158bindings/js/eldbus_js/eldbus_js_object_mapper.cc \
159bindings/js/eio_js/eio_js.cc \ 159bindings/js/eio_js/eio_js.cc \
160bindings/js/efl_js/efl_js.cc \
160bindings/js/ethumb_js/ethumb_js_client.cc 161bindings/js/ethumb_js/ethumb_js_client.cc
161 162
162nodist_lib_efl_js_libefl_js_la_SOURCES = \ 163nodist_bindings_js_efl_js_libefl_js_la_SOURCES = \
163bindings/js/efl_js/eolian_js_bindings.cc 164bindings/js/efl_js/eolian_js_bindings.cc
164 165
165bindings/js/efl_js/efl_js.cc $(lib_efl_js_libefl_js_la_SOURCES): $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh) $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/ecore/Ecore.eo.hh 166bindings/js/efl_js/efl_js.cc $(bindings_js_efl_js_libefl_js_la_SOURCES): $(ecore_eolian_cxx_public_hh) $(ecore_eolian_cxx_public_impl_hh) $(eo_eolian_cxx_public_hh) $(eo_eolian_cxx_public_impl_hh) $(efl_eolian_cxx_public_hh) $(efl_eolian_cxx_public_impl_hh) lib/ecore/Ecore.eo.hh
166 167
167lib_efl_js_libefl_js_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 168bindings_js_efl_js_libefl_js_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
168-I$(top_srcdir)/src/lib/efl \ 169-I$(top_srcdir)/src/lib/efl \
169-I$(top_builddir)/src/lib/efl/interfaces/ \ 170-I$(top_builddir)/src/lib/efl/interfaces/ \
170-I$(top_builddir)/src/lib/evas/canvas/ \ 171-I$(top_builddir)/src/lib/evas/canvas/ \
@@ -187,24 +188,10 @@ lib_efl_js_libefl_js_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
187@EINA_CXX_CFLAGS@ \ 188@EINA_CXX_CFLAGS@ \
188@ELEMENTARY_CFLAGS@ \ 189@ELEMENTARY_CFLAGS@ \
189-D_EO_ADD_FALLBACK_FORCE=1 190-D_EO_ADD_FALLBACK_FORCE=1
190lib_efl_js_libefl_js_la_LIBADD = @EFL_JS_LIBS@ 191bindings_js_efl_js_libefl_js_la_LIBADD = @EFL_JS_LIBS@
191lib_efl_js_libefl_js_la_DEPENDENCIES = @EFL_JS_INTERNAL_LIBS@ 192bindings_js_efl_js_libefl_js_la_DEPENDENCIES = @EFL_JS_INTERNAL_LIBS@
192lib_efl_js_libefl_js_la_LIBTOOLFLAGS = --tag=disable-static 193bindings_js_efl_js_libefl_js_la_LIBTOOLFLAGS = --tag=disable-static
193lib_efl_js_libefl_js_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 194bindings_js_efl_js_libefl_js_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
194
195if HAVE_NODEJS
196lib_efl_js_libefl_node_js_la_SOURCES = \
197bindings/js/efl_js/efl_js.cc
198
199lib_efl_js_libefl_node_js_la_CPPFLAGS = $(lib_efl_js_libefl_js_la_CPPFLAGS)
200lib_efl_js_libefl_node_js_la_LIBADD = @USE_EFL_JS_LIBS@
201lib_efl_js_libefl_node_js_la_DEPENDENCIES = @USE_EFL_JS_INTERNAL_LIBS@
202lib_efl_js_libefl_node_js_la_LIBTOOLFLAGS = --tag=disable-static
203lib_efl_js_libefl_node_js_la_LDFLAGS =
204else
205lib_efl_js_libefl_js_la_SOURCES += \
206bindings/js/efl_js/efl_js.cc
207endif
208 195
209if EFL_ENABLE_TESTS 196if EFL_ENABLE_TESTS
210 197
@@ -236,11 +223,11 @@ tests/efl_js/benchmark_js_suite.js
236 223
237check_LTLIBRARIES += tests/efl_js/libbenchmark_object.la 224check_LTLIBRARIES += tests/efl_js/libbenchmark_object.la
238 225
239tests/efl_js/eina_js_suite.js tests/efl_js/eina_js_containers_suite.js tests/efl_js/ecore_js_suite.js tests/efl_js/eldbus_js_suite.js tests/efl_js/eio_js_suite.js tests/efl_js/ethumb_js_suite.js: $(top_builddir)/src/lib/efl_js/efl.node 226tests/efl_js/eina_js_suite.js tests/efl_js/eina_js_containers_suite.js tests/efl_js/ecore_js_suite.js tests/efl_js/eldbus_js_suite.js tests/efl_js/eio_js_suite.js tests/efl_js/ethumb_js_suite.js:bin/efl_js/efl.node
240 227
241tests/efl_js/benchmark_object.node: tests/efl_js/libbenchmark_object.la 228tests/efl_js/benchmark_object.node: tests/efl_js/libbenchmark_object.la
242 $(AM_V_CP)$(CP) $(top_builddir)/src/tests/efl_js/.libs/libbenchmark_object.so $(top_builddir)/src/tests/efl_js/benchmark_object.node 229 $(AM_V_CP)$(CP) $(top_builddir)/src/tests/efl_js/.libs/libbenchmark_object.so $(top_builddir)/src/tests/efl_js/benchmark_object.node
243tests/efl_js/benchmark_js_suite.js: $(top_builddir)/src/lib/efl_js/efl.node tests/efl_js/benchmark_object.node 230tests/efl_js/benchmark_js_suite.js: bin/efl_js/efl.node tests/efl_js/benchmark_object.node
244 231
245tests_efl_js_libbenchmark_object_la_SOURCES = tests/efl_js/benchmark_object_impl.cc 232tests_efl_js_libbenchmark_object_la_SOURCES = tests/efl_js/benchmark_object_impl.cc
246tests_efl_js_libbenchmark_object_la_CPPFLAGS = \ 233tests_efl_js_libbenchmark_object_la_CPPFLAGS = \
@@ -258,9 +245,9 @@ tests_efl_js_libbenchmark_object_la_CPPFLAGS = \
258@EOLIAN_CFLAGS@ @EINA_CFLAGS@ @EO_CFLAGS@ @ECORE_CFLAGS@ @EINA_CXX_CFLAGS@ \ 245@EOLIAN_CFLAGS@ @EINA_CFLAGS@ @EO_CFLAGS@ @ECORE_CFLAGS@ @EINA_CXX_CFLAGS@ \
259@EO_JS_CFLAGS@ @EO_CXX_CFLAGS@ 246@EO_JS_CFLAGS@ @EO_CXX_CFLAGS@
260tests_efl_js_libbenchmark_object_la_LIBADD = \ 247tests_efl_js_libbenchmark_object_la_LIBADD = \
261@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EFL_JS_LIBS@ 248@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ bindings/js/efl_js/libefl_js.la
262tests_efl_js_libbenchmark_object_la_LDFLAGS = -rpath $(abs_top_builddir)/tests/efl_js @EFL_LTLIBRARY_FLAGS@ 249tests_efl_js_libbenchmark_object_la_LDFLAGS = -rpath $(abs_top_builddir)/tests/efl_js @EFL_LTLIBRARY_FLAGS@
263tests_efl_js_libbenchmark_object_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ @USE_EFL_JS_INTERNAL_LIBS@ 250tests_efl_js_libbenchmark_object_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
264tests_efl_js_libbenchmark_object_la_LIBTOOLFLAGS = --tag=disable-static 251tests_efl_js_libbenchmark_object_la_LIBTOOLFLAGS = --tag=disable-static
265 252
266tests/efl_js/tests_efl_js_libbenchmark_object_la-benchmark_object_impl.l$(OBJEXT): tests/efl_js/benchmark_object.eo.js.cc tests/efl_js/benchmark_object.eo.c tests/efl_js/benchmark_object.eo.h 253tests/efl_js/tests_efl_js_libbenchmark_object_la-benchmark_object_impl.l$(OBJEXT): tests/efl_js/benchmark_object.eo.js.cc tests/efl_js/benchmark_object.eo.c tests/efl_js/benchmark_object.eo.h
@@ -285,56 +272,56 @@ tests/efl_js/eina_js_suite.cc
285 272
286tests_efl_js_eina_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS) 273tests_efl_js_eina_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
287tests_efl_js_eina_js_suite_LDADD = \ 274tests_efl_js_eina_js_suite_LDADD = \
288@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EFL_JS_LIBS@ 275@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
289tests_efl_js_eina_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ @USE_EFL_JS_INTERNAL_LIBS@ 276tests_efl_js_eina_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
290 277
291tests_efl_js_eina_js_containers_suite_SOURCES = \ 278tests_efl_js_eina_js_containers_suite_SOURCES = \
292tests/efl_js/eina_js_containers_suite.cc 279tests/efl_js/eina_js_containers_suite.cc
293 280
294tests_efl_js_eina_js_containers_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS) 281tests_efl_js_eina_js_containers_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
295tests_efl_js_eina_js_containers_suite_LDADD = \ 282tests_efl_js_eina_js_containers_suite_LDADD = \
296@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EFL_JS_LIBS@ 283@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
297tests_efl_js_eina_js_containers_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ @USE_EFL_JS_INTERNAL_LIBS@ 284tests_efl_js_eina_js_containers_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
298 285
299tests_efl_js_ecore_js_suite_SOURCES = \ 286tests_efl_js_ecore_js_suite_SOURCES = \
300tests/efl_js/ecore_js_suite.cc 287tests/efl_js/ecore_js_suite.cc
301 288
302tests_efl_js_ecore_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS) 289tests_efl_js_ecore_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
303tests_efl_js_ecore_js_suite_LDADD = \ 290tests_efl_js_ecore_js_suite_LDADD = \
304@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EFL_JS_LIBS@ 291@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
305tests_efl_js_ecore_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ @USE_EFL_JS_INTERNAL_LIBS@ 292tests_efl_js_ecore_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
306 293
307tests_efl_js_eldbus_js_suite_SOURCES = \ 294tests_efl_js_eldbus_js_suite_SOURCES = \
308tests/efl_js/eldbus_js_suite.cc 295tests/efl_js/eldbus_js_suite.cc
309 296
310tests_efl_js_eldbus_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS) 297tests_efl_js_eldbus_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
311tests_efl_js_eldbus_js_suite_LDADD = \ 298tests_efl_js_eldbus_js_suite_LDADD = \
312@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EFL_JS_LIBS@ 299@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
313tests_efl_js_eldbus_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ @USE_EFL_JS_INTERNAL_LIBS@ 300tests_efl_js_eldbus_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
314 301
315tests_efl_js_ethumb_js_suite_SOURCES = \ 302tests_efl_js_ethumb_js_suite_SOURCES = \
316tests/efl_js/ethumb_js_suite.cc 303tests/efl_js/ethumb_js_suite.cc
317 304
318tests_efl_js_ethumb_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS) 305tests_efl_js_ethumb_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
319tests_efl_js_ethumb_js_suite_LDADD = \ 306tests_efl_js_ethumb_js_suite_LDADD = \
320@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EFL_JS_LIBS@ 307@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
321tests_efl_js_ethumb_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ @USE_EFL_JS_INTERNAL_LIBS@ 308tests_efl_js_ethumb_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
322 309
323tests_efl_js_eio_js_suite_SOURCES = \ 310tests_efl_js_eio_js_suite_SOURCES = \
324tests/efl_js/eio_js_suite.cc 311tests/efl_js/eio_js_suite.cc
325 312
326tests_efl_js_eio_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS) 313tests_efl_js_eio_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
327tests_efl_js_eio_js_suite_LDADD = \ 314tests_efl_js_eio_js_suite_LDADD = \
328@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EFL_JS_LIBS@ 315@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@
329tests_efl_js_eio_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ @USE_EFL_JS_INTERNAL_LIBS@ 316tests_efl_js_eio_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
330 317
331tests_efl_js_benchmark_js_suite_SOURCES = \ 318tests_efl_js_benchmark_js_suite_SOURCES = \
332tests/efl_js/benchmark_js_suite.cc 319tests/efl_js/benchmark_js_suite.cc
333 320
334tests_efl_js_benchmark_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS) 321tests_efl_js_benchmark_js_suite_CPPFLAGS = $(SUITE_RUNNER_CPPFLAGS)
335tests_efl_js_benchmark_js_suite_LDADD = \ 322tests_efl_js_benchmark_js_suite_LDADD = \
336@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EFL_JS_LIBS@ 323@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ bindings/js/efl_js/libefl_js.la
337tests_efl_js_benchmark_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ @USE_EFL_JS_INTERNAL_LIBS@ 324tests_efl_js_benchmark_js_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
338endif 325endif
339endif 326endif
340 327
diff --git a/src/Makefile_Eolian_Js.am b/src/Makefile_Eolian_Js.am
index 8f6ba5c..9752027 100644
--- a/src/Makefile_Eolian_Js.am
+++ b/src/Makefile_Eolian_Js.am
@@ -54,11 +54,11 @@ tests_eolian_js_libeolian_js_suite_la_CPPFLAGS = \
54@EOLIAN_CFLAGS@ @EINA_CFLAGS@ @EO_CFLAGS@ @ECORE_CFLAGS@ @EINA_CXX_CFLAGS@ \ 54@EOLIAN_CFLAGS@ @EINA_CFLAGS@ @EO_CFLAGS@ @ECORE_CFLAGS@ @EINA_CXX_CFLAGS@ \
55@EO_JS_CFLAGS@ @EO_CXX_CFLAGS@ @ECORE_CXX_CFLAGS@ 55@EO_JS_CFLAGS@ @EO_CXX_CFLAGS@ @ECORE_CXX_CFLAGS@
56tests_eolian_js_libeolian_js_suite_la_LIBADD = \ 56tests_eolian_js_libeolian_js_suite_la_LIBADD = \
57@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EFL_JS_LIBS@ 57HECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ bindings/js/efl_js/libefl_js.la
58tests_eolian_js_libeolian_js_suite_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ @USE_EFL_JS_INTERNAL_LIBS@ 58tests_eolian_js_libeolian_js_suite_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
59tests_eolian_js_libeolian_js_suite_la_CFLAGS = $(tests_eolian_js_libeolian_js_suite_la_CXXFLAGS) 59tests_eolian_js_libeolian_js_suite_la_CFLAGS = $(tests_eolian_js_libeolian_js_suite_la_CXXFLAGS)
60tests_eolian_js_libeolian_js_suite_la_LIBTOOLFLAGS = --tag=disable-static 60tests_eolian_js_libeolian_js_suite_la_LIBTOOLFLAGS = --tag=disable-static
61tests_eolian_js_libeolian_js_suite_la_LDFLAGS = -rpath $(abs_top_builddir)/tests/eolian_js @EFL_LTLIBRARY_FLAGS@ 61tests_eolian_js_libeolian_js_suite_la_LDFLAGS = -rpath $(abs_top_builddir)/src/tests/eolian_js -rpath $(abs_top_builddir)/src/bin/efl_js @EFL_LTLIBRARY_FLAGS@
62 62
63# if compiler_o_lo == yes, lo, otherwise $(OBJEXT) 63# if compiler_o_lo == yes, lo, otherwise $(OBJEXT)
64 64
@@ -112,8 +112,8 @@ tests_eolian_js_eolian_js_suite_CPPFLAGS = \
112@EO_JS_CFLAGS@ @EO_CXX_CFLAGS@ @EFL_JS_CFLAGS@ @ECORE_CXX_CFLAGS@ 112@EO_JS_CFLAGS@ @EO_CXX_CFLAGS@ @EFL_JS_CFLAGS@ @ECORE_CXX_CFLAGS@
113 113
114tests_eolian_js_eolian_js_suite_LDADD = \ 114tests_eolian_js_eolian_js_suite_LDADD = \
115@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EFL_JS_LIBS@ @USE_EVAS_LIBS@ @USE_EFL_JS_LIBS@ 115@CHECK_LIBS@ @USE_EO_LIBS@ @USE_EINA_LIBS@ @USE_EOLIAN_LIBS@ @USE_EVAS_LIBS@ bin/efl_js/efl.node
116tests_eolian_js_eolian_js_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@ @USE_EFL_JS_INTERNAL_LIBS@ @USE_EVAS_INTERNAL_LIBS@ @USE_EFL_JS_INTERNAL_LIBS@ 116tests_eolian_js_eolian_js_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@ @USE_EVAS_INTERNAL_LIBS@
117endif 117endif
118endif 118endif
119 119
diff --git a/src/bindings/js/efl_js/efl_js.cc b/src/bindings/js/efl_js/efl_js.cc
index d64546a..0976b4c 100644
--- a/src/bindings/js/efl_js/efl_js.cc
+++ b/src/bindings/js/efl_js/efl_js.cc
@@ -42,7 +42,7 @@ EAPI void eina_value_register(v8::Handle<v8::Object>, v8::Isolate* isolate);
42EAPI void register_ecore_mainloop(v8::Handle<v8::Object> global, v8::Isolate* isolate); 42EAPI void register_ecore_mainloop(v8::Handle<v8::Object> global, v8::Isolate* isolate);
43 43
44namespace ecore { 44namespace ecore {
45EAPI void register_exe(v8::Handle<v8::Object> global, v8::Isolate* isolate); 45 //EAPI void register_exe(v8::Handle<v8::Object> global, v8::Isolate* isolate);
46EAPI void register_idler(v8::Handle<v8::Object> global, v8::Isolate* isolate); 46EAPI void register_idler(v8::Handle<v8::Object> global, v8::Isolate* isolate);
47EAPI void register_ecore(v8::Isolate* isolate, v8::Handle<v8::Object> exports); 47EAPI void register_ecore(v8::Isolate* isolate, v8::Handle<v8::Object> exports);
48namespace idle { 48namespace idle {
@@ -50,7 +50,7 @@ EAPI void register_enterer(v8::Handle<v8::Object> global, v8::Isolate* isolate);
50EAPI void register_exiter(v8::Handle<v8::Object> global, v8::Isolate* isolate); 50EAPI void register_exiter(v8::Handle<v8::Object> global, v8::Isolate* isolate);
51} 51}
52EAPI void register_job(v8::Handle<v8::Object> global, v8::Isolate* isolate); 52EAPI void register_job(v8::Handle<v8::Object> global, v8::Isolate* isolate);
53EAPI void register_parent(v8::Handle<v8::Object> global, v8::Isolate* isolate); 53 //EAPI void register_parent(v8::Handle<v8::Object> global, v8::Isolate* isolate);
54EAPI void register_poller(v8::Handle<v8::Object> global, v8::Isolate* isolate); 54EAPI void register_poller(v8::Handle<v8::Object> global, v8::Isolate* isolate);
55EAPI void register_timer(v8::Handle<v8::Object> global, v8::Isolate* isolate); 55EAPI void register_timer(v8::Handle<v8::Object> global, v8::Isolate* isolate);
56} 56}
@@ -281,12 +281,12 @@ EAPI void init(v8::Handle<v8::Object> exports)
281 efl::eio::js::register_eio(v8::Isolate::GetCurrent(), exports); 281 efl::eio::js::register_eio(v8::Isolate::GetCurrent(), exports);
282 efl::eldbus::js::register_eldbus(v8::Isolate::GetCurrent(), exports); 282 efl::eldbus::js::register_eldbus(v8::Isolate::GetCurrent(), exports);
283 efl::ethumb::js::register_ethumb(v8::Isolate::GetCurrent(), exports); 283 efl::ethumb::js::register_ethumb(v8::Isolate::GetCurrent(), exports);
284 ecore::register_exe(exports, v8::Isolate::GetCurrent()); 284 //ecore::register_exe(exports, v8::Isolate::GetCurrent());
285 // ecore::register_idler(exports, v8::Isolate::GetCurrent()); 285 // ecore::register_idler(exports, v8::Isolate::GetCurrent());
286 // ecore::idle::register_enterer(exports, v8::Isolate::GetCurrent()); 286 // ecore::idle::register_enterer(exports, v8::Isolate::GetCurrent());
287 // ecore::idle::register_exiter(exports, v8::Isolate::GetCurrent()); 287 // ecore::idle::register_exiter(exports, v8::Isolate::GetCurrent());
288 // ecore::register_job(exports, v8::Isolate::GetCurrent()); 288 // ecore::register_job(exports, v8::Isolate::GetCurrent());
289 ecore::register_parent(exports, v8::Isolate::GetCurrent()); 289 //ecore::register_parent(exports, v8::Isolate::GetCurrent());
290 // ecore::register_poller(exports, v8::Isolate::GetCurrent()); 290 // ecore::register_poller(exports, v8::Isolate::GetCurrent());
291 // ecore::register_timer(exports, v8::Isolate::GetCurrent()); 291 // ecore::register_timer(exports, v8::Isolate::GetCurrent());
292 // efl::network::register_base(exports, v8::Isolate::GetCurrent()); 292 // efl::network::register_base(exports, v8::Isolate::GetCurrent());
diff --git a/src/tests/eolian_js/eolian_js_suite.js b/src/tests/eolian_js/eolian_js_suite.js
index 2c45eb3..34967ef 100755
--- a/src/tests/eolian_js/eolian_js_suite.js
+++ b/src/tests/eolian_js/eolian_js_suite.js
@@ -12,11 +12,12 @@ if(typeof process !== 'undefined')
12{ 12{
13 console.log('running from nodejs'); 13 console.log('running from nodejs');
14 console.log('path', process.env.NODE_PATH); 14 console.log('path', process.env.NODE_PATH);
15 console.log("teste1");
16 15
17 efl = require('efl'); 16 efl = require('efl');
18 assert(efl != null, "could not load efl node module"); 17 assert(efl != null, "could not load efl node module");
19 18
19 console.log('efl.node loaded')
20
20 // Setup output aliases 21 // Setup output aliases
21 print = console.log; 22 print = console.log;
22 printError = function() { 23 printError = function() {