Changeset 522 in kBuild

Timestamp:

Sep 16, 2006 6:04:15 AM (18 years ago)

Author:

bird

Message:

kmk_ash wants batch files on windows or the double quotes will get screwed up.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• src/gmake/Makefile.kmk (modified) (1 diff)
• src/gmake/main.c (modified) (1 diff)

trunk/ChangeLog

@@ -3 +3 @@
 2006-09-16:
     - src/gmake:
+        o kmk_ash wants batch files on windows or the double quotes will get screwed up.
+        o Make sure kmk_builtin commands don't get batch files and odd weird stuff.
         o Cleaning up the modifications. Changes are now either configurable 
           or marked, and dead stuff has been removed (dll shell).

trunk/src/gmake/Makefile.kmk

@@ -212 +212 @@
         echo "4"
 
+# shell double and single quoting check.
+test_shell_quoting:
+        $(ECHO_EXT) "double quoted sTrInG" | $(SED_EXT) -e "s/sTrInG/string/g"
+        $(ECHO_EXT) 'single quoted sTrInG' | $(SED_EXT) -e 's/sTrInG/string/g'
+        $(ECHO) "This string should not be printed with double quotes."
+        $(ECHO) 'This string should not be printed with single quotes.'

trunk/src/gmake/main.c

@@ -842 +842 @@
   }
 
+#ifdef KMK
+  /* WORKAROUND:
+    With GNU Make 3.81, this kludge was necessary to get double quotes 
+    working correctly again (worked fine with the 3.81beta1 code). 
+    beta1 was forcing batch_mode_shell I think, so let's enforce that 
+    for the kBuild shell. */
+  if (sh_found && strstr(default_shell, "kmk_ash")) {
+      unixy_shell = 1;
+      batch_mode_shell = 1;
+  } else
+#endif 
   /* naive test */
   if (!unixy_shell && sh_found &&