summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <[email protected]>2019-07-24 14:32:11 +0200
committerraveit65 <[email protected]>2019-07-26 20:39:15 +0200
commit7d829463ac765dd4fba89dfac9207b10835a4f7e (patch)
treec7c9b63fb1ab6cd6797ae592b67c6b237aa27ced
parent85fb53cfe26d71ec456689f6d1fcf5207d9dbb1d (diff)
downloadcaja-7d829463ac765dd4fba89dfac9207b10835a4f7e.tar.bz2
caja-7d829463ac765dd4fba89dfac9207b10835a4f7e.tar.xz
gla11y: use version 0.3 which already defaults to using python3
-rw-r--r--.travis.yml2
-rw-r--r--gla11y.mk4
2 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 9962d98f..f87b3b33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -185,7 +185,7 @@ before_scripts:
- egrep -lRZ 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' . | xargs -0 -l sed -i -e 's/G_GNUC_BEGIN_IGNORE_DEPRECATIONS/ /g'
- egrep -lRZ 'G_GNUC_END_IGNORE_DEPRECATIONS' . | xargs -0 -l sed -i -e 's/G_GNUC_END_IGNORE_DEPRECATIONS/ /g'
- fi
- - curl -Ls -o /usr/bin/gla11y https://github.com/hypra/gla11y/raw/v0.2/gla11y
+ - curl -Ls -o /usr/bin/gla11y https://github.com/hypra/gla11y/raw/v0.3/gla11y
- chmod +x /usr/bin/gla11y
build_scripts:
diff --git a/gla11y.mk b/gla11y.mk
index 4194a9d8..81ee5454 100644
--- a/gla11y.mk
+++ b/gla11y.mk
@@ -10,9 +10,7 @@ a11y_verbose_1 =
all-local: $(GLA11Y_OUTPUT)
$(GLA11Y_OUTPUT): $(ui_files)
- $(a11y_verbose) if [[ $(GLA11Y) == *gla11y ]]; then \
- python3 $(GLA11Y) -P $(srcdir)/ -f $(srcdir)/$(GLA11Y_FALSE) -s $(srcdir)/$(GLA11Y_SUPPR) -o $@ $(ui_files:%=$(srcdir)/%); \
- fi
+ $(a11y_verbose) $(GLA11Y) -P $(srcdir)/ -f $(srcdir)/$(GLA11Y_FALSE) -s $(srcdir)/$(GLA11Y_SUPPR) -o $@ $(ui_files:%=$(srcdir)/%)
clean-local: clean-local-check
clean-local-check: