Changeset 1419 in svn for branches/3.0


Ignore:
Timestamp:
2013-10-10T07:42:34Z (23 months ago)
Author:
Xuefer
Message:

merge from trunk, fixed #330: fix win32 build with no indent.exe nor cat.exe

Location:
branches/3.0
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0

    • Property svn:mergeinfo changed
      /trunkmerged: 1418
  • branches/3.0/ChangeLog

    r1395 r1419  
    55   * fixed #324: xcache.readonly_protection = Off cause SEGV under mass concurrent
    66   * fixed #323: refix locking impl for threaded env
     7 * build
     8   * win32: fix build with no indent.exe nor cat.exe
    79
    8103.0.3 2013-06-18
  • branches/3.0/config.w32

    r1367 r1419  
    131131    frag = frag.replace(/processor\//g,      "processor\\");
    132132    frag = frag.replace(/\.lo:/g, ".obj:");
    133     frag = frag.replace(/.*\$\(CC\).* -E (.*) -o (.*)/, ccrule + " /E $1 > $2");
     133    frag = frag.replace(/.*\$\(CC\).* -E (.*) -o (.*)/g, ccrule + " /E $1 > $2");
    134134    frag = frag.replace(/ -o /g, " /Fo");
    135135    frag = frag.replace(/cp /g, "copy ");
     
    138138    frag = frag.replace(/ && /g, "\r\n\tif not errorlevel 1 ");
    139139    if (indent == '') {
    140         frag = frag.replace(/\| +\$\(XCACHE_INDENT\)/, '');
    141         frag = frag.replace(/\$\(XCACHE_INDENT\) < /, 'type ');
     140        frag = frag.replace(/\| *\$\(XCACHE_INDENT\)/g, '');
     141        frag = frag.replace(/\$\(XCACHE_INDENT\) *< */g, 'type ');
    142142    }
    143143    MFO.WriteLine(frag);
Note: See TracChangeset for help on using the changeset viewer.