Changeset 552 for trunk/src/gmake/variable.c

Timestamp:

Sep 24, 2006, 9:37:41 AM (19 years ago)

Author:

bird

Message:

• kBuild/footer.kmk:

o Recursive template inheritance.

• kBuild/header.kmk, kBuild/footer.kmk:

o Removed some checks for features which are present in both gmake 3.81 and kmk.

Anyone trying to bootstrap kBuild will have to build gmake 3.81 first.

• Config.kmk, src/gmake:

o Allow all kinds of ways of saying Windows in BUILD_TARGET.

• kBuild/bin/x86.win32/:

o Rebuilt kmk.exe.

• kBuild/bin/x86.os2/:

o Added kDepPre.exe and kDepIDB.exe.
o Rebuilt kmk.exe and kmk_gmake.exe.

• src/gmake:

o Update KMK_FEATURES to include the optimizations from earlier this week.

File:

• trunk/src/gmake/variable.c (modified) (1 diff)

trunk/src/gmake/variable.c ¶

@@ -988 +988 @@
 
   /* Define KMK_FEATURES to indicate various working KMK features. */
-  (void) define_variable ("KMK_FEATURES", 12, "abspath toupper tolower", o_default, 0);
-#endif
+# if defined(CONFIG_WITH_TOUPPER_TOLOWER) \
+  && defined(CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE) \
+  && defined(KMK_HELPERS)
+  (void) define_variable ("KMK_FEATURES", 12, 
+                          "abspath"
+                          " toupper tolower"
+                          " comp-vars"
+                          " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one"
+                          , o_default, 0);
+# else /* MSC can't deal with strings mixed with #if/#endif, thus the slow way. */
+  strcpy(buf, "abspath");
+#  if defined(CONFIG_WITH_TOUPPER_TOLOWER)
+  strcat(buf, " toupper tolower");
+#  endif
+#  if defined(CONFIG_WITH_VALUE_LENGTH) && defined(CONFIG_WITH_COMPARE)
+  strcat(buf, " comp-vars");
+#  endif 
+#  ifdef KMK_HELPERS
+  strcat(buf, " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one");
+#  endif
+  (void) define_variable ("KMK_FEATURES", 12, buf, o_default, 0);
+# endif 
+#endif /* KMK */
 
 #ifdef CONFIG_WITH_KMK_BUILTIN