jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2b8912462e0ec81efb8e30a63383b811f52e16f5
commit 2b8912462e0ec81efb8e30a63383b811f52e16f5 Author: Jean-Philippe Andre <[email protected]> Date: Thu Jun 23 17:46:35 2016 +0900 evas: Fix distcheck by disabling shaders generation make distcheck is verified by checking the env var "top_distdir" This is not a great solution but should work. --- src/modules/evas/engines/gl_common/shader/gen_shaders.sh | 7 +++++++ src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/src/modules/evas/engines/gl_common/shader/gen_shaders.sh b/src/modules/evas/engines/gl_common/shader/gen_shaders.sh index 8861d95..c96f62e 100755 --- a/src/modules/evas/engines/gl_common/shader/gen_shaders.sh +++ b/src/modules/evas/engines/gl_common/shader/gen_shaders.sh @@ -3,9 +3,16 @@ # This script will generate a C file containing all the shaders used by Evas DIR=`dirname $0` +cd $DIR/../../../../../ OUTPUT="$DIR/evas_gl_shaders.x" +# Skip generation during make distcheck +if [ "${top_distdir}" != "" ] ; then exit 0; fi + +# Skip generation if file can not be written to +if [ ! -w ${OUTPUT} ] ; then exit 0; fi + # Skip generation if there is no diff (or no git) if ! git rev-parse 2>> /dev/null >> /dev/null ; then exit 0 ; fi if git diff --quiet --exit-code -- "$DIR" diff --git a/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh b/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh index c92a239..529959d 100755 --- a/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh +++ b/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh @@ -7,6 +7,12 @@ cd $DIR/../../../../../ OUTPUT="$DIR/evas_gl_3d_shaders.x" +# Skip generation during make distcheck +if [ "${top_distdir}" != "" ] ; then exit 0; fi + +# Skip generation if file can not be written to +if [ ! -w ${OUTPUT} ] ; then exit 0; fi + # Skip generation if there is no diff (or no git) if ! git rev-parse 2>> /dev/null >> /dev/null ; then exit 0 ; fi if git diff --quiet --exit-code -- "$DIR" --
