Changeset 1095 for trunk


Ignore:
Timestamp:
2012-07-31T18:21:50+02:00 (3 years ago)
Author:
moo
Message:

prepare is now a Makefile

Location:
trunk
Files:
2 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/devel/prepare.cfg.example

    r998 r1095  
    44PHP5_1_DIR=
    55PHP5_3_DIR=
     6PHP5_4_DIR=
    67PHP6_x_DIR=
    78
  • trunk/devel/run

    r1062 r1095  
    22# this script is for developers only
    33set -e
     4MAKE=/usr/bin/make
    45
    56. devel/run.cfg
     
    1011case "$type" in
    1112prep*)
    12     exec ./devel/prepare
     13    shift
     14    exec $MAKE -f devel/prepare.mak "$@"
     15    ;;
     16tags)
     17    rm -f tags
     18    shift
     19    exec $MAKE -f devel/prepare.mak tags "$@"
    1320    ;;
    1421dep*)
     
    6067    ;;
    6168xtest)
    62     exec /usr/bin/make -f devel/test.mak
    63     ;;
    64 tags)
    65     exec ./devel/prepare tags
     69    exec $MAKE -f devel/test.mak
    6670    ;;
    6771esac
     
    102106phpize)
    103107    if [[ -r Makefile ]]; then
    104         make xcachesvnclean || true
     108        $MAKE xcachesvnclean || true
    105109    fi
    106110    ;;
     
    146150esac
    147151
    148 LANG=C /usr/bin/make $MAKEOPTS "${MAKEARGS[@]}" 2>&1 \
     152LANG=C $MAKE $MAKEOPTS "${MAKEARGS[@]}" 2>&1 \
    149153| sed -ur \
    150154    -e 's#Werror=implicit-function-declaration#We/rror=i/mplicit-function-declaration#' \
     
    207211    ;;
    208212retest)
    209     exec make xcachetest "$@" TESTS="`grep '^/.*\.phpt$' php_test_results_*.txt | uniq | xargs`"
     213    exec $MAKE xcachetest "$@" TESTS="`grep '^/.*\.phpt$' php_test_results_*.txt | uniq | xargs`"
    210214    ;;
    211215test)
    212216    case "${args[0]}" in
    213217    *.phpt)
    214         exec make xcachetest TEST_ARGS=-v TESTS="${args[*]}"
     218        exec $MAKE xcachetest TEST_ARGS=-v TESTS="${args[*]}"
    215219        ;;
    216220    */)
    217         exec make xcachetest TESTS="${args[@]}"
     221        exec $MAKE xcachetest TESTS="${args[@]}"
    218222        ;;
    219223    *)
    220         exec make xcachetest
     224        exec $MAKE xcachetest
    221225        ;;
    222226    esac
  • trunk/xcache/xc_const_string.c

    r982 r1095  
    6666#elif defined(ZEND_ENGINE_2_4)
    6767#   include "xc_const_string_opcodes_php5.4.h"
     68#elif defined(ZEND_ENGINE_2_3)
     69#   include "xc_const_string_opcodes_php5.3.h"
    6870#elif defined(ZEND_ENGINE_2_1)
    6971#   include "xc_const_string_opcodes_php5.1.h"
  • trunk/xcache/xc_const_string_opcodes_php5.0.h

    r982 r1095  
    1 /* size = 149 */
     1/* size = 150 */
    22static const char *const xc_opcode_names[] = {
    33/* 0 */ "NOP",
  • trunk/xcache/xc_const_string_opcodes_php5.1.h

    r982 r1095  
    1 /* size = 154 */
     1/* size = 151 */
    22static const char *const xc_opcode_names[] = {
    33/* 0 */ "NOP",
     
    7070/* 67 */    "SEND_REF",
    7171/* 68 */    "NEW",
    72 /* 69 */    "INIT_NS_FCALL_BY_NAME",
     72/* 69 */    "UNDEF",
    7373/* 70 */    "FREE",
    7474/* 71 */    "INIT_ARRAY",
     
    101101/* 98 */    "FETCH_DIM_TMP_VAR",
    102102/* 99 */    "FETCH_CONSTANT",
    103 /* 100 */   "GOTO",
     103/* 100 */   "UNDEF",
    104104/* 101 */   "EXT_STMT",
    105105/* 102 */   "EXT_FCALL_BEGIN",
     
    144144/* 141 */   "DECLARE_FUNCTION",
    145145/* 142 */   "RAISE_ABSTRACT_ERROR",
    146 /* 143 */   "DECLARE_CONST",
     146/* 143 */   "UNDEF",
    147147/* 144 */   "ADD_INTERFACE",
    148 /* 145 */   "DECLARE_INHERITED_CLASS_DELAYED",
     148/* 145 */   "UNDEF",
    149149/* 146 */   "VERIFY_ABSTRACT_CLASS",
    150150/* 147 */   "ASSIGN_DIM",
    151151/* 148 */   "ISSET_ISEMPTY_PROP_OBJ",
    152152/* 149 */   "HANDLE_EXCEPTION",
    153 /* 150 */   "USER_OPCODE",
    154 /* 151 */   "UNDEF",
    155 /* 152 */   "JMP_SET",
    156 /* 153 */   "DECLARE_LAMBDA_FUNCTION"
     153/* 150 */   "USER_OPCODE"
    157154};
Note: See TracChangeset for help on using the changeset viewer.