diff --git a/legacy/ephysics/.gitignore b/legacy/ephysics/.gitignore index 18cfac5af4..b172a29e8e 100644 --- a/legacy/ephysics/.gitignore +++ b/legacy/ephysics/.gitignore @@ -34,11 +34,7 @@ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obsolete.m4 -data/themes/ephysics_test.edj -data/themes/ephysics_sandbox.edj -src/bin/ephysics_test src/bin/ephysics_logo -src/bin/ephysics_sandbox doc/html/ doc/latex/ doc/man/ diff --git a/legacy/ephysics/Makefile.am b/legacy/ephysics/Makefile.am index 8fac0f3ee8..a0807e3113 100644 --- a/legacy/ephysics/Makefile.am +++ b/legacy/ephysics/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 if !BUILD_DOCS_ONLY -SUBDIRS = src doc data +SUBDIRS = src doc MAINTAINERCLEANFILES = \ Makefile.in \ @@ -30,7 +30,6 @@ bin_SCRIPTS = EXTRA_DIST = \ AUTHORS \ COPYING \ -COPYING_ARTS \ autogen.sh \ ephysics.pc.in \ ephysics.spec \ diff --git a/legacy/ephysics/README b/legacy/ephysics/README index e8e68c2554..ea32520530 100644 --- a/legacy/ephysics/README +++ b/legacy/ephysics/README @@ -16,8 +16,6 @@ Must: ecore-evas (at least 1.2.99) evas (at least 1.2.99) bullet (at least 2.79) -Optional: - elementary (at least 1.0.99, required to build ephysics_test) EPhysics is a library that manages Ecore, Evas and Bullet Physics into an easy to use way. It's a kind of wrapper, a glue, between these libraries. @@ -35,35 +33,18 @@ COMPILING AND INSTALLING: (as root unless you are installing in your users directories): $ make install -If elementary is installed, it will build and install a test application as -well, that showcases EPhysics capabilites. Run - - $ ephysics_test - -to see these examples. - ------------------------------------------------------------------------------ TESTS -Tests require elementary to be build. +There are a project with many tests for ephysics, including a logo example, +and a sandbox util. -List of test applications: - * ephysics_test => List with many tests to exemplify specific features - * ephysics_logo => Example of logo / loading screen made using ephysics - * ephysics_sandbox => Application to set many different properties to bodies - and see they interacting. +It's called ephysics_test, and may be found at: -ephysics_test supports to launch a specified test on command line, like +http://svn.enlightenment.org/svn/e/trunk/ephysics_tests - $ ephysics_test "Jumping Balls" - -Also, it can run only the test, avoiding the main menu, with parameter ---test-win-only or -to (it must to be passed before the test name): - - $ ephysics_test -to Camera - -The other programs don't accept parameters. +Tests require the library Elementary to be build. ------------------------------------------------------------------------------ diff --git a/legacy/ephysics/configure.ac b/legacy/ephysics/configure.ac index a4af83ccd5..a417a1f4c5 100644 --- a/legacy/ephysics/configure.ac +++ b/legacy/ephysics/configure.ac @@ -134,7 +134,7 @@ AC_SUBST(EFL_EPHYSICS_BUILD) build_docs_only="no" AC_ARG_ENABLE([build-docs-only], AC_HELP_STRING([--enable-build-docs-only], - [Doesn't build library or tests, just build docs. @<:@default==disabled@:>@]), + [Doesn't build library, just build docs. @<:@default==disabled@:>@]), [ if test "x${enableval}" = "xyes" ; then build_docs_only="yes" @@ -188,54 +188,16 @@ case "$host_os" in esac AC_SUBST(lt_enable_auto_import) -## Tests - disable by default. With edje requiring ephysics and tests requiring -## edje we are in circular dependency hell here. -build_tests="no" -if test "x${build_docs_only}" = "xno" ; then -PKG_CHECK_MODULES([ELEMENTARY], [elementary >= 1.7.99], [req_tests="yes"], [req_tests="no"]) -AC_ARG_ENABLE([build-tests], - AC_HELP_STRING([--enable-build-tests], - [Enable building tests. It is not built if the - required dependencies are not present. @<:@default==disabled@:>@]), - [ - if test "x${enableval}" = "xyes" ; then - if test "x${req_tests}" = "xyes" ; then - build_tests="yes" - requirement_ephysics="elementary >= 1.7.99 ${requirement_ephysics}" - fi - fi - ], - []) -else - build_tests="no" -fi -AM_CONDITIONAL([BUILD_TESTS], [test "x${build_tests}" = "xyes"]) - -if test "x${build_tests}" = "xyes" && test "x${build_docs_only}" = "xno" ; then -PKG_CHECK_MODULES([EPHYSICS_TEST], - [ - eina >= 1.2.99 - evas >= 1.7.99 - ecore >= 1.2.99 - elementary >= 1.0.99 - bullet >= 2.80 - ]) -fi - AC_SUBST(requirement_ephysics) AC_OUTPUT([ ephysics.pc ephysics.spec Makefile -data/Makefile -data/logo_images/Makefile -data/themes/Makefile doc/Makefile doc/Doxyfile src/Makefile src/lib/Makefile -src/bin/Makefile ]) @@ -252,7 +214,6 @@ echo echo "Configuration Options Summary:" echo echo " Documentation........: ${build_doc} | docs-only: ${build_docs_only}" -echo " Tests................: ${build_tests}" echo echo "Compilation............: make (or gmake)" echo " CPPFLAGS.............: $CPPFLAGS" diff --git a/legacy/ephysics/src/Makefile.am b/legacy/ephysics/src/Makefile.am index a8590b2f0d..2433e6cc47 100644 --- a/legacy/ephysics/src/Makefile.am +++ b/legacy/ephysics/src/Makefile.am @@ -1,3 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = lib bin +SUBDIRS = lib