[Libreoffice-commits] .: l10ntools/scripts Makefile RepositoryModule_ooo.mk solenv/gbuild solenv/inc
Matus Kukan
mkukan at kemper.freedesktop.org
Fri Mar 2 02:23:31 PST 2012
Makefile | 2 +-
RepositoryModule_ooo.mk | 3 ++-
l10ntools/scripts/po2lo | 2 +-
solenv/gbuild/AllLangResTarget.mk | 5 ++---
solenv/gbuild/Configuration.mk | 5 ++---
solenv/gbuild/Extension.mk | 7 +++----
solenv/gbuild/TargetLocations.mk | 4 ++++
solenv/inc/settings.mk | 4 ++--
8 files changed, 17 insertions(+), 15 deletions(-)
New commits:
commit 811180e9dd983e1166139ea27c256055763af477
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Feb 24 23:35:56 2012 +0100
translations converted to gbuild
diff --git a/Makefile b/Makefile
index bad1cee..cd1d27f 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,7 @@ tail_build\
test\
toolkit\
tools\
+translations\
twain\
ucb\
ucbhelper\
@@ -231,7 +232,6 @@ store\
sysui\
testtools\
tomcat\
-translations\
udm\
unodevtools\
vigra\
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index cca8623..433e806 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -109,9 +109,10 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
sw \
swext \
test \
- twain \
toolkit \
tools \
+ translations \
+ twain \
ucb \
ucbhelper \
udkapi \
diff --git a/l10ntools/scripts/po2lo b/l10ntools/scripts/po2lo
index 9fc93d6..4bcfb8b 100755
--- a/l10ntools/scripts/po2lo
+++ b/l10ntools/scripts/po2lo
@@ -186,7 +186,7 @@ def main():
if opt in ("-s", "--skipsource"):
pass
elif opt in ("-i", "--input"):
- options.input = arg.strip('/')
+ options.input = arg
elif opt in ("-o", "--output"):
options.output = arg
elif opt in ("-l", "--language"):
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 635778d..70151aa 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -50,7 +50,6 @@
gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build,transex3)
gb_SrsPartMergeTarget_TRANSEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
define gb_SrsPartMergeTarget__command
$(call gb_Output_announce,$(3),$(true),srs,1)
@@ -113,7 +112,7 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE :=
else
$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1))
$(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
endif
endef
@@ -126,7 +125,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_
mkdir -p $$(dir $$@) && \
cp $$< $$@)
ifneq ($(strip $(WITH_LANG)),)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(SDF)
endif
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 1743be4..0a9c54c 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -223,7 +223,6 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target,cfgex)
gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_CFGEXTARGET)
-gb_XcuMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
# PRJNAME is computed from the stem (parameter $(2))
define gb_XcuMergeTarget__command
@@ -250,9 +249,9 @@ $(call gb_XcuMergeTarget_get_clean_target,%) :
define gb_XcuMergeTarget_XcuMergeTarget
$(call gb_XcuMergeTarget_get_target,$(1)) : \
$(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
- $(realpath $(gb_XcuMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+ $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
$(call gb_XcuMergeTarget_get_target,$(1)) : \
- SDF := $(realpath $(gb_XcuMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+ SDF := $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
endef
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index f59392d..0d3044b 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -42,7 +42,6 @@ gb_Extension_PROPMERGECOMMAND := \
gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target,helpex)
gb_Extension_HELPEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_HELPEXTARGET)
-gb_Extension_SDFLOCATION := $(L10N_MODULE)/$(INPATH)/misc/sdf/
# does not contain en-US because it is special cased in gb_Extension_Extension
gb_Extension_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
@@ -113,7 +112,7 @@ $(call gb_Extension_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2)
$(call gb_Extension_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2)))
$(call gb_Extension_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml
ifneq ($(strip $(gb_WITH_LANG)),)
-$(call gb_Extension_get_target,$(1)) : SDF := $(gb_Extension_SDFLOCATION)$(2)/localize.sdf
+$(call gb_Extension_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(2)/localize.sdf
$(call gb_Extension_get_workdir,$(1))/description.xml : $$(SDF)
endif
$(call gb_Extension_add_file,$(1),description-en-US.txt,$(SRCDIR)/$(2)/description-en-US.txt)
@@ -140,7 +139,7 @@ define gb_Extension_localize_properties
$(call gb_Extension_get_target,$(1)) : FILES += $(2)
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_target,$(1)) : SDF2 := $(gb_SDFLOCATION)/$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
$(call gb_Extension_get_target,$(1)) : $$(SDF2)
endif
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2)
@@ -158,7 +157,7 @@ endef
define gb_Extension_localize_help
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(gb_Extension_LANGS),$(subst lang,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF3 := $(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_target,$(1)) : SDF3 := $(gb_SDFLOCATION)/$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
$(call gb_Extension_get_target,$(1)) : $$(SDF3)
$(foreach lang,$(gb_Extension_LANGS),$(call gb_Extension_localize_help_onelang,$(1),$(subst lang,$(lang),$(2)),$(3),$(lang)))
endif
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index e6e89f7..4fd84c1 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -241,4 +241,8 @@ gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest
gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib
+# static variables declared here because they are used globally
+
+gb_SDFLOCATION := $(WORKDIR)/CustomTarget/translations/translate/sdf
+
# vim: set noet sw=4:
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index bf5dcab..ac635f8 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -742,12 +742,12 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
.EXPORT : SOLARBINDIR
.IF "$(WITH_LANG)"!=""
-.INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk
+.INCLUDE .IGNORE: $(WORKDIR)$/CustomTarget$/translations$/localization_present.mk
# if the l10n module exists, use split localize.sdf directly from there
.IF "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
# still check for existence as there may be no localization yet
-TRYSDF:=$(L10N_MODULE)$/$(COMMON_OUTDIR)$(PROEXT)$/misc/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
+TRYSDF:=$(WORKDIR)$/CustomTarget$/translations$/translate$/sdf$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI)))
.ENDIF # "$(LOCALIZATION_FOUND)"!="" && "$(LOCALIZESDF)"==""
# else use localize.sdf from local output tree if localization .zip exists
More information about the Libreoffice-commits
mailing list