Changeset 2275 in kBuild

Timestamp:

Feb 20, 2009 11:46:29 PM (16 years ago)

Author:

bird

Message:

TAR.kmk,TARGZ.kmk,TARBZ2.kmk: Fixes and additions (BZ2).

Location:

trunk/kBuild/tools

Files:

• TAR.kmk (modified) (2 diffs)
• TARBZ2.kmk (copied) (copied from trunk/kBuild/tools/TARGZ.kmk ) (2 diffs)
• TARGZ.kmk (modified) (1 diff)

trunk/kBuild/tools/TAR.kmk

@@ -40 +40 @@
   TOOL_TAR_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/tar$(HOSTSUFF_EXE))
  endif
- ifeq ($(TOOL_TAR_TAR),)
+ ifneq ($(TOOL_TAR_TAR),)
   TOOL_TAR_TAR := $(lastword $(sort $(TOOL_TAR_TAR)))
  else
@@ -65 +65 @@
 define TOOL_TAR_UNPACK_CMDS
         $(QUIET)$(TOOL_TAR_UNPACK) -x $(flags) -C $(subst G:,,$(inst)) -f $(archive)
-        $(QUIET)$(TOOL_TAR_UNPACK) -t $(flags) -f $(archive) > $(out)
+        $(QUIET)$(TOOL_TAR_UNPACK) -t $(filter-out -v --verbose,$(flags)) -f $(archive) > $(out)
 endef
 else
 define TOOL_TAR_UNPACK_CMDS
         $(QUIET)$(TOOL_TAR_UNPACK) -x $(flags) -C $(inst) -f $(archive)
-        $(QUIET)$(TOOL_TAR_UNPACK) -t $(flags) -f $(archive) > $(out)
+        $(QUIET)$(TOOL_TAR_UNPACK) -t $(filter-out -v --verbose,$(flags)) -f $(archive) > $(out)
 endef
 endif

trunk/kBuild/tools/TARBZ2.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - tar.gz unpacker.
+# kBuild Tool Config - tar.bz2 unpacker.
 #
 
@@ -32 +32 @@
 #
 
-TOOL_TARGZ := tar.gz unpacker.
+TOOL_TARBZ2 := tar.bz2 unpacker.
+TOOL_TARBZ2_EXTENDS = TAR
+TOOL_TARBZ2_UNPACKFLAGS ?= -j
 
-# Tool Specific Properties
-ifndef TOOL_TARGZ_TAR
- TOOL_TARGZ_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/tar/v*/tar$(HOSTSUFF_EXE))
- ifeq ($(TOOL_TARGZ_TAR),)
-  TOOL_TARGZ_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/tar$(HOSTSUFF_EXE))
- endif
- ifeq ($(TOOL_TARGZ_TAR),)
-  TOOL_TARGZ_TAR := $(TOOL_TAR_TAR)
- endif
- ifeq ($(TOOL_TARGZ_TAR),)
-  TOOL_TARGZ_TAR := $(lastword $(sort $(TOOL_TARGZ_TAR)))
- else
-  TOOL_TARGZ_TAR := tar$(HOSTSUFF_EXE)
- endif
-else
- TOOL_TARGZ_TAR := $(TOOL_TARGZ_TAR)
-endif
-TOOL_TARGZ_UNPACK ?= $(TOOL_TARGZ_TAR)
-
-# General Properties used by kBuild
-TOOL_TARGZ_UNPACKFLAGS ?= -z
-
-## UNPACK one file.
-# @param    $(target)   Normalized main target name.
-# @param    $(archive)  The file to unpack.
-# @param    $(flags)    Flags.
-# @param        $(inst)         Where to unpack it.
-# @param        $(out)          Where to write the file list.
-TOOL_TARGZ_UNPACK_OUTPUT =
-TOOL_TARGZ_UNPACK_DEPEND =
-TOOL_TARGZ_UNPACK_DEPORD =
-ifeq ($(KBUILD_HOST),win) # hacking with buggy unxutils on windows. it doesn't like driver letters.
-define TOOL_TARGZ_UNPACK_CMDS
-        $(QUIET)$(TOOL_TARGZ_UNPACK) -x $(flags) -C $(subst G:,,$(inst)) -f $(archive)
-        $(QUIET)$(TOOL_TARGZ_UNPACK) -t $(flags) -f $(archive) > $(out)
-endef
-else
-define TOOL_TARGZ_UNPACK_CMDS
-        $(QUIET)$(TOOL_TARGZ_UNPACK) -x $(flags) -C $(inst) -f $(archive)
-        $(QUIET)$(TOOL_TARGZ_UNPACK) -t $(flags) -f $(archive) > $(out)
-endef
-endif
-

trunk/kBuild/tools/TARGZ.kmk

@@ -33 +33 @@
 
 TOOL_TARGZ := tar.gz unpacker.
-
-# Tool Specific Properties
-ifndef TOOL_TARGZ_TAR
- TOOL_TARGZ_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/tar/v*/tar$(HOSTSUFF_EXE))
- ifeq ($(TOOL_TARGZ_TAR),)
-  TOOL_TARGZ_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/tar$(HOSTSUFF_EXE))
- endif
- ifeq ($(TOOL_TARGZ_TAR),)
-  TOOL_TARGZ_TAR := $(TOOL_TAR_TAR)
- endif
- ifeq ($(TOOL_TARGZ_TAR),)
-  TOOL_TARGZ_TAR := $(lastword $(sort $(TOOL_TARGZ_TAR)))
- else
-  TOOL_TARGZ_TAR := tar$(HOSTSUFF_EXE)
- endif
-else
- TOOL_TARGZ_TAR := $(TOOL_TARGZ_TAR)
-endif
-TOOL_TARGZ_UNPACK ?= $(TOOL_TARGZ_TAR)
-
-# General Properties used by kBuild
+TOOL_TARGZ_EXTENDS = TAR
 TOOL_TARGZ_UNPACKFLAGS ?= -z
 
-## UNPACK one file.
-# @param    $(target)   Normalized main target name.
-# @param    $(archive)  The file to unpack.
-# @param    $(flags)    Flags.
-# @param        $(inst)         Where to unpack it.
-# @param        $(out)          Where to write the file list.
-TOOL_TARGZ_UNPACK_OUTPUT =
-TOOL_TARGZ_UNPACK_DEPEND =
-TOOL_TARGZ_UNPACK_DEPORD =
-ifeq ($(KBUILD_HOST),win) # hacking with buggy unxutils on windows. it doesn't like driver letters.
-define TOOL_TARGZ_UNPACK_CMDS
-        $(QUIET)$(TOOL_TARGZ_UNPACK) -x $(flags) -C $(subst G:,,$(inst)) -f $(archive)
-        $(QUIET)$(TOOL_TARGZ_UNPACK) -t $(flags) -f $(archive) > $(out)
-endef
-else
-define TOOL_TARGZ_UNPACK_CMDS
-        $(QUIET)$(TOOL_TARGZ_UNPACK) -x $(flags) -C $(inst) -f $(archive)
-        $(QUIET)$(TOOL_TARGZ_UNPACK) -t $(flags) -f $(archive) > $(out)
-endef
-endif
-