Changeset 692 for trunk/kBuild/tools

Timestamp:

Dec 8, 2006, 11:31:16 PM (19 years ago)

Author:

bird

Message:

tools location is being cleaned up.

Location:

trunk/kBuild/tools

Files:

• MINGW32.kmk (modified) (2 diffs)
• TAR.kmk (modified) (1 diff)
• TARGZ.kmk (modified) (1 diff)
• VCC70.kmk (modified) (1 diff)
• WGET.kmk (modified) (1 diff)
• ZIP.kmk (modified) (2 diffs)

trunk/kBuild/tools/MINGW32.kmk

@@ -29 +29 @@
 # Tool Specific Properties
 ifndef PATH_TOOL_MINGW32
- PATH_TOOL_MINGW32 := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/mingw32/v*.*))
+ PATH_TOOL_MINGW32 := $(wildcard $(PATH_DEVTOOLS_BLD)/mingw32/v*.*)
  ifeq ($(PATH_TOOL_MINGW32),)
-  PATH_TOOL_MINGW32 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win/mingw32/v*.*))
+  PATH_TOOL_MINGW32 := $(wildcard $(PATH_DEVTOOLS)/win.x86/mingw32/v*.*)
  endif
  ifeq ($(PATH_TOOL_MINGW32),)
-  PATH_TOOL_MINGW32 := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/mingw32/v*.*))
+  PATH_TOOL_MINGW32 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/mingw32/v*.*)
  endif
  ifneq ($(PATH_TOOL_MINGW32),)
-  PATH_TOOL_MINGW32 := $(call lastword,$(PATH_TOOL_MINGW32))
+  PATH_TOOL_MINGW32 := $(lastword $(sort $(PATH_TOOL_MINGW32)))
  endif
 else
@@ -54 +54 @@
  ifneq ($(BUILD_PLATFORM),win)
   # we're cross compiling either using an emulator (wine/odin) or a cross compiler.
-  ifneq ($(PATH_TOOL_MINGW32),$(subst /x86.win,,$(PATH_TOOL_MINGW32)))
+  ifneq ($(PATH_TOOL_MINGW32),$(subst /win.x86,,$(subst /x86.win,,$(PATH_TOOL_MINGW32))))
    TOOL_MINGW32_PREFIX := $(EXEC_X86_WIN32) $(TOOL_MINGW32_PREFIX)
    TOOL_MINGW32_HOSTSUFF_EXE := .exe

trunk/kBuild/tools/TAR.kmk

@@ -28 +28 @@
 
 # Tool Specific Properties
-ifndef TOOL_TAR_UNPACK
- TOOL_TAR_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/tar$(HOSTSUFF_EXE))
- ifeq ($(TOOL_TAR_UNPACK),)
-  TOOL_TAR_UNPACK := tar$(HOSTSUFF_EXE)
+ifndef TOOL_TAR_TAR
+ TOOL_TAR_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/tar/v*/tar$(HOSTSUFF_EXE))
+ ifeq ($(TOOL_TAR_TAR),)
+  TOOL_TAR_TAR := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/tar$(HOSTSUFF_EXE))
+ endif
+ ifeq ($(TOOL_TAR_TAR),)
+  TOOL_TAR_TAR := $(lastword $(sort $(TOOL_TAR_TAR)))
+ else
+  TOOL_TAR_TAR := tar$(HOSTSUFF_EXE)
  endif
 else
- TOOL_TAR_UNPACK := $(TOOL_TAR_UNPACK)
+ TOOL_TAR_TAR := $(TOOL_TAR_TAR)
 endif
+TOOL_TAR_UNPACK ?= $(TOOL_TAR_TAR)
 
 # General Properties used by kBuild

trunk/kBuild/tools/TARGZ.kmk

@@ -28 +28 @@
 
 # Tool Specific Properties
-ifndef TOOL_TARGZ_UNPACK
- TOOL_TARGZ_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/tar$(HOSTSUFF_EXE))
- ifeq ($(TOOL_TARGZ_UNPACK),)
-  TOOL_TARGZ_UNPACK := tar$(HOSTSUFF_EXE)
+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_UNPACK := $(TOOL_TARGZ_UNPACK)
+ TOOL_TARGZ_TAR := $(TOOL_TARGZ_TAR)
 endif
+TOOL_TARGZ_UNPACK ?= $(TOOL_TARGZ_TAR)
 
 # General Properties used by kBuild

trunk/kBuild/tools/VCC70.kmk

@@ -29 +29 @@
 # Tool Specific Properties
 ifndef PATH_TOOL_VCC70
- PATH_TOOL_VCC70 := $(wildcard $(PATH_DEVTOOLS)/x86.win/vcc/v7 \
-                                                           $(PATH_DEVTOOLS)/x86.win32/vcc/v7 \
-                                                           $(PATH_DEVTOOLS)/x86.win32/vcc70)
- ifeq ($(PATH_TOOL_VCC70),)
-  PATH_TOOL_VCC70 := $(firstword $(PATH_TOOL_VCC70))
- endif
+ PATH_TOOL_VCC70 := $(firstword $(wildcard \
+        $(PATH_DEVTOOLS)/win.x86/vcc/v7 \
+        $(PATH_DEVTOOLS)/x86.win32/vcc/v7 \
+        $(PATH_DEVTOOLS)/x86.win32/vcc70) )
  # if not found, we'll enter 'pathless' mode.
 else

trunk/kBuild/tools/WGET.kmk

@@ -29 +29 @@
 # Tool Specific Properties
 ifndef TOOL_WGET_FETCH
- TOOL_WGET_FETCH := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/wget$(HOSTSUFF_EXE))
- ifeq ($(TOOL_WGET_FETCH),)
+ TOOL_WGET_FETCH := $(wildcard $(PATH_DEVTOOLS_BLD)/wget/v*/wget$(HOSTSUFF_EXE))
+ ifneq ($(TOOL_WGET_FETCH),)
+  TOOL_WGET_FETCH := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/wget$(HOSTSUFF_EXE))
+ endif
+ ifneq ($(TOOL_WGET_FETCH),)
+  TOOL_WGET_FETCH := $(lastword $(sort $(TOOL_WGET_FETCH)))
+ else
   TOOL_WGET_FETCH := wget$(HOSTSUFF_EXE)
  endif

trunk/kBuild/tools/ZIP.kmk

@@ -29 +29 @@
 # Tool Specific Properties
 ifndef TOOL_ZIP_UNPACK
- TOOL_ZIP_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/unzip$(HOSTSUFF_EXE))
+ TOOL_ZIP_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/unzip/v*/unzip$(HOSTSUFF_EXE))
  ifeq ($(TOOL_ZIP_UNPACK),)
+  TOOL_ZIP_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/zip/v*/unzip$(HOSTSUFF_EXE))
+ endif
+ ifeq ($(TOOL_ZIP_UNPACK),)
+  TOOL_ZIP_UNPACK := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/unzip$(HOSTSUFF_EXE))
+ endif
+ ifneq ($(TOOL_ZIP_UNPACK),)
+  TOOL_ZIP_UNPACK := $(lastword $(sort $(TOOL_ZIP_UNPACK)))
+ else
   TOOL_ZIP_UNPACK := unzip$(HOSTSUFF_EXE)
  endif
@@ -36 +44 @@
  TOOL_ZIP_UNPACK := $(TOOL_ZIP_UNPACK)
 endif
+#ifndef TOOL_ZIP_PACK
+# TOOL_ZIP_PACK := $(wildcard $(PATH_DEVTOOLS_BLD)/zip/v*/zip$(HOSTSUFF_EXE))
+# ifeq ($(TOOL_ZIP_PACK),)
+#  TOOL_ZIP_PACK := $(wildcard $(PATH_DEVTOOLS_BLD)/unzip/v*/zip$(HOSTSUFF_EXE))
+# endif
+# ifeq ($(TOOL_ZIP_PACK),)
+#  TOOL_ZIP_PACK := $(wildcard $(PATH_DEVTOOLS_BLD)/bin/zip$(HOSTSUFF_EXE))
+# endif
+# ifneq ($(TOOL_ZIP_PACK),)
+#  TOOL_ZIP_PACK := $(lastword $(sort $(TOOL_ZIP_PACK)))
+# else
+#  TOOL_ZIP_PACK := zip$(HOSTSUFF_EXE)
+# endif
+#else
+# TOOL_ZIP_PACK := $(TOOL_ZIP_PACK)
+#endif
 
 # General Properties used by kBuild