Changeset 578 in kBuild

Timestamp:

Nov 23, 2006 10:36:46 AM (18 years ago)

Author:

bird

Message:

Did code changes for unix installation. Will do install goals when creating the gentoo ebuild. references #6

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• kBuild/header.kmk (modified) (15 diffs)
• src/gmake/main.c (modified) (1 diff)
• src/gmake/variable.c (modified) (1 diff)

trunk/ChangeLog

@@ -3 +3 @@
 2006-11-23:
     - kBuild/header.kmk, kmk:
-        o Proper versioning.
+        o #6: Did code changes for unix installation. Will do install goals when creating the gentoo ebuild.
+        o #5: Proper versioning. (#5)
     - kmk:
         o Support SDK.$(BUILD_TARGET_ARCH) too (only bug).

trunk/kBuild/header.kmk

@@ -267 +267 @@
 endif
 
-
-PATH_TOOLS          := $(PATH_KBUILD)/bin/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
-ifeq ($(wildcard $(PATH_TOOLS)/kmk_ash$(HOSTSUFF_EXE)),)
- ifeq ($(BUILD_TARGET_ARCH),amd64)
-  PATH_TOOLS        := $(PATH_KBUILD)/bin/x86.$(BUILD_PLATFORM)
- endif
- ifeq ($(wildcard $(PATH_TOOLS)/kmk_ash$(HOSTSUFF_EXE)),)
-  ifeq ($(filter-out win64 win nt ,$(BUILD_PLATFORM)),)
-   PATH_TOOLS       := $(PATH_KBUILD)/bin/x86.win32
+ifndef PATH_KBUILD_BIN
+ PATH_KBUILD_BIN    := $(PATH_KBUILD)/bin/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
+ ifeq ($(wildcard $(PATH_KBUILD_BIN)/kmk_ash$(HOSTSUFF_EXE)),)
+  ifeq ($(BUILD_TARGET_ARCH),amd64)
+   PATH_KBUILD_BIN  := $(PATH_KBUILD)/bin/x86.$(BUILD_PLATFORM)
   endif
- endif
- ifeq ($(wildcard $(PATH_TOOLS)/kmk_ash$(HOSTSUFF_EXE)),)
-  # give up
-  PATH_TOOLS        := $(PATH_KBUILD)/bin/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
+  ifeq ($(wildcard $(PATH_KBUILD_BIN)/kmk_ash$(HOSTSUFF_EXE)),)
+   ifeq ($(filter-out win64 win nt ,$(BUILD_PLATFORM)),)
+    PATH_KBUILD_BIN := $(PATH_KBUILD)/bin/x86.win32
+   endif
+  endif
+  ifeq ($(wildcard $(PATH_KBUILD_BIN)/kmk_ash$(HOSTSUFF_EXE)),)
+   # give up
+   PATH_KBUILD_BIN  := $(PATH_KBUILD)/bin/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
+  endif
  endif
 endif
@@ -325 +326 @@
 #
 ifeq ($(MAKE),kmk)
-MAKE        := $(PATH_TOOLS)/kmk$(HOSTSUFF_EXE)
-endif
-
-DEP_EXT     := $(PATH_TOOLS)/kDep$(HOSTSUFF_EXE)
+MAKE        := $(PATH_KBUILD_BIN)/kmk$(HOSTSUFF_EXE)
+endif
+
+DEP_EXT     := $(PATH_KBUILD_BIN)/kDep$(HOSTSUFF_EXE)
 ifeq ($(filter kDep,$(KMK_BUILTIN)),kDep)
 DEP         := kmk_builtin_kDep
@@ -335 +336 @@
 endif
 
-DEP_IDB_EXT := $(PATH_TOOLS)/kDepIDB$(HOSTSUFF_EXE)
+DEP_IDB_EXT := $(PATH_KBUILD_BIN)/kDepIDB$(HOSTSUFF_EXE)
 ifeq ($(filter kDepPre,$(KMK_BUILTIN)),kDepIDB)
 DEP_IDB     := $(if kmk_builtin_kDepIDB
@@ -342 +343 @@
 endif
 
-DEP_PRE_EXT := $(PATH_TOOLS)/kDepPre$(HOSTSUFF_EXE)
+DEP_PRE_EXT := $(PATH_KBUILD_BIN)/kDepPre$(HOSTSUFF_EXE)
 ifeq ($(filter kDepPre,$(KMK_BUILTIN)),kDepPre)
 DEP_PRE     := $(if kmk_builtin_kDepPre
@@ -349 +350 @@
 endif
 
-APPEND_EXT  := $(PATH_TOOLS)/kmk_append$(HOSTSUFF_EXE)
+APPEND_EXT  := $(PATH_KBUILD_BIN)/kmk_append$(HOSTSUFF_EXE)
 ifeq ($(filter append,$(KMK_BUILTIN)),append)
 APPEND      := kmk_builtin_append
@@ -356 +357 @@
 endif
 
-CAT_EXT     := $(PATH_TOOLS)/kmk_cat$(HOSTSUFF_EXE)
+CAT_EXT     := $(PATH_KBUILD_BIN)/kmk_cat$(HOSTSUFF_EXE)
 ifeq ($(filter cat,$(KMK_BUILTIN)),cat)
 CAT         := kmk_builtin_cat
@@ -363 +364 @@
 endif
 
-CP_EXT      := $(PATH_TOOLS)/kmk_cp$(HOSTSUFF_EXE)
+CP_EXT      := $(PATH_KBUILD_BIN)/kmk_cp$(HOSTSUFF_EXE)
 ifeq ($(filter cp,$(KMK_BUILTIN)),cp)
 CP          := kmk_builtin_cp
@@ -370 +371 @@
 endif
 
-ECHO_EXT    := $(PATH_TOOLS)/kmk_echo$(HOSTSUFF_EXE)
+ECHO_EXT    := $(PATH_KBUILD_BIN)/kmk_echo$(HOSTSUFF_EXE)
 ifeq ($(filter echo,$(KMK_BUILTIN)),echo)
 ECHO        := kmk_builtin_echo
@@ -377 +378 @@
 endif
 
-INSTALL_EXT := $(PATH_TOOLS)/kmk_install$(HOSTSUFF_EXE)
+INSTALL_EXT := $(PATH_KBUILD_BIN)/kmk_install$(HOSTSUFF_EXE)
 ifeq ($(filter install,$(KMK_BUILTIN)),install)
 INSTALL     := kmk_builtin_install
@@ -384 +385 @@
 endif
 
-LN_EXT      := $(PATH_TOOLS)/kmk_ln$(HOSTSUFF_EXE)
+LN_EXT      := $(PATH_KBUILD_BIN)/kmk_ln$(HOSTSUFF_EXE)
 ifeq ($(filter ln,$(KMK_BUILTIN)),ln)
 LN          := kmk_builtin_ln
@@ -391 +392 @@
 endif
 
-MKDIR_EXT   := $(PATH_TOOLS)/kmk_mkdir$(HOSTSUFF_EXE)
+MKDIR_EXT   := $(PATH_KBUILD_BIN)/kmk_mkdir$(HOSTSUFF_EXE)
 ifeq ($(filter mkdir,$(KMK_BUILTIN)),mkdir)
 MKDIR       := kmk_builtin_mkdir
@@ -398 +399 @@
 endif
 
-MV_EXT      := $(PATH_TOOLS)/kmk_mv$(HOSTSUFF_EXE)
+MV_EXT      := $(PATH_KBUILD_BIN)/kmk_mv$(HOSTSUFF_EXE)
 ifeq ($(filter mv,$(KMK_BUILTIN)),mv)
 MV          := kmk_builtin_mv
@@ -405 +406 @@
 endif
 
-RM_EXT      := $(PATH_TOOLS)/kmk_rm$(HOSTSUFF_EXE)
+RM_EXT      := $(PATH_KBUILD_BIN)/kmk_rm$(HOSTSUFF_EXE)
 ifeq ($(filter rm,$(KMK_BUILTIN)),rm)
 RM          := kmk_builtin_rm
@@ -412 +413 @@
 endif
 
-SED_EXT     := $(PATH_TOOLS)/kmk_sed$(HOSTSUFF_EXE)
+SED_EXT     := $(PATH_KBUILD_BIN)/kmk_sed$(HOSTSUFF_EXE)
 ifeq ($(filter sed,$(KMK_BUILTIN)),sed)
 SED         := kmk_builtin_sed
@@ -420 +421 @@
 
 # Our default shell is the Almquist shell from *BSD.
-ASH         := $(PATH_TOOLS)/kmk_ash$(HOSTSUFF_EXE)
+ASH         := $(PATH_KBUILD_BIN)/kmk_ash$(HOSTSUFF_EXE)
 MAKESHELL   := $(ASH)
 SHELL       := $(ASH)

trunk/src/gmake/main.c

@@ -3070 +3070 @@
 
 #ifdef KMK
+# ifdef PATH_KBUILD
+  printf (_("%s\n\
+%sPATH_KBUILD default:     '%s'\n\
+%sPATH_KBUILD_BIN default: '%s'\n"),
+          precede, precede, PATH_KBUILD, precede, PATH_KBUILD_BIN);
+# endif /* PATH_KBUILD */
   if (!remote_description || *remote_description == '\0')
     printf (_("\n%sThis program is built for %s/%s/%s [" __DATE__ " " __TIME__ "]\n"),

trunk/src/gmake/variable.c

@@ -1006 +1006 @@
 
   /* The build platform defaults. */
-  envvar = getenv("BUILD_PLATFORM");
+  envvar = getenv ("BUILD_PLATFORM");
   if (!envvar)
       (void) define_variable ("BUILD_PLATFORM", sizeof("BUILD_PLATFORM") - 1, 
                               BUILD_PLATFORM, o_default, 0);
-  envvar = getenv("BUILD_PLATFORM_ARCH");
+  envvar = getenv ("BUILD_PLATFORM_ARCH");
   if (!envvar)
       (void) define_variable ("BUILD_PLATFORM_ARCH", sizeof("BUILD_PLATFORM_ARCH") - 1, 
                               BUILD_PLATFORM_ARCH, o_default, 0);
-  envvar = getenv("BUILD_PLATFORM_CPU");
+  envvar = getenv ("BUILD_PLATFORM_CPU");
   if (!envvar)
       (void) define_variable ("BUILD_PLATFORM_CPU", sizeof("BUILD_PLATFORM_CPU") - 1, 
                               BUILD_PLATFORM_CPU, o_default, 0);
+
+# ifdef PATH_KBUILD
+  /* define the installed. */
+  envvar = getenv("PATH_KBUILD");
+  if (!envvar)
+  {
+      (void) define_variable ("PATH_KBUILD", sizeof("PATH_KBUILD") - 1, 
+                              PATH_KBUILD, o_default, 0);
+      envvar = getenv("PATH_KBUILD_BIN");
+      if (!envvar)
+          (void) define_variable ("PATH_KBUILD_BIN", sizeof("PATH_KBUILD_BIN") - 1, 
+                                  PATH_KBUILD_BIN, o_default, 0);
+  }
+# endif 
+
 
   /* Define KMK_FEATURES to indicate various working KMK features. */