Changeset 552 for trunk/src/gmake

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.

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (13 diffs)
• variable.c (modified) (1 diff)

trunk/src/gmake/Makefile.kmk

@@ -10 +10 @@
 kmk_DEPS = $(PATH_TARGET)/config.h
 kmk_INCS = $(PATH_TARGET) .
-#kmk_INCS.win32      = kmkbuiltin/w32
+#ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
+#kmk_INCS += kmkbuiltin/w32
+#endif
 
 kmk_DEFS = \
@@ -56 +58 @@
         kbuild.c
 
-kmk_SOURCES.win32 = \
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
+kmk_SOURCES += \
         getopt.c \
         getopt1.c \
@@ -67 +70 @@
         w32/compat/dirent.c \
         w32/pathstuff.c
+endif
 
 kmk_SOURCES.freebsd = \
@@ -92 +96 @@
         kmkbuiltin/strlcpy.c
 
-kmk_SOURCES.win32 += \
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
+kmk_SOURCES += \
         kmkbuiltin/mscfakes.c \
         kmkbuiltin/fts.c
-
+endif
 
 #
@@ -116 +121 @@
         kmkbuiltin/strlcpy.c \
         kmkbuiltin/err.c
-kmk_cp_INCS.win32 = $(PATH_TARGET) .
-kmk_cp_DEFS.win32 = HAVE_CONFIG_H
-kmk_cp_SOURCES.win32 = \
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
+kmk_cp_INCS += $(PATH_TARGET) .
+kmk_cp_DEFS += HAVE_CONFIG_H
+kmk_cp_SOURCES += \
         kmkbuiltin/mscfakes.c \
         kmkbuiltin/fts.c \
@@ -124 +130 @@
         getopt.c \
         getopt1.c
+endif
 
 kmk_echo_TEMPLATE = BIN
@@ -129 +136 @@
 kmk_echo_SOURCES = \
         kmkbuiltin/echo.c
-kmk_echo_SOURCES.win32 = \
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
+kmk_echo_SOURCES += \
         kmkbuiltin/mscfakes.c \
         kmkbuiltin/err.c
+endif
 
 kmk_install_TEMPLATE = BIN
@@ -140 +149 @@
         kmkbuiltin/strmode.c \
         kmkbuiltin/setmode.c
-kmk_install_INCS.win32 = $(PATH_TARGET) .
-kmk_install_DEFS.win32 = HAVE_CONFIG_H
-kmk_install_SOURCES.win32 = \
-        kmkbuiltin/mscfakes.c \
-        getopt.c \
-        getopt1.c
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
+kmk_install_INCS += $(PATH_TARGET) .
+kmk_install_DEFS += HAVE_CONFIG_H
+kmk_install_SOURCES += \
+        kmkbuiltin/mscfakes.c \
+        getopt.c \
+        getopt1.c
+endif
 
 kmk_ln_TEMPLATE = BIN
@@ -152 +163 @@
         kmkbuiltin/ln.c \
         kmkbuiltin/err.c
-kmk_ln_INCS.win32 = $(PATH_TARGET) .
-kmk_ln_DEFS.win32 = HAVE_CONFIG_H
-kmk_ln_SOURCES.win32 = \
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
+kmk_ln_INCS += $(PATH_TARGET) .
+kmk_ln_DEFS += HAVE_CONFIG_H
+kmk_ln_SOURCES += \
         kmkbuiltin/mscfakes.c\
         getopt.c \
         getopt1.c
+endif
 
 kmk_mkdir_TEMPLATE = BIN
@@ -165 +178 @@
         kmkbuiltin/err.c \
         kmkbuiltin/setmode.c
-kmk_mkdir_INCS.win32 = $(PATH_TARGET) .
-kmk_mkdir_DEFS.win32 = HAVE_CONFIG_H
-kmk_mkdir_SOURCES.win32 = \
-        kmkbuiltin/mscfakes.c \
-        getopt.c \
-        getopt1.c
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
+kmk_mkdir_INCS += $(PATH_TARGET) .
+kmk_mkdir_DEFS += HAVE_CONFIG_H
+kmk_mkdir_SOURCES += \
+        kmkbuiltin/mscfakes.c \
+        getopt.c \
+        getopt1.c
+endif
 
 kmk_rm_TEMPLATE = BIN
@@ -178 +193 @@
         kmkbuiltin/err.c \
         kmkbuiltin/strmode.c
-kmk_rm_INCS.win32 = $(PATH_TARGET) .
-kmk_rm_DEFS.win32 = HAVE_CONFIG_H
-kmk_rm_SOURCES.win32 = \
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
+kmk_rm_INCS += $(PATH_TARGET) .
+kmk_rm_DEFS += HAVE_CONFIG_H
+kmk_rm_SOURCES += \
         kmkbuiltin/mscfakes.c\
         getopt.c \
         getopt1.c
+endif
 
 
@@ -223 +240 @@
         remote-stub.c
 
-kmk_gmake_SOURCES.win32 = \
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
+kmk_gmake_SOURCES += \
         getopt.c \
         getopt1.c \
@@ -234 +252 @@
         w32/compat/dirent.c \
         w32/pathstuff.c
+endif
 
 kmk_gmake_SOURCES.freebsd = \

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