Changeset 576 in kBuild for trunk/src/gmake

Timestamp:

Nov 23, 2006 9:58:23 AM (18 years ago)

Author:

bird

Message:

versioning. fixes #5

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (1 diff)
• main.c (modified) (2 diffs)
• variable.c (modified) (3 diffs)

trunk/src/gmake/Makefile.kmk

@@ -33 +33 @@
         CONFIG_WITH_OPTIMIZATION_HACKS \
         CONFIG_WITH_VALUE_LENGTH \
-        CONFIG_WITH_COMPARE
+        CONFIG_WITH_COMPARE \
+        \
+        BUILD_PLATFORM=\"$(BUILD_TARGET)\" \
+        BUILD_PLATFORM_ARCH=\"$(BUILD_TARGET_ARCH)\" \
+        BUILD_PLATFORM_CPU=\"$(BUILD_TARGET_CPU)\"
 
 kmk_SOURCES = \

trunk/src/gmake/main.c

@@ -3033 +3033 @@
 
 #ifdef KMK
-  printf ("%skmk - The kBuild Make Program\n\
+  printf ("%skBuild Make %d.%d.%d\n\
 \n\
 %sBased on GNU Make %s:\n\
@@ -3046 +3046 @@
 %s Copyright (c) 1998  Todd C. Miller <[email protected]>\n\
 %s\n",
-          precede, precede, version_string, precede, precede, precede,
-          precede, precede, precede, precede, precede);
+          precede, KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH,
+          precede, version_string, 
+          precede, precede, precede, precede, precede, precede, precede, precede);
 #else
   printf ("%sGNU Make %s\n\

trunk/src/gmake/variable.c

@@ -971 +971 @@
   register struct variable *v;
   char buf[200];
+#ifdef KMK
+  const char *envvar;
+#endif 
 
   sprintf (buf, "%u", makelevel);
@@ -986 +989 @@
   /* Define KMK_VERSION to indicate kMk. */
   (void) define_variable ("KMK_VERSION", 11, buf, o_default, 0);
+
+  /* Define KBUILD_VERSION* */
+  sprintf (buf, "%d", KBUILD_VERSION_MAJOR);
+  (void) define_variable ("KBUILD_VERSION_MAJOR", sizeof("KBUILD_VERSION_MAJOR") - 1, 
+                          buf, o_default, 0);
+  sprintf (buf, "%d", KBUILD_VERSION_MINOR);
+  (void) define_variable ("KBUILD_VERSION_MINOR", sizeof("KBUILD_VERSION_MINOR") - 1, 
+                          buf, o_default, 0);
+  sprintf (buf, "%d", KBUILD_VERSION_PATCH);
+  (void) define_variable ("KBUILD_VERSION_PATCH", sizeof("KBUILD_VERSION_PATCH") - 1, 
+                          buf, o_default, 0);
+
+  sprintf (buf, "%d.%d.%d", KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH);
+  (void) define_variable ("KBUILD_VERSION", sizeof("KBUILD_VERSION") - 1, 
+                          buf, o_default, 0);
+
+  /* The build platform defaults. */
+  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");
+  if (!envvar)
+      (void) define_variable ("BUILD_PLATFORM_ARCH", sizeof("BUILD_PLATFORM_ARCH") - 1, 
+                              BUILD_PLATFORM_ARCH, o_default, 0);
+  envvar = getenv("BUILD_PLATFORM_CPU");
+  if (!envvar)
+      (void) define_variable ("BUILD_PLATFORM_CPU", sizeof("BUILD_PLATFORM_CPU") - 1, 
+                              BUILD_PLATFORM_CPU, o_default, 0);
 
   /* Define KMK_FEATURES to indicate various working KMK features. */
@@ -1010 +1042 @@
   (void) define_variable ("KMK_FEATURES", 12, buf, o_default, 0);
 # endif 
+
 #endif /* KMK */