Changeset 30 in svn for trunk


Ignore:
Timestamp:
2006-05-26T03:32:40Z (9 years ago)
Author:
Xuefer
Message:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.frag

    r24 r30  
    1111
    1212$(XCACHE_STRUCTINFO_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk
    13     $(AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT)
     13    @echo $(XCACHE_STRUCTINFO_OUT) is optional if XCache test is not enabled, feel free if it awk failed to produce it
     14    -$(AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv -f $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT)
    1415
    15 $(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO) $(XCACHE_PROC_SOURCES)
     16$(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO_OUT) $(XCACHE_PROC_SOURCES)
    1617    $(M4) -D srcdir="$(srcdir)" -D builddir="$(builddir)" $(XCACHE_ENABLE_TEST) -E $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp
    1718    mv -f $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT)
  • trunk/config.m4

    r27 r30  
    4545    XCACHE_ENABLE_TEST=-DXCACHE_ENABLE_TEST
    4646    AC_DEFINE([HAVE_XCACHE_TEST], 1, [Define to enable XCache self test])
    47     XCACHE_STRUCTINFO='$(XCACHE_STRUCTINFO_OUT)'
    4847  else
    4948    XCACHE_ENABLE_TEST=
    50     XCACHE_STRUCTINFO=
    5149  fi
    5250  PHP_SUBST([XCACHE_ENABLE_TEST])
    53   PHP_SUBST([XCACHE_STRUCTINFO])
    5451
    5552  AC_PATH_PROGS([AWK], [gawk awk])
  • trunk/config.w32

    r27 r30  
    9292    frag = frag.replace(/ -o /g, " /Fo");
    9393    frag = frag.replace(/mv -f /g, "move ");
     94    frag = frag.replace(/ || /g, "\r\n\tif errorlevel 1 ");
     95    frag = frag.replace(/ && /g, "\r\n\tif not errorlevel 1 ");
    9496    if (indent == '') {
    9597        frag = frag.replace(/\| +\$\(XCACHE_INDENT\)/, '');
     
    104106        ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
    105107        AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
    106         ADD_FLAG("XCACHE_STRUCTINFO", "$(XCACHE_STRUCTINFO_OUT)");
    107108    }
    108109    else {
    109110        ADD_FLAG("XCACHE_ENABLE_TEST", "");
    110         ADD_FLAG("XCACHE_STRUCTINFO", "");
    111111    }
    112112
Note: See TracChangeset for help on using the changeset viewer.