Changeset 1526 in kBuild for trunk

Timestamp:

Apr 13, 2008 2:18:58 AM (17 years ago)

Author:

bird

Message:

Print the revision in the version info.

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• kmkbuiltin/kbuild_version.c (modified) (1 diff)
• main.c (modified) (2 diffs)

trunk/src/kmk/Makefile.am

@@ -133 +133 @@
         -DKBUILD_HOST_CPU=\"$(BUILD_TARGET_CPU)\" \
         \
+        -DKBUILD_SVN_REV=1 \
         -DKBUILD_VERSION_MAJOR=0 \
         -DKBUILD_VERSION_MINOR=1 \
-        -DKBUILD_VERSION_PATCH=2 \
+        -DKBUILD_VERSION_PATCH=3 \
         \
         -DCONFIG_WITH_KMK_BUILTIN \

trunk/src/kmk/Makefile.kmk

@@ -35 +35 @@
 TEMPLATE_BIN-KMK = Template for src/gmake binaries
 TEMPLATE_BIN-KMK_EXTENDS = BIN
-TEMPLATE_BIN-KMK_DEFS = HAVE_CONFIG_H $(TEMPLATE_BIN_DEFS)
+TEMPLATE_BIN-KMK_DEFS = \
+        HAVE_CONFIG_H \
+        $(TEMPLATE_BIN_DEFS) \
+        KBUILD_SVN_REV=$(KBUILD_SVN_REV)
 TEMPLATE_BIN-KMK_DEPS = $(PATH_TARGET)/config.h
 TEMPLATE_BIN-KMK_CLEAN = $(TEMPLATE_BIN-KMK_DEPS)

trunk/src/kmk/kmkbuiltin/kbuild_version.c

@@ -48 +48 @@
         tmp = strchr(argv0, '\0');
 
-    printf("%.*s - kBuild version %d.%d.%d\n",
+    printf("%.*s - kBuild version %d.%d.%d (r%u)\n",
            tmp - argv0, argv0,
-           KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH);
+           KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH, 
+           KBUILD_SVN_REV);
     return 0;
 }

trunk/src/kmk/main.c

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