Changeset 1003


Ignore:
Timestamp:
2012-07-19T08:51:33+02:00 (21 months ago)
Author:
moo
Message:

refactor: fix build for optimizer, use mod_* directories

Location:
trunk
Files:
7 added
1 deleted
7 edited
9 copied
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/README

    r896 r1003  
    1 Please check http://xcache.lighttpd.net/ and https://groups.google.com/forum/?fromgroups#!forum/xcache for help 
     1XCache is a fast, stable PHP opcode cacher that has been tested and is now running on production servers under high load. 
     2It is tested (on linux) and supported on all of the latest version of PHP popular release branches. 
     3ThreadSafe/Windows is also perfectly supported. 
     4 
     5Please check http://xcache.lighttpd.net/ and https://groups.google.com/group/xcache for help 
  • trunk/config.m4

    r1001 r1003  
    55  [  --enable-xcache-$2    XCache: $4], no, no) 
    66  if test "$PHP_$3" != "no"; then 
    7     xcache_sources="$xcache_sources submodules/xc_$1.c" 
     7    xcache_sources="$xcache_sources mod_$1/xc_$1.c" 
    88    XCACHE_MODULES="$XCACHE_MODULES $1" 
    99    HAVE_$3=1 
  • trunk/config.w32

    r991 r1003  
    4545        var withval = eval("PHP_XCACHE_" + uname); 
    4646        if (withval != "no") { 
    47             xcache_sources += " submodules/xc_" + name + ".c"; 
     47            xcache_sources += " mod_" + name + "/xc_" + name + ".c"; 
    4848            XCACHE_MODULES += " " + name; 
    4949            STDOUT.WriteLine("Enabling XCache Module: " + name); 
  • trunk/devel/run

    r1002 r1003  
    8181    phpize --clean \ 
    8282    && phpize \ 
    83     && CFLAGS="-Wall -Wno-unused -W -Wshadow -std=gnu99" ./configure --enable-xcache-disassembler --enable-xcache-test --enable-xcache-constant \ 
     83    && CFLAGS="-Wall -Wno-unused -W -Wshadow -std=gnu99" ./configure \ 
     84        --enable-xcache-cacher \ 
     85        --enable-xcache-optimizer \ 
     86        --enable-xcache-encoder \ 
     87        --enable-xcache-decoder \ 
     88        --enable-xcache-disassembler \ 
     89        --enable-xcache-test --enable-xcache-constant \ 
    8490    && make clean all 
    8591    exit 
     
    135141    ;; 
    136142dc) 
    137     exec ./php-cli -c devel.ini ./bin/phpdc.phpr "${args[@]}" | tee decompiled.php 
     143    exec ./php-cli -c devel.ini ./mod_disassembler/bin/phpdc.phpr "${args[@]}" | tee decompiled.php 
    138144    ;; 
    139145dop) 
    140     exec ./php-cli -c devel.ini ./bin/phpdop.phpr "${args[@]}" 
     146    exec ./php-cli -c devel.ini ./mod_disassembler/bin/phpdop.phpr "${args[@]}" 
    141147    ;; 
    142148retest) 
  • trunk/mod_optimizer/xc_optimizer.c

    r1002 r1003  
    33#endif 
    44 
    5 #include "utils.h" 
    6 #include "optimizer.h" 
     5#include "xcache/xc_utils.h" 
     6#include "xc_optimizer.h" 
    77/* the "vector" stack */ 
    8 #include "stack.h" 
     8#include "util/xc_stack.h" 
     9#include "util/xc_trace.h" 
    910#include "xcache_globals.h" 
    1011 
    1112#ifdef XCACHE_DEBUG 
    12 #   include "processor.h" 
    13 #   include "const_string.h" 
     13#error 1 
     14#   include "xc_processor.h" 
     15#   include "xcache/xc_const_string.h" 
    1416#   include "ext/standard/php_var.h" 
    1517#endif 
  • trunk/xcache.c

    r998 r1003  
    2929 
    3030#ifdef HAVE_XCACHE_OPTIMIZER 
    31 #   include "submodules/xc_optimizer.h" 
     31#   include "mod_optimizer/xc_optimizer.h" 
    3232#else 
    3333#   define XCACHE_OPTIMIZER_FUNCTIONS() 
    3434#endif 
    3535#ifdef HAVE_XCACHE_COVERAGER 
    36 #   include "submodules/xc_coverager.h" 
     36#   include "mod_coverager/xc_coverager.h" 
    3737#else 
    3838#   define XCACHE_COVERAGER_FUNCTIONS() 
    3939#endif 
    4040#ifdef HAVE_XCACHE_DISASSEMBLER 
    41 #   include "submodules/xc_disassembler.h" 
     41#   include "mod_disassembler/xc_disassembler.h" 
    4242#else 
    4343#   define XCACHE_DISASSEMBLER_FUNCTIONS() 
  • trunk/xcache/xc_processor.c

    r998 r1003  
    1 #include "../xc_processor.c.h" 
     1#include "xc_processor.c.h" 
  • trunk/xcache/xc_utils.c

    r996 r1003  
    77#endif 
    88#include "xc_opcode_spec.h" 
    9 #include "../util/xc_trace.h" 
     9#include "util/xc_trace.h" 
    1010 
    1111#ifndef max 
Note: See TracChangeset for help on using the changeset viewer.