Changeset 3345 in kBuild for trunk

Timestamp:

May 22, 2020 2:23:56 PM (5 years ago)

Author:

bird

Message:

tools/7ZIP.kmk: Adding 7-Zip unpacker tool.

File:

• trunk/kBuild/tools/7ZIP.kmk (copied) (copied from trunk/kBuild/tools/TAR.kmk ) (3 diffs)

trunk/kBuild/tools/7ZIP.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - tar unpacker.
+# kBuild Tool Config - 7-Zip unpacker.
 #
 
 #
-# Copyright (c) 2006-2017 knut st. osmundsen <[email protected]>
+# Copyright (c) 2006-2020 knut st. osmundsen <[email protected]>
 #
 # This file is part of kBuild.
@@ -32 +32 @@
 #
 
-TOOL_TAR := tar unpacker.
+TOOL_7ZIP := 7-Zip unpacker.
 
 # Tool Specific Properties
-ifndef TOOL_TAR_TAR
- TOOL_TAR_TAR := $(wildcard $(KBUILD_DEVTOOLS_HST)/tar/v*/tar$(HOSTSUFF_EXE))
- ifeq ($(TOOL_TAR_TAR),)
-  TOOL_TAR_TAR := $(wildcard $(KBUILD_DEVTOOLS_HST)/bin/tar$(HOSTSUFF_EXE))
+ifndef TOOL_7ZIP_7Z
+ TOOL_7ZIP_7Z := $(wildcard $(KBUILD_DEVTOOLS_HST)/7zip/v*/7z$(HOSTSUFF_EXE))
+ ifeq ($(TOOL_7ZIP_7Z),)
+  TOOL_7ZIP_7Z := $(wildcard $(KBUILD_DEVTOOLS_HST)/bin/7z$(HOSTSUFF_EXE))
  endif
- ifneq ($(TOOL_TAR_TAR),)
-  TOOL_TAR_TAR := $(lastword $(sort $(TOOL_TAR_TAR)))
+ ifneq ($(TOOL_7ZIP_7Z),)
+  TOOL_7ZIP_7Z := $(lastword $(sort $(TOOL_7ZIP_7Z)))
  else
-  TOOL_TAR_TAR := tar$(HOSTSUFF_EXE)
+  TOOL_7ZIP_7Z := 7z$(HOSTSUFF_EXE)
  endif
 else
- TOOL_TAR_TAR := $(TOOL_TAR_TAR)
+ TOOL_7ZIP_7Z := $(TOOL_7ZIP_7Z)
 endif
-TOOL_TAR_UNPACK ?= $(TOOL_TAR_TAR)
+TOOL_7ZIP_UNPACK ?= $(TOOL_7ZIP_7Z)
 
 # General Properties used by kBuild
-TOOL_TAR_UNPACKFLAGS ?=
+TOOL_7ZIP_UNPACKFLAGS ?=
 
 ## UNPACK one file.
@@ -59 +59 @@
 # @param        $(inst)         Where to unpack it.
 # @param        $(out)          Where to write the file list.
-TOOL_TAR_UNPACK_OUTPUT =
-TOOL_TAR_UNPACK_DEPEND =
-TOOL_TAR_UNPACK_DEPORD =
-ifeq ($(KBUILD_HOST),win) # hacking with buggy unxutils on windows. it doesn't like driver letters.
-define TOOL_TAR_UNPACK_CMDS
-        $(QUIET)$(TOOL_TAR_UNPACK) -x $(flags) -C $(subst G:,,$(inst)) -f $(archive)
-        $(QUIET)$(TOOL_TAR_UNPACK) -t $(filter-out -v --verbose,$(flags)) -f $(archive) > $(out)
+TOOL_7ZIP_UNPACK_OUTPUT =
+TOOL_7ZIP_UNPACK_DEPEND =
+TOOL_7ZIP_UNPACK_DEPORD =
+define TOOL_7ZIP_UNPACK_CMDS
+        $(QUIET)$(TOOL_7ZIP_UNPACK) x $(flags) -o"$(inst)" "$(archive)"
+        $(QUIET)$(TOOL_7ZIP_UNPACK) l $(filter-out -bb%,$(flags)) "$(archive)" \
+        | $(SED) \
+                -e '1,/-------------------/d' \
+                -e '/-------------------/,$$(DOLLAR)d' \
+                -e '/^[^ ]* [^ ]* D/d' \
+                -e 's/^.................................................... *//'  \
+                -e 's,\\,/,g' \
+                --output $(out)
 endef
-else
-define TOOL_TAR_UNPACK_CMDS
-        $(QUIET)$(TOOL_TAR_UNPACK) -x $(flags) -C $(inst) -f $(archive)
-        $(QUIET)$(TOOL_TAR_UNPACK) -t $(filter-out -v --verbose,$(flags)) -f $(archive) > $(out)
-endef
-endif