solenv/gbuild/Configuration.mk | 10 +++++-----
solenv/gbuild/ExtensionTarget.mk | 2 +-
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 6 ------
solenv/gbuild/platform/com_GCC_defs.mk | 2 --
4 files changed, 6 insertions(+), 14 deletions(-)
New commits:
commit 3688466ab127d7801b4cb752ee6205cc04acb2f7
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Oct 24 11:12:32 2012 +0200
Revert "gbuild: add a kludge to get dictionaries to build in cygwin:"
This reverts commit 6292b12acfdddd51a816fad3b3ea8073a58eb3c2.
Should no longer be necessary after git submodules migration.
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index a73888e..1655e44 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -95,7 +95,7 @@ endef
$(call gb_XcsTarget_get_target,%) : \
$(gb_XcsTarget_XSLT_SchemaVal) $(gb_XcsTarget_XSLT_Sanity) \
$(gb_XcsTarget_XSLT_SchemaTrim) $(gb_XcsTarget_DTD_Schema)
- $(call gb_XcsTarget__command,$@,$*,$(call
gb_Helper_symlinked_native,$(filter %.xcs,$^)))
+ $(call gb_XcsTarget__command,$@,$*,$(filter %.xcs,$^))
$(call gb_XcsTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCS,1)
@@ -142,7 +142,7 @@ endef
$(call gb_XcuDataTarget_get_target,%) : $(gb_XcuDataTarget_XSLT_DataVal) \
$(gb_XcuTarget_XSLT_AllLang)
$(gb_XcuDataTarget_DTD_ComponentUpdate)
- $(call gb_XcuDataTarget__command,$@,$*,$(call
gb_Helper_symlinked_native,$(filter %.xcu,$^)))
+ $(call gb_XcuDataTarget__command,$@,$*,$(filter %.xcu,$^))
$(call gb_XcuDataTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,2)
@@ -185,7 +185,7 @@ $(call gb_Helper_abbreviate_dirs,\
endef
$(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
- $(call gb_XcuModuleTarget__command,$@,$*,$(call
gb_Helper_symlinked_native,$(filter %.xcu,$^)),$(filter %.xcs,$^))
+ $(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter
%.xcs,$^))
$(call gb_XcuModuleTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,3)
@@ -255,7 +255,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_XcuMergeTarget_CFGEXCOMMAND) \
-p $(firstword $(subst /, ,$(2))) \
- -i $(call gb_Helper_symlinked_native,$(3)) \
+ -i $(3) \
-o $(1) \
-m $(SDF) \
-l all)
@@ -297,7 +297,7 @@ $(call gb_Helper_abbreviate_dirs,\
endef
$(call gb_XcuResTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
- $(call gb_XcuResTarget__command,$@,$*,$(call
gb_Helper_symlinked_native,$(filter %.xcu,$^)))
+ $(call gb_XcuResTarget__command,$@,$*,$(filter %.xcu,$^))
$(call gb_XcuResTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCU,6)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 617f9c6..1b618aa 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -249,12 +249,6 @@ define gb_Helper_make_url
file:///$(strip $(1))
endef
-# for source files in non-core repositories, the cygwin symlink is not
-# understood by native tools, so find the real path to the file
-define gb_Helper_symlinked_native
-$(shell cygpath -m $(realpath $(1)))
-endef
-
# YaccTarget class
define gb_YaccTarget__command
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 24082a0..02642ec 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -192,8 +192,6 @@ define gb_Helper_make_url
file://$(strip $(1))
endef
-gb_Helper_symlinked_native = $(1)
-
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
commit 5e3f7c1db5dd10eca9009a4aea6f489664227724
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Oct 24 11:11:27 2012 +0200
Revert "One more cygwin symlink kludge needed"
This reverts commit ff795d058b36707ec65f8b6e159646e5c2c8c8c5.
Should no longer be necessary after git submodules migration.
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 61d0cec..fd55c51 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -103,7 +103,7 @@ $(call gb_ExtensionTarget_get_workdir,%)/description.xml :
$(gb_ExtensionTarget_
mkdir -p $(call gb_ExtensionTarget_get_workdir,$*) && \
$(gb_ExtensionTarget_XRMEXCOMMAND) \
-p $(PRJNAME) \
- -i $(call gb_Helper_symlinked_native,$(filter
%.xml,$^)) \
+ -i $(filter %.xml,$^) \
-o $@ \
-m $(SDF) \
-l all)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
