[Libreoffice-commits] .: 6 commits - sdext/Extension_minimizer.mk sdext/Extension_presenter.mk solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Fri May 4 07:46:21 PDT 2012
sdext/Extension_minimizer.mk | 4 ++--
sdext/Extension_presenter.mk | 2 +-
solenv/gbuild/Configuration.mk | 2 +-
solenv/gbuild/Extension.mk | 11 ++++++-----
solenv/gbuild/gbuild.mk | 2 +-
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 2 +-
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 +-
7 files changed, 13 insertions(+), 12 deletions(-)
New commits:
commit 63417ac5d3e07d370e652d7dedf5c189cc7e7e34
Author: David Tardon <dtardon at redhat.com>
Date: Fri May 4 16:44:22 2012 +0200
fdo#49136 use localized .xcu files
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index cebdc9c..400c290 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -47,10 +47,10 @@ $(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\
$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs,$(call gb_XcsTarget_get_target,sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs)))
$(eval $(call gb_Extension_add_files,presentation-minimizer,registry/data/org/openoffice/Office,\
- $(call gb_XcuDataTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \
+ $(call gb_XcuMergeTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \
$(call gb_XcuDataTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \
))
-$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu,$(call gb_XcuDataTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu)))
+$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu,$(call gb_XcuMergeTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu)))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 6659664..1311310 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -134,7 +134,7 @@ $(eval $(call gb_Extension_add_files,presenter-screen,bitmaps,\
$(eval $(call gb_Extension_add_file,presenter-screen,registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs,$(call gb_XcsTarget_get_target,sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs)))
-$(eval $(call gb_Extension_add_file,presenter-screen,registry/data/org/openoffice/Office/extension/PresenterScreen.xcu,$(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu)))
+$(eval $(call gb_Extension_add_file,presenter-screen,registry/data/org/openoffice/Office/extension/PresenterScreen.xcu,$(call gb_XcuMergeTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu)))
$(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffice/Office,\
$(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu) \
commit 9694abe2b6c8525856a316a08a3ebe9d4bb600b5
Author: David Tardon <dtardon at redhat.com>
Date: Fri May 4 16:34:21 2012 +0200
do not handle description-* as special case
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index aaa35a1..3de3af9 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -98,8 +98,7 @@ $(call gb_Extension_get_target,%) : \
cd $(call gb_Extension_get_rootdir,$*) && \
$(gb_Extension_ZIPCOMMAND) -rX --filesync \
$(call gb_Extension_get_target,$*) \
- $(FILES) \
- $(foreach lang,$(gb_Extension_LANGS),description-$(lang).txt))
+ $(FILES))
# TODO: needs dependency on $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) once readlicense_oo will be gbuildized
# or just another simpler solution
@@ -115,6 +114,7 @@ $(call gb_Extension_get_target,$(1)) : PLATFORM :=
$(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)) : FILES += $(foreach lang,$(gb_Extension_LANGS),description-$(lang).txt)
$(call gb_Extension_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(2)/localize.sdf
$(call gb_Extension_get_workdir,$(1))/description.xml : $$(SDF)
endif
commit 280aa3cbd8b9d058af628f51745b41594e28f265
Author: David Tardon <dtardon at redhat.com>
Date: Fri May 4 16:22:25 2012 +0200
fdo#49136 install description-*.txt
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 845bad7..aaa35a1 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -94,6 +94,7 @@ $(call gb_Extension_get_target,%) : \
$(call gb_Extension__subst_platform,$(call gb_Extension_get_workdir,$*)/description.xml,$(call gb_Extension_get_rootdir,$*)/description.xml) && \
$(call gb_Extension__subst_platform,$(LOCATION)/manifest.xml,$(call gb_Extension_get_rootdir,$*)/META-INF/manifest.xml) && \
cp -f $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) $(call gb_Extension_get_rootdir,$*)/registration && \
+ $(if $(gb_WITH_LANG),cp $(foreach lang,$(gb_Extension_LANGS),$(call gb_Extension_get_workdir,$*)/description-$(lang).txt) $(call gb_Extension_get_rootdir,$*) &&) \
cd $(call gb_Extension_get_rootdir,$*) && \
$(gb_Extension_ZIPCOMMAND) -rX --filesync \
$(call gb_Extension_get_target,$*) \
commit ac07af477fedb561f2faf9d0b61651022c341f2c
Author: David Tardon <dtardon at redhat.com>
Date: Thu May 3 16:51:53 2012 +0200
fix executable path for cross-compilation
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index c7167a6..8403685 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -389,7 +389,7 @@ else ifeq ($(DISABLE_PYTHON),TRUE)
# Build-time python
gb_PYTHON := python
else
-gb_PYTHONTARGET := $(OUTDIR)/bin/python
+gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python)
gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
endif
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index b1b4fb6..f425d36 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -426,7 +426,7 @@ gb_WinResTarget__command_dep =
endif
# Python
-gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload"
+gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"
include $(GBUILDDIR)/platform/com_GCC_class.mk
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 9ee08e2..d2e562c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -701,6 +701,6 @@ gb_WinResTarget__command_dep =
endif
# Python
-gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(shell cygpath -m $(OUTDIR)/bin)" PYTHONHOME="$(shell cygpath -m $(OUTDIR))/lib/python" PYTHONPATH="$(shell cygpath -m $(OUTDIR))/lib/python;$(shell cygpath -m $(OUTDIR))/lib/python/lib-dynload"
+gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(shell cygpath -m $(OUTDIR_FOR_BUILD)/bin)" PYTHONHOME="$(shell cygpath -m $(OUTDIR_FOR_BUILD))/lib/python" PYTHONPATH="$(shell cygpath -m $(OUTDIR_FOR_BUILD))/lib/python;$(shell cygpath -m $(OUTDIR_FOR_BUILD))/lib/python/lib-dynload"
# vim: set noet sw=4:
commit 2c2d2a6e3fbebfdd47c0e9e8600cab3f3f159d25
Author: David Tardon <dtardon at redhat.com>
Date: Thu May 3 16:48:23 2012 +0200
fix executable path for cross-compilation
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 60f5b81..ff19c11 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -243,7 +243,7 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
# XcuMergeTarget class
-gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target,cfgex)
+gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target_for_build,cfgex)
gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_CFGEXTARGET)
# PRJNAME is computed from the stem (parameter $(2))
commit 2dcac58e36aff967bc0d4a04aaf262d8c784aea9
Author: David Tardon <dtardon at redhat.com>
Date: Thu May 3 16:36:26 2012 +0200
fix for cross-compilation
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 24e3c87..845bad7 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -33,13 +33,13 @@ gb_Extension_LICENSEFILE := license.txt
else
gb_Extension_LICENSEFILE := LICENSE
endif
-gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target,xrmex)
+gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex)
gb_Extension_XRMEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET)
-gb_Extension_PROPMERGETARGET := $(OUTDIR)/bin/propmerge
+gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target_for_build,propmerge)
gb_Extension_PROPMERGECOMMAND := \
$(PERL) $(gb_Extension_PROPMERGETARGET)
-gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target,helpex)
+gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target_for_build,helpex)
gb_Extension_HELPEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_HELPEXTARGET)
# does not contain en-US because it is special cased in gb_Extension_Extension
More information about the Libreoffice-commits
mailing list