mirror of
https://github.com/ankitects/anki.git
synced 2025-09-24 08:46:37 -04:00
Merge pull request #460 from evandroforks/add_missing_set-e
Fixed build-mo-files not stopping on build errors
This commit is contained in:
commit
72b5d9fa4d
8 changed files with 14 additions and 12 deletions
2
.github/scripts/contrib.sh
vendored
2
.github/scripts/contrib.sh
vendored
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
set -eo pipefail
|
||||
|
||||
antispam=", at the domain "
|
||||
|
||||
|
|
10
Makefile
10
Makefile
|
@ -34,7 +34,7 @@ buildhash:
|
|||
|
||||
.PHONY: develop
|
||||
develop: pyenv buildhash
|
||||
@set -e && \
|
||||
@set -eo pipefail && \
|
||||
. pyenv/bin/activate && \
|
||||
for dir in $(DEVEL); do \
|
||||
$(SUBMAKE) -C $$dir develop BUILDFLAGS="$(BUILDFLAGS)"; \
|
||||
|
@ -42,7 +42,7 @@ develop: pyenv buildhash
|
|||
|
||||
.PHONY: run
|
||||
run: develop
|
||||
@set -e && \
|
||||
@set -eo pipefail && \
|
||||
. pyenv/bin/activate && \
|
||||
echo "Starting Anki..."; \
|
||||
qt/runanki $(RUNFLAGS)
|
||||
|
@ -69,7 +69,7 @@ build-qt:
|
|||
|
||||
.PHONY: clean
|
||||
clean: clean-dist
|
||||
@set -e && \
|
||||
@set -eo pipefail && \
|
||||
for dir in $(DEVEL); do \
|
||||
$(SUBMAKE) -C $$dir clean; \
|
||||
done
|
||||
|
@ -80,7 +80,7 @@ clean-dist:
|
|||
|
||||
.PHONY: check
|
||||
check: pyenv buildhash
|
||||
@set -e && \
|
||||
@set -eo pipefail && \
|
||||
for dir in $(CHECKABLE_RS); do \
|
||||
$(SUBMAKE) -C $$dir check; \
|
||||
done; \
|
||||
|
@ -95,7 +95,7 @@ check: pyenv buildhash
|
|||
|
||||
.PHONY: fix
|
||||
fix:
|
||||
@set -e && \
|
||||
@set -eo pipefail && \
|
||||
. pyenv/bin/activate && \
|
||||
for dir in $(CHECKABLE_RS) $(CHECKABLE_PY); do \
|
||||
$(SUBMAKE) -C $$dir fix; \
|
||||
|
|
|
@ -104,7 +104,7 @@ You can do this automatically by adding the following into
|
|||
.git/hooks/pre-commit or .git/hooks/pre-push and making it executable.
|
||||
|
||||
#!/bin/bash
|
||||
set -e
|
||||
set -eo pipefail
|
||||
make check
|
||||
|
||||
You may need to adjust the PATH variable so that things like a local install
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#
|
||||
# build mo files
|
||||
#
|
||||
set -eo pipefail
|
||||
|
||||
targetDir="../aqt_data/locale/gettext"
|
||||
mkdir -p $targetDir
|
||||
|
@ -9,9 +10,9 @@ mkdir -p $targetDir
|
|||
echo "Compiling *.po..."
|
||||
for file in po/desktop/*/anki.po
|
||||
do
|
||||
outdir=$(echo $file | \
|
||||
outdir=$(echo "$file" | \
|
||||
perl -pe "s%po/desktop/(.*)/anki.po%$targetDir/\1/LC_MESSAGES%")
|
||||
outfile="$outdir/anki.mo"
|
||||
mkdir -p $outdir
|
||||
msgmerge --for-msgfmt $file po/desktop/anki.pot | msgfmt - --output-file=$outfile
|
||||
msgmerge --for-msgfmt "$file" po/desktop/anki.pot | msgfmt - --output-file="$outfile"
|
||||
done
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
set -eo pipefail
|
||||
|
||||
out=../aqt_data/locale/qt
|
||||
mkdir -p $out
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
#!/bin/bash
|
||||
set -eo pipefail
|
||||
|
||||
# pull any pending changes from git repos
|
||||
./pull-git
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#
|
||||
# update template .pot file from source code strings
|
||||
#
|
||||
|
||||
set -eo pipefail
|
||||
|
||||
topDir=$(dirname $0)/../..
|
||||
cd $topDir
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# should be on the path.
|
||||
#
|
||||
|
||||
set -e
|
||||
set -eo pipefail
|
||||
|
||||
if [ ! -d "designer" ]
|
||||
then
|
||||
|
|
Loading…
Reference in a new issue