Changeset 30 for trunk

Timestamp:

2006-05-26T05:32:40+02:00 (7 years ago)

Author:

moo

Message:

use mkstructinfo no matter if test is enabled, but ignore the awk error

Location:

trunk

Files:

• Makefile.frag (modified) (1 diff)
• config.m4 (modified) (1 diff)
• config.w32 (modified) (2 diffs)

trunk/Makefile.frag

@@ -11 +11 @@
 
 $(XCACHE_STRUCTINFO_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk
-    $(AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT)
+    @echo $(XCACHE_STRUCTINFO_OUT) is optional if XCache test is not enabled, feel free if it awk failed to produce it
+    -$(AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv -f $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT)
 
-$(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO) $(XCACHE_PROC_SOURCES)
+$(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO_OUT) $(XCACHE_PROC_SOURCES)
     $(M4) -D srcdir="$(srcdir)" -D builddir="$(builddir)" $(XCACHE_ENABLE_TEST) -E $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp
     mv -f $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT)

trunk/config.m4

@@ -45 +45 @@
     XCACHE_ENABLE_TEST=-DXCACHE_ENABLE_TEST
     AC_DEFINE([HAVE_XCACHE_TEST], 1, [Define to enable XCache self test])
-    XCACHE_STRUCTINFO='$(XCACHE_STRUCTINFO_OUT)'
   else
     XCACHE_ENABLE_TEST=
-    XCACHE_STRUCTINFO=
   fi
   PHP_SUBST([XCACHE_ENABLE_TEST])
-  PHP_SUBST([XCACHE_STRUCTINFO])
 
   AC_PATH_PROGS([AWK], [gawk awk])

trunk/config.w32

@@ -92 +92 @@
     frag = frag.replace(/ -o /g, " /Fo");
     frag = frag.replace(/mv -f /g, "move ");
+    frag = frag.replace(/ || /g, "\r\n\tif errorlevel 1 ");
+    frag = frag.replace(/ && /g, "\r\n\tif not errorlevel 1 ");
     if (indent == '') {
         frag = frag.replace(/\| +\$\(XCACHE_INDENT\)/, '');
@@ -104 +106 @@
         ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
         AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
-        ADD_FLAG("XCACHE_STRUCTINFO", "$(XCACHE_STRUCTINFO_OUT)");
     }
     else {
         ADD_FLAG("XCACHE_ENABLE_TEST", "");
-        ADD_FLAG("XCACHE_STRUCTINFO", "");
     }