Changeset 362 in kBuild for trunk

Timestamp:

Dec 13, 2005 4:46:52 AM (19 years ago)

Author:

bird

Message:

Adding builtin commands to MSC version.

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (6 diffs)
• kmkbuiltin.c (modified) (2 diffs)
• variable.c (modified) (1 diff)

trunk/src/gmake/Makefile.kmk

@@ -9 +9 @@
 kmk_TEMPLATE        = BIN
 kmk_DEPS            = $(PATH_TARGET)/config.h
+kmk_DEFS.win32      = __WIN32__
 kmk_INCS            = $(PATH_TARGET) .
 #kmk_INCS.win32      = kmkbuiltin/w32
@@ -61 +62 @@
         glob/fnmatch.c \
 
-ifneq ($(BUILD_TARGET),win32)
 #
 # kmkbuiltin commands
@@ -71 +71 @@
         kmkbuiltin/echo.c \
         kmkbuiltin/mkdir.c \
+        kmkbuiltin/setmode.c
+ifneq ($(BUILD_TARGET),win32)
+kmk_SOURCES += \
         kmkbuiltin/rm.c \
         kmkbuiltin/cp.c \
         kmkbuiltin/cp_utils.c \
         \
-        kmkbuiltin/setmode.c \
         kmkbuiltin/strmode.c \
         kmkbuiltin/strlcpy.c
+endif
 
 
@@ -83 +86 @@
 # Standalone kmkbuiltin commands.
 #
+ifneq ($(BUILD_TARGET),win32)
 PROGRAMS += kmk_append kmk_cp kmk_echo kmk_mkdir kmk_rm
+else
+PROGRAMS += kmk_append kmk_echo kmk_mkdir
+endif
 
 kmk_append_TEMPLATE = BIN
@@ -108 +115 @@
         kmkbuiltin/mkdir.c \
         kmkbuiltin/setmode.c
+kmk_mkdir_INCS.win32 = $(PATH_TARGET) .
+kmk_mkdir_DEFS.win32 = HAVE_CONFIG_H
+kmk_mkdir_SOURCES.win32 = \
+        getopt.c \
+        getopt1.c \
 
 kmk_rm_TEMPLATE = BIN
@@ -115 +127 @@
         kmkbuiltin/setmode.c \
         kmkbuiltin/strmode.c
-endif
 
 

trunk/src/gmake/kmkbuiltin.c

@@ -187 +187 @@
     if (!strcmp(pszCmd, "append"))
         rc = kmk_builtin_append(argc, argv, environ);
+#ifndef _MSC_VER
     else if (!strcmp(pszCmd, "cp"))
         rc = kmk_builtin_cp(argc, argv, environ);
     //else if (!strcmp(pszCmd, "chmod"))
     //    rc = kmk_builtin_chmod(argc, argv, environ);
+#endif
     else if (!strcmp(pszCmd, "echo"))
         rc = kmk_builtin_echo(argc, argv, environ);
     else if (!strcmp(pszCmd, "mkdir"))
         rc = kmk_builtin_mkdir(argc, argv, environ);
+#ifndef _MSC_VER
     //else if (!strcmp(pszCmd, "mv"))
     //    rc = kmk_builtin_mv(argc, argv, environ);
@@ -201 +204 @@
     //else if (!strcmp(pszCmd, "rmdir"))
     //    rc = kmk_builtin_rmdir(argc, argv, environ);
+#endif
     else
     {

trunk/src/gmake/variable.c

@@ -685 +685 @@
 #ifdef CONFIG_WITH_KMK_BUILTIN
   /* The supported kMk Builtin commands. */
+#ifdef _MSC_VER
+  (void) define_variable ("KMK_BUILTIN", 11, "append echo mkdir", o_default, 0);
+#else
   (void) define_variable ("KMK_BUILTIN", 11, "append cp echo mkdir rm", o_default, 0);
+#endif 
 #endif