[Libreoffice-commits] .: Branch 'feature/gbuild_external' - 3 commits - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/ExternalLib.mk            |    3 ++-
 solenv/gbuild/UnpackedTarball.mk        |   10 +++++-----
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 2d103e25c3814d88ddd4ac2227664bea845b42cb
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 23 07:44:31 2012 +0200

    trivial comment fix
    
    Change-Id: If5eb15c5368f1808cf82d92c7e94e4a7205e4756

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index a0afee4..8d85e01 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -232,7 +232,7 @@ endef
 
 # Add several patches at once
 #
-# gb_UnpackedTarball_add_patch unpacked patch(es)
+# gb_UnpackedTarball_add_patches unpacked patch(es)
 define gb_UnpackedTarball_add_patches
 $(foreach patch,$(2),$(call gb_UnpackedTarball_add_patch,$(1),$(patch)))
 
@@ -255,7 +255,7 @@ endef
 #
 # The files are added into the specified subdir.
 #
-# gb_UnpackedTarball_add_file unpacked subdir file(s)
+# gb_UnpackedTarball_add_files unpacked subdir file(s)
 define gb_UnpackedTarball_add_files
 $(foreach file,$(3),$(call gb_UnpackedTarball_add_file,$(1),$(2)/$(notdir $(file)),$(file)))
 
commit f8f860eb744b9b306edf044fba84ffc8f238b2c1
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 23 07:41:42 2012 +0200

    fix modelines
    
    Change-Id: Idc4b0a68d9d4bd4db6ad5a1bb12f4ea96f62b3d7

diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index cb8eb01..5ac3c14 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -1,5 +1,4 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
@@ -108,3 +107,5 @@ define gb_ExternalLib__command_autotools
 	+MAKEFLAGS=$(filterout r,$(MAKEFLAGS)) $(MAKE) -C $(call gb_ExternalLib_get_builddir,$(1))
 	+$(MAKE) -C $(call gb_ExternalLib_get_builddir,$(1)) install
 endef
+
+# vim: set noet sw=4 ts=4:
commit 73745da5321c72700ecd41aae9cbf3a711841b27
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 23 07:40:22 2012 +0200

    fix errors (thanks Matúš)
    
    Change-Id: Ib96ae3e5af979a1a45a1becbc535885c2ecd7221

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 744c8a1..a0afee4 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -33,7 +33,7 @@ $(GNUTAR) \
 	-x \
 	$(3) \
 	-C $(UNPACKED_DIR) \
-	--strip-components=$(UNPACKED_STRIP_COMPONENTS) \
+	$(STRIP_COMPONENTS)=$(UNPACKED_STRIP_COMPONENTS) \
 	-f $(UNPACKED_TARBALL)
 endef
 
@@ -84,10 +84,10 @@ $(call gb_UnpackedTarget_get_clean_target,%) :
 # gb_UnpackedTarget_UnpackedTarget target outdir strip-components?
 define gb_UnpackedTarget_UnpackedTarget
 $(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_DIR := $(2)
-$(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_TARBALL := $(TARFILE_LOCATION)/$(1)
+$(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_TARBALL := $(gb_UnpackedTarget_TARFILE_LOCATION)/$(1)
 $(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_STRIP_COMPONENTS := $(call gb_UnpackedTarget__get_strip_components,$(1),$(3))
 
-$(call gb_UnpackedTarget_get_target,$(1)) : $(TARFILE_LOCATION)/$(1)
+$(call gb_UnpackedTarget_get_target,$(1)) : $(gb_UnpackedTarget_TARFILE_LOCATION)/$(1)
 $(call gb_UnpackedTarget_get_target,$(1)) :| $(dir $(call gb_UnpackedTarget_get_target,$(1))).dir
 
 endef
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index e604d78..5fe282d 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -743,7 +743,7 @@ gb_ExtensionTarget_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt
 
 # UnpackedTarget class
 
-gb_UnpackedTarget_TARFILE_LOCATION := $(shell cygpath -m $(TARFILE_LOCATION))
+gb_UnpackedTarget_TARFILE_LOCATION := $(shell cygpath -u $(TARFILE_LOCATION))
 
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"