Changeset 978

Timestamp:

May 27, 2007, 8:58:51 PM (18 years ago)

Author:

bird

Message:

We can drop all the hacks required to make it work with GNU make 3.81 since we no longer need this for bootstrapping. Also drop feature tests for kmk features present in the current code.

Location:

trunk/kBuild

Files:

• gnumake-append.sh (deleted)
• gnumake-footer.kmk (deleted)
• gnumake-header.kmk (deleted)
• header.kmk (modified) (15 diffs)

trunk/kBuild/header.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild - File included at top of makefile.
+# kBuild - File included at top of a makefile.
 #
 # Copyright (c) 2004-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
@@ -28 +28 @@
 # start-of-file-content
 
-#
-# default rule
+
+#
+# Check make version before we do anything else.
+#
+ifndef KMK_VERSION
+ $(error kBuild: The kmk default variable KMK_VERSION isn't defined! Make sure you are using 'kmk' and not 'make', 'gmake', 'kmk_gmake', 'dmake' or any other make program.)
+endif
+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)'!)
+ else
+  $(warning kBuild: kmk minor version mismatch, expected '1' found '$(KBUILD_VERSION_MINOR)'!)
+ endif
+endif
+
+#
+# The revision in which this file was last modified.
+# This can be useful when using development versions of kBuild.
+#
+KMK_REVISION := $(patsubst %:,,  $Rev$  )
+
+
+#
+# Define the default goal.
 #
 all: all_recursive
 
 #
-# The FORCE rule.
+# The phony FORCE target.
 #
 FORCE:
 
-#
-# Try avoid inference rules.
-#
-.SUFFIXES:
-SUFFIXES :=
-
-#
-# Enable delete (targets) on error.
+
+#
+# Enable delete on error and second expansion of prerequisites.
 #
 .DELETE_ON_ERROR:
 
-#
-# Enable second expansion of prerequisites.
-#
 .SECONDEXPANSION:
 
@@ -58 +72 @@
 # General purpose macros.
 #
-
-## get last word in a list.
-# @returns  last word in $1.
-# @param    $1  Word list.
-lastword = $(word $(words $(1)), $(1))
 
 ##
@@ -115 +124 @@
 
 #
+# The OSes and Architectures that kBuild recognizes.
+#
+# When kBuild is ported to a new OS or architecture a unique keyword needs
+# to be assigned to it and added here. This strictness is required because
+# this keyword namespace is shared between OSes, architectures, cpus and
+# build types.
+#
+KBUILD_OSES   = darwin freebsd l4 linux netbsd nt openbsd os2 solaris win
+KBUILD_ARCHES = x86 amd64 sparc32 sparc64 mips32 mips64 ppc32 ppc64
+
+
+#
 # Set default build type.
 #
 ifndef BUILD_TYPE
- ifdef BUILD_MODE
- # BUILD_MODE is legacy from the OS/2 build system. :)
-BUILD_TYPE          := $(tolower $(BUILD_MODE))
- else
-BUILD_TYPE          := release
- endif
-endif
-
-
-#
-# Assert build platform.
-#
-ifndef BUILD_PLATFORM
- $(error kBuild: BUILD_PLATFORM is undefined!)
-else
- BUILD_PLATFORM     := $(strip $(BUILD_PLATFORM))
- ifneq ($(words $(BUILD_PLATFORM))$(filter-out darwin freebsd l4 linux nt os2 solaris win win32 win64,$(BUILD_PLATFORM)),1)
-  # OS/2 (have uppercase legacy)
-  ifeq ($(BUILD_PLATFORM),OS2)
-   $(error kBuild: BUILD_PLATFORM must be all lowercase!)
-  endif
-  $(error kBuild: BUILD_PLATFORM value '$(BUILD_PLATFORM)' was not recognized!)
- endif
-endif
-
-# Fill in defaults if needed.
-ifndef BUILD_PLATFORM_ARCH
- ifeq ($(filter-out win64,$(BUILD_PLATFORM)),)
-  BUILD_PLATFORM_ARCH := amd64
- else
-  BUILD_PLATFORM_ARCH := x86
- endif
-endif
-ifndef BUILD_PLATFORM_CPU
- ifeq ($(filter-out amd64,$(BUILD_PLATFORM_ARCH)),)
-  BUILD_PLATFORM_CPU:= k8
- else
-  BUILD_PLATFORM_CPU:= i586
- endif
-endif
-
-
-#
-# Assert target platform.
+ BUILD_TYPE := release
+else
+ ifneq ($(filter $(BUILD_TYPE),$(KBUILD_OSES) $(KBUILD_ARCHES)),)
+  $(error kBuild: The BUILD_TYPE value '$(BUILD_TYPE)' is an OS or architecture!)
+ endif
+ ifneq (.$(words $(BUILD_TYPE)).$(BUILD_TYPE).,.1.$(strip $(BUILD_TYPE)).)
+  $(error kBuild: The BUILD_TYPE value '$(BUILD_TYPE)' contains spaces/tabs!)
+ endif
+endif
+
+
+#
+# Assert valid build platform variables.
+#
+# All these are set by kmk so they shouldn't be any trouble
+# unless the user starts messing about with environment variables.
+#
+ifneq (.$(words $(BUILD_PLATFORM)).$(BUILD_PLATFORM).,.1.$(strip $(BUILD_PLATFORM)).)
+ $(error kBuild: The BUILD_PLATFORM value '$(BUILD_PLATFORM)' contains spaces/tabs!)
+endif
+ifneq ($(words $(filter $(BUILD_PLATFORM),$(KBUILD_OSES))),1)
+ $(error kBuild: BUILD_PLATFORM value '$(BUILD_PLATFORM)' is not recognized (valid: $(KBUILD_OSES)))
+endif
+
+ifneq (.$(BUILD_PLATFORM_ARCH).,.$(strip $(BUILD_PLATFORM_ARCH)).)
+ $(error kBuild: The BUILD_PLATFORM_ARCH value '$(BUILD_PLATFORM_ARCH)' contains spaces/tabs!)
+endif
+ifneq ($(words $(filter $(BUILD_PLATFORM_ARCH),$(KBUILD_ARCHES))),1)
+ $(error kBuild: BUILD_PLATFORM_ARCH value '$(BUILD_PLATFORM_ARCH)' is not recognized (valid: $(KBUILD_ARCHES)))
+endif
+
+ifeq ($(strip $(BUILD_PLATFORM_CPU)),)
+ $(error kBuild: The BUILD_PLATFORM_CPU value is missing (should be set by kmk)!)
+endif
+ifneq (.$(words $(BUILD_PLATFORM_CPU)).$(BUILD_PLATFORM_CPU).,.1.$(strip $(BUILD_PLATFORM_CPU)).)
+ $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' contains spaces/tabs!)
+endif
+ifneq ($(filter $(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
+ifeq ($(BUILD_PLATFORM_CPU),$(BUILD_TYPE))
+ $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' is the same as the BUILD_TYPE!)
+endif
+
+
+#
+# Assert or set default target platform.
+# When not defined use the corresponding BUILD_PLATFORM value.
 #
 ifndef BUILD_TARGET
-# not defined, set to the same as build platform
-BUILD_TARGET        := $(BUILD_PLATFORM)
-else
- BUILD_TARGET       := $(strip $(BUILD_TARGET))
- ifneq ($(words $(BUILD_TARGET))$(filter-out darwin freebsd l4 linux nt os2 solaris win win32 win64,$(BUILD_TARGET)),1)
-  # OS/2 (have uppercase legacy)
-  ifeq ($(BUILD_TARGET),OS2)
-   $(error kBuild: BUILD_TARGET must be all lowercase!)
-  endif
-  $(error kBuild: BUILD_TARGET value '$(BUILD_TARGET)' was not recognized!)
- endif
-endif
-
-# Fill in defaults if needed.
+ BUILD_TARGET := $(BUILD_PLATFORM)
+else
+ ifneq (.$(words $(BUILD_TARGET)).$(BUILD_TARGET).,.$(strip $(BUILD_TARGET)).)
+  $(error kBuild: The BUILD_TARGET value '$(BUILD_TARGET)' contains spaces/tabs!)
+ endif
+ ifneq ($(words $(filter $(BUILD_TARGET),$(KBUILD_OSES))),1)
+  $(error kBuild: BUILD_TARGET value '$(BUILD_TARGET)' is not recognized (valid: $(KBUILD_OSES)))
+ endif
+endif
+
 ifndef BUILD_TARGET_ARCH
- BUILD_TARGET_ARCH  := x86
-endif
+ BUILD_TARGET_ARCH := $(BUILD_PLATFORM_ARCH)
+else
+ ifneq (.$(BUILD_TARGET_ARCH).,.$(strip $(BUILD_TARGET_ARCH)).)
+  $(error kBuild: The BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)' contains spaces/tabs!)
+ endif
+ ifneq ($(words $(filter $(BUILD_TARGET_ARCH),$(KBUILD_ARCHES))),1)
+  $(error kBuild: BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)' is not recognized (valid: $(KBUILD_ARCHES)))
+ endif
+endif
+
 ifndef BUILD_TARGET_CPU
- BUILD_TARGET_CPU   := i586
-endif
-
-# Adjust the DEPTH definition first
-ifeq ($(strip $(DEPTH)),)
-DEPTH := .
-endif
-
-#
-# Common definitions.
-#
+ BUILD_TARGET_CPU := $(BUILD_PLATFORM_CPU)
+else
+ ifeq ($(strip $(BUILD_TARGET_CPU)),)
+  $(error kBuild: The BUILD_TARGET_CPU value is missing (should be set by kmk)!)
+ endif
+ ifneq (.$(words $(BUILD_TARGET_CPU)).$(BUILD_TARGET_CPU).,.1.$(strip $(BUILD_TARGET_CPU)).)
+  $(error kBuild: The BUILD_TARGET_CPU value '$(BUILD_TARGET_CPU)' contains spaces/tabs!)
+ endif
+ ifneq ($(filter $(BUILD_TARGET_CPU), $(KBUILD_OSES) $(BUILD_ARCHES)),)
+  $(error kBuild: The BUILD_TARGET_CPU value was found in the OS or architecture keywords!)
+ endif
+ ifeq ($(BUILD_TARGET_CPU),$(BUILD_TYPE))
+  $(error kBuild: The BUILD_TARGET_CPU value '$(BUILD_TARGET_CPU)' is the same as the BUILD_TYPE!)
+ endif
+endif
+
+
+#
+# Paths and stuff.
+#
+
+# Adjust DEPTH first.
+DEPTH := $(strip $(DEPTH))
+ifeq ($(DEPTH),)
+ DEPTH := .
+endif
+
 ## PATH_CURRENT is the current directory (getcwd).
 PATH_CURRENT        := $(abspath $(CURDIR))
@@ -202 +247 @@
 ## PATH_SUB_ROOT points to the directory of the top-level makefile.
 ifneq ($(strip $(SUB_DEPTH)),)
+ SUB_DEPTH          := $(strip $(SUB_DEPTH))
  PATH_SUB_ROOT      := $(abspath $(PATH_CURRENT)/$(SUB_DEPTH))
 else
@@ -235 +281 @@
 PATH_DOC             = $(PATH_INS)/doc
 
-# Usually kBuild is external to the source tree.
-ifndef PATH_KBUILD
- PATH_KBUILD        := $(PATH_ROOT)/kBuild
-endif
-PATH_KBUILD         := $(abspath $(PATH_KBUILD))
+# PATH_KBUILD is determined by kmk.
+ifeq ($(strip $(PATH_KBUILD)),)
+ $(error kBuild: PATH_KBUILD is missing or empty! kmk is supposed to set it.)
+endif
+# PATH_KBUILD_BIN is determined by kmk.
+ifeq ($(strip $(PATH_KBUILD_BIN)),)
+ $(error kBuild: PATH_KBUILD_BIN is missing or empty! kmk is supposed to set it.)
+endif
+
 # kBuild files which might be of interest.
 FILE_KBUILD_HEADER  := $(PATH_KBUILD)/header.kmk
@@ -245 +295 @@
 FILE_KBUILD_FOOTER  := $(PATH_KBUILD)/footer.kmk
 
-SUFF_DEP            := .dep
 ## MAKEFILE is the name of the main makefile.
 MAKEFILE            := $(firstword $(MAKEFILE_LIST))
@@ -254 +303 @@
 
 #
-# Check make version.
-#
-ifdef KMK_VERSION
- 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)'!)
-  else
-   $(warning kBuild: kmk minor version mismatch, expected '1' found '$(KBUILD_VERSION_MINOR)'!)
-  endif
- endif
-endif
-
-
-#
-# The revision in which this file was last modified.
-# This can be useful when using development versions of kBuild.
-#
-KMK_REVISION := $(patsubst %:,,  $Rev$  )
-
-
-#
 # Build platform setup.
 #
@@ -313 +341 @@
 endif
 
-ifndef PATH_KBUILD_BIN
- PATH_KBUILD_BIN    := $(PATH_KBUILD)/bin/$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)
- ifeq ($(wildcard $(PATH_KBUILD_BIN)/kmk_ash$(HOSTSUFF_EXE)),)
-  ifeq ($(BUILD_TARGET_ARCH),amd64)
-   PATH_KBUILD_BIN  := $(PATH_KBUILD)/bin/$(BUILD_PLATFORM).x86
-  endif
-  ifeq ($(wildcard $(PATH_KBUILD_BIN)/kmk_ash$(HOSTSUFF_EXE)),)
-   ifeq ($(filter-out win64 win32 win nt ,$(BUILD_PLATFORM)),)
-    PATH_KBUILD_BIN := $(PATH_KBUILD)/bin/win.x86
-   endif
-  endif
-  ifeq ($(wildcard $(PATH_KBUILD_BIN)/kmk_ash$(HOSTSUFF_EXE)),)
-   # give up
-   PATH_KBUILD_BIN  := $(PATH_KBUILD)/bin/$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)
-  endif
- endif
-endif
-
 
 #
 # Build target setup.
 #
+SUFF_DEP            := .dep
 ifeq ($(filter-out win32 win64 win nt os2,$(BUILD_TARGET)),)
 SUFF_OBJ            := .obj
@@ -371 +382 @@
 # Standard kBuild tools.
 #
-ifeq ($(MAKE),kmk)
-MAKE        := $(PATH_KBUILD_BIN)/kmk$(HOSTSUFF_EXE)
-endif
+ifeq ($(KMK),kmk)
+KMK         := $(PATH_KBUILD_BIN)/kmk$(HOSTSUFF_EXE)
+endif
+MAKE        := $(KMK)
 
 DEP_EXT     := $(PATH_KBUILD_BIN)/kDep$(HOSTSUFF_EXE)
@@ -397 +409 @@
 
 APPEND_EXT  := $(PATH_KBUILD_BIN)/kmk_append$(HOSTSUFF_EXE)
-ifeq ($(filter append,$(KMK_BUILTIN)),append)
 APPEND      := kmk_builtin_append
-else
-APPEND      := $(APPEND_EXT)
-endif
 
 CAT_EXT     := $(PATH_KBUILD_BIN)/kmk_cat$(HOSTSUFF_EXE)
-ifeq ($(filter cat,$(KMK_BUILTIN)),cat)
 CAT         := kmk_builtin_cat
-else
-CAT         := $(CAT_EXT)
-endif
 
 CP_EXT      := $(PATH_KBUILD_BIN)/kmk_cp$(HOSTSUFF_EXE)
-ifeq ($(filter cp,$(KMK_BUILTIN)),cp)
 CP          := kmk_builtin_cp
-else
-CP          := $(CP_EXT)
-endif
 
 ECHO_EXT    := $(PATH_KBUILD_BIN)/kmk_echo$(HOSTSUFF_EXE)
-ifeq ($(filter echo,$(KMK_BUILTIN)),echo)
 ECHO        := kmk_builtin_echo
-else
-ECHO        := $(ECHO_EXT)
-endif
 
 INSTALL_EXT := $(PATH_KBUILD_BIN)/kmk_install$(HOSTSUFF_EXE)
-ifeq ($(filter install,$(KMK_BUILTIN)),install)
 INSTALL     := kmk_builtin_install
-else
-INSTALL     := $(INSTALL_EXT)
-endif
 
 LN_EXT      := $(PATH_KBUILD_BIN)/kmk_ln$(HOSTSUFF_EXE)
-ifeq ($(filter ln,$(KMK_BUILTIN)),ln)
 LN          := kmk_builtin_ln
-else
-LN          := $(LN_EXT)
-endif
 
 MKDIR_EXT   := $(PATH_KBUILD_BIN)/kmk_mkdir$(HOSTSUFF_EXE)
-ifeq ($(filter mkdir,$(KMK_BUILTIN)),mkdir)
 MKDIR       := kmk_builtin_mkdir
-else
-MKDIR       := $(MKDIR_EXT)
-endif
 
 MV_EXT      := $(PATH_KBUILD_BIN)/kmk_mv$(HOSTSUFF_EXE)
-ifeq ($(filter mv,$(KMK_BUILTIN)),mv)
 MV          := kmk_builtin_mv
-else
-MV          := $(MV_EXT)
-endif
 
 PRINTF_EXT  := $(PATH_KBUILD_BIN)/kmk_printf$(HOSTSUFF_EXE)
-ifeq ($(filter printf,$(KMK_BUILTIN)),printf)
 PRINTF      := kmk_builtin_printf
-else
-PRINTF      := $(PRINTF_EXT)
-endif
 
 RM_EXT      := $(PATH_KBUILD_BIN)/kmk_rm$(HOSTSUFF_EXE)
-ifeq ($(filter rm,$(KMK_BUILTIN)),rm)
 RM          := kmk_builtin_rm
-else
-RM          := $(RM_EXT)
-endif
 
 RMDIR_EXT   := $(PATH_KBUILD_BIN)/kmk_rmdir$(HOSTSUFF_EXE)
-ifeq ($(filter rmdir,$(KMK_BUILTIN)),rmdir)
 RMDIR       := kmk_builtin_rmdir
-else
-RMDIR       := $(RMDIR_EXT)
-endif
 
 SED_EXT     := $(PATH_KBUILD_BIN)/kmk_sed$(HOSTSUFF_EXE)
 ifeq ($(filter sed,$(KMK_BUILTIN)),sed)
-SED         := kmk_builtin_sed
-else
+SED_INT     := kmk_builtin_sed
+else
+SED_INT     := $(SED_EXT)
+endif
 SED         := $(SED_EXT)
-endif
 
 # Our default shell is the Almquist shell from *BSD.
@@ -517 +486 @@
 else
  CYGPATHMIXED = $(1)
-endif
-
-ifneq ($(filter xargs,$(KMK_FEATURES)),xargs) ## @todo Retire this to gnumake-header.kmk when it has been implemented.
-##
-# Fake xargs without doing any commandline splitting.
-# @param    $1      The initial command.
-# @param    $2      The command for the subseqent command lines. optional
-# @param    $3          The command for the final command lines. optional
-# @param    $($#)   The arguments.
-xargs = $(1) $(if $(4),$(4),$(if $(3),$(3),$(2)))
 endif
 
@@ -745 +704 @@
 
 #
-# Include the gnumake header hacks if we're not using kmk.
-#
-ifndef KMK_VERSION
- include $(PATH_KBUILD)/gnumake-header.kmk
-endif
-
-
-#
 # This is how we find the closest config.kmk.
 # It's a little hacky but I think it works fine.
@@ -771 +722 @@
 $(error kBuild: no Config.kmk file found! Check the DEPTH: DEPTH='$(DEPTH)' PATH_CURRENT='$(PATH_CURRENT)')
 endif
+
 
 #
@@ -955 +907 @@
 endif # __header_kmk__
 
-