Changeset 1348 in kBuild

Timestamp:

Dec 3, 2007 12:54:30 AM (17 years ago)

Author:

bird

Message:

Require kmk 0.1.2 or later. Use if1of. Removed test on obsolete targets/platforms win32 and win64.

File:

• trunk/kBuild/header.kmk (modified) (6 diffs)

trunk/kBuild/header.kmk

@@ -43 +43 @@
 ifneq ($(KBUILD_VERSION_MAJOR).$(KBUILD_VERSION_MINOR),0.1)
  ifneq ($(KBUILD_VERSION_MAJOR),0)
-  $(warning kBuild: kmk major version mismatch, expected '0' found '$(KBUILD_VERSION_MAJOR)'!)
+  $(warning kBuild: kmk major version mismatch! Expected '0' but found '$(KBUILD_VERSION_MAJOR)'!)
  else
-  $(warning kBuild: kmk minor version mismatch, expected '1' found '$(KBUILD_VERSION_MINOR)'!)
+  $(warning kBuild: kmk minor version mismatch! Expected '1' but found '$(KBUILD_VERSION_MINOR)'!)
+ endif
+else
+ ifneq ($(int-ge $(KBUILD_VERSION_PATCH),2),1)
+  $(warning kBuild: kmk version mismatch! Expected 0.1.2 or later. Actual version is $(KBUILD_VERSION_MAJOR).$(KBUILD_VERSION_MINOR).$(KBUILD_VERSION_PATCH).)
  endif
 endif
@@ -147 +151 @@
  BUILD_TYPE := release
 else
- ifneq ($(filter $(BUILD_TYPE),$(KBUILD_OSES) $(KBUILD_ARCHES)),)
+ if1of ($(BUILD_TYPE),$(KBUILD_OSES) $(KBUILD_ARCHES))
   $(error kBuild: The BUILD_TYPE value '$(BUILD_TYPE)' is an OS or architecture!)
  endif
@@ -182 +186 @@
   $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' contains spaces/tabs!)
  endif
- ifneq ($(filter $(BUILD_PLATFORM_CPU), $(KBUILD_OSES) $(BUILD_ARCHES)),)
+ if1of ($(BUILD_PLATFORM_CPU), $(KBUILD_OSES) $(BUILD_ARCHES))
   $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' was found in the OS or architecture keywords!)
  endif
@@ -229 +233 @@
   $(error kBuild: The BUILD_TARGET_CPU value '$(BUILD_TARGET_CPU)' contains spaces/tabs!)
  endif
- ifneq ($(filter $(BUILD_TARGET_CPU), $(KBUILD_OSES) $(BUILD_ARCHES)),)
+ if1of ($(BUILD_TARGET_CPU), $(KBUILD_OSES) $(BUILD_ARCHES))
   $(error kBuild: The BUILD_TARGET_CPU value was found in the OS or architecture keywords!)
  endif
@@ -331 +335 @@
 
 # Win, Win32, Win64, NT.
-ifeq ($(filter-out win32 win64 win nt,$(BUILD_PLATFORM)),)
+if1of ($(BUILD_PLATFORM),win nt)
 EXEC_X86_WIN32      :=
 HOSTSUFF_EXE        := .exe
@@ -360 +364 @@
 #
 SUFF_DEP            := .dep
-ifeq ($(filter-out win32 win64 win nt os2,$(BUILD_TARGET)),)
+if1of ($(BUILD_TARGET),win nt os2)
 SUFF_OBJ            := .obj
 SUFF_LIB            := .lib