Build: move translations from install/po/ to top-level po/

Translations are need for client as well. This move is done to remove
dependency between client and install subdirectories.

https://fedorahosted.org/freeipa/ticket/6418

Reviewed-By: Lukas Slebodnik <lslebodn@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Petr Spacek authored and David Kupka committed 2016-10-24 13:30:12 +02:00
1 parent 927ddcb95a
commit 0d37619db4
31 files changed
+14 -15

No files matched your search

+2 -2
View File
@@ -53,8 +53,8 @@ freeipa2-dev-doc
/daemons/ipa-version.h
/daemons/test-driver
/install/po/test.po
/install/po/test_locale/xh_ZA/LC_MESSAGES/ipa.mo
/po/test.po
/po/test_locale/xh_ZA/LC_MESSAGES/ipa.mo
!/install/ui/doc/Makefile.in
/install/ui/release
/install/ui/css/ipa.css
+2 -2
View File
@@ -113,7 +113,7 @@ client-install: client client-dirs
@for subdir in $(CLIENTDIRS); do \
(cd $$subdir && $(MAKE) install) || exit 1; \
done
cd install/po && $(MAKE) install || exit 1;
cd po && $(MAKE) install || exit 1;
@for subdir in $(CLIENTPYDIRS); do \
if [ "$(DESTDIR)" = "" ]; then \
(cd $$subdir && $(PYTHON) setup.py install); \
@@ -146,7 +146,7 @@ pylint: bootstrap-autogen
PYTHONPATH=. pylint --rcfile=pylintrc $(PYLINTFLAGS) $$FILES || $(LINT_IGNORE_FAIL)
po-validate:
$(MAKE) -C install/po validate-src-strings || $(LINT_IGNORE_FAIL)
$(MAKE) -C po validate-src-strings || $(LINT_IGNORE_FAIL)
jslint:
cd install/ui; jsl -nologo -nosummary -nofilelisting -conf jsl.conf || $(LINT_IGNORE_FAIL)
+1 -1
View File
@@ -368,11 +368,11 @@ AC_CONFIG_FILES([
install/tools/Makefile
install/tools/man/Makefile
install/updates/Makefile
install/po/Makefile
install/restart_scripts/Makefile
install/wsgi/Makefile
install/oddjob/Makefile
ipatests/man/Makefile
po/Makefile
util/Makefile
])
-1
View File
@@ -13,7 +13,6 @@ SUBDIRS = \
ui \
tools \
updates \
po \
restart_scripts \
wsgi \
oddjob \
+1 -1
View File
@@ -22,7 +22,7 @@
from __future__ import print_function
# WARNING: Do not import ipa modules, this is also used as a
# stand-alone script (invoked from install/po Makefile).
# stand-alone script (invoked from po Makefile).
import optparse
import sys
import gettext
View File
File renamed without changes.
+8 -8
View File
@@ -16,7 +16,7 @@ MSGMERGE = @MSGMERGE@
MSGCMP = @MSGCMP@
MSGATTRIB = @MSGATTRIB@
TX = @TX@
IPA_TEST_I18N = ../../ipatests/i18n.py
IPA_TEST_I18N = ../ipatests/i18n.py
DOMAIN = @GETTEXT_DOMAIN@
MSGMERGE_UPDATE = $(MSGMERGE) --update
@@ -36,9 +36,9 @@ po_files = $(patsubst %, %.po, $(languages))
mo_files = $(patsubst %.po, %.mo, $(po_files))
po_count=$(words $(po_files))
PY_FILES = $(shell cd ../..; git ls-files | grep -v -e "^ipatests/" -e "^doc/" -e "^install/po/" -e "^ipapython/test/" -e "setup.py" | grep "\.py$$" | tr '\n' ' '; cd install/po)
C_FILES = $(shell cd ../..; git ls-files | grep "\.c$$" | tr '\n' ' '; cd install/po)
H_FILES = $(shell cd ../..; git ls-files | grep "\.h$$" | tr '\n' ' '; cd install/po)
PY_FILES = $(shell cd ..; git ls-files | grep -v -e "^ipatests/" -e "^doc/" -e "^po/" -e "^ipapython/test/" -e "setup.py" | grep "\.py$$" | tr '\n' ' '; cd po)
C_FILES = $(shell cd ..; git ls-files | grep "\.c$$" | tr '\n' ' '; cd po)
H_FILES = $(shell cd ..; git ls-files | grep "\.h$$" | tr '\n' ' '; cd po)
# Please keep this list sorted!
PY_EXPLICIT_FILES = \
@@ -122,7 +122,7 @@ create-po: $(DOMAIN).pot
pull-po:
cd ../..; $(TX) pull -f
cd ..; $(TX) pull -f
$(MAKE) strip-po
merge-po: update-pot
@@ -133,14 +133,14 @@ update-po: merge-po
update-pot:
@rm -f $(DOMAIN).pot.update
@pushd ../.. ; \
@pushd .. ; \
$(XGETTEXT) $(XGETTEXT_OPTIONS) \
--output install/po/$(DOMAIN).pot.update \
--output po/$(DOMAIN).pot.update \
--language="python" \
$(PYTHON_POTFILES) \
&& \
$(XGETTEXT) $(XGETTEXT_OPTIONS) \
--output install/po/$(DOMAIN).pot.update \
--output po/$(DOMAIN).pot.update \
--join-existing \
--language="c" \
--from-code="UTF-8" \
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.
View File
File renamed without changes.