Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>2009-09-16 02:34:10 +0400
committerGuillermo S. Romero <gsr.b3d@infernal-iceberg.com>2009-09-16 02:34:10 +0400
commit581cb64f2ccdd49790fe06834d95e08f92c7308f (patch)
tree7c43ab977b2e69ced7deefbf87ed9f3beba31212
parent063d806f152e003b662a0e22a19c27a4afbfb7fa (diff)
Make verification of committed .mo files optional.
-rw-r--r--po/Makefile2
-rw-r--r--source/nan_definitions.mk6
2 files changed, 8 insertions, 0 deletions
diff --git a/po/Makefile b/po/Makefile
index 425efbc08b3..b656a00fb38 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -50,9 +50,11 @@ LINGUAS_DEST= $(foreach LINGUA, $(LINGUAS),$(DIR)$(LINGUA)/LC_MESSAGES/blender.m
$(DIR)%/LC_MESSAGES/blender.mo: %.po
mkdir -p $(@D)
msgfmt -o $@ $<
+ifeq ($(BF_VERIFY_MO_FILES), true)
@cmp $@ $(NANBLENDERHOME)/bin/.blender/locale/$(basename $<)/LC_MESSAGES/blender.mo \
|| ( echo Mismatch between generated and commited $(basename $<).mo catalog && \
rm -f $@ && false )
+endif
all debug:: $(LINGUAS_DEST)
# Just trigger the deps
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 8c47bcf11c1..6d4a7139d5b 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -143,6 +143,9 @@ ifndef CONFIG_GUESS
export NAN_FFMPEGCFLAGS = $(shell pkg-config --cflags libavcodec libavdevice libavformat libswscale libavutil)
endif
+ # Compare recreated .mo files with committed ones
+ export BF_VERIFY_MO_FILES ?= true
+
# Platform Dependent settings go below:
ifeq ($(OS),darwin)
@@ -309,6 +312,9 @@ ifndef CONFIG_GUESS
# enable l10n
export INTERNATIONAL ?= true
+ # Different endianess will make it fail, rely on other plataforms for checks
+ export BF_VERIFY_MO_FILES = false
+
else
ifeq ($(OS),linux)