Changeset 1095

Timestamp:

2012-07-31T18:21:50+02:00 (10 months ago)

Author:

moo

Message:

prepare is now a Makefile

Location:

trunk

Files:

• devel/prepare (deleted)
• devel/prepare.cfg.example (modified) (1 diff)
• devel/prepare.mak (added)
• devel/run (modified) (6 diffs)
• xcache/xc_const_string.c (modified) (1 diff)
• xcache/xc_const_string_opcodes_php5.0.h (modified) (1 diff)
• xcache/xc_const_string_opcodes_php5.1.h (modified) (4 diffs)
• xcache/xc_const_string_opcodes_php5.3.h (added)

trunk/devel/prepare.cfg.example

@@ -4 +4 @@
 PHP5_1_DIR=
 PHP5_3_DIR=
+PHP5_4_DIR=
 PHP6_x_DIR=
 

trunk/devel/run

@@ -2 +2 @@
 # this script is for developers only
 set -e
+MAKE=/usr/bin/make
 
 . devel/run.cfg
@@ -10 +11 @@
 case "$type" in
 prep*)
-    exec ./devel/prepare
+    shift
+    exec $MAKE -f devel/prepare.mak "$@"
+    ;;
+tags)
+    rm -f tags
+    shift
+    exec $MAKE -f devel/prepare.mak tags "$@"
     ;;
 dep*)
@@ -60 +67 @@
     ;;
 xtest)
-    exec /usr/bin/make -f devel/test.mak
-    ;;
-tags)
-    exec ./devel/prepare tags
+    exec $MAKE -f devel/test.mak
     ;;
 esac
@@ -102 +106 @@
 phpize)
     if [[ -r Makefile ]]; then
-        make xcachesvnclean || true
+        $MAKE xcachesvnclean || true
     fi
     ;;
@@ -146 +150 @@
 esac
 
-LANG=C /usr/bin/make $MAKEOPTS "${MAKEARGS[@]}" 2>&1 \
+LANG=C $MAKE $MAKEOPTS "${MAKEARGS[@]}" 2>&1 \
 | sed -ur \
     -e 's#Werror=implicit-function-declaration#We/rror=i/mplicit-function-declaration#' \
@@ -207 +211 @@
     ;;
 retest)
-    exec make xcachetest "$@" TESTS="`grep '^/.*\.phpt$' php_test_results_*.txt | uniq | xargs`"
+    exec $MAKE xcachetest "$@" TESTS="`grep '^/.*\.phpt$' php_test_results_*.txt | uniq | xargs`"
     ;;
 test)
     case "${args[0]}" in
     *.phpt)
-        exec make xcachetest TEST_ARGS=-v TESTS="${args[*]}"
+        exec $MAKE xcachetest TEST_ARGS=-v TESTS="${args[*]}"
         ;;
     */)
-        exec make xcachetest TESTS="${args[@]}"
+        exec $MAKE xcachetest TESTS="${args[@]}"
         ;;
     *)
-        exec make xcachetest
+        exec $MAKE xcachetest
         ;;
     esac

trunk/xcache/xc_const_string.c

@@ -66 +66 @@
 #elif defined(ZEND_ENGINE_2_4)
 #   include "xc_const_string_opcodes_php5.4.h"
+#elif defined(ZEND_ENGINE_2_3)
+#   include "xc_const_string_opcodes_php5.3.h"
 #elif defined(ZEND_ENGINE_2_1)
 #   include "xc_const_string_opcodes_php5.1.h"

trunk/xcache/xc_const_string_opcodes_php5.0.h

@@ -1 @@
-/* size = 149 */
+/* size = 150 */
 static const char *const xc_opcode_names[] = {
 /* 0 */ "NOP",

trunk/xcache/xc_const_string_opcodes_php5.1.h

@@ -1 @@
-/* size = 154 */
+/* size = 151 */
 static const char *const xc_opcode_names[] = {
 /* 0 */ "NOP",
@@ -70 +70 @@
 /* 67 */    "SEND_REF",
 /* 68 */    "NEW",
-/* 69 */    "INIT_NS_FCALL_BY_NAME",
+/* 69 */    "UNDEF",
 /* 70 */    "FREE",
 /* 71 */    "INIT_ARRAY",
@@ -101 +101 @@
 /* 98 */    "FETCH_DIM_TMP_VAR",
 /* 99 */    "FETCH_CONSTANT",
-/* 100 */   "GOTO",
+/* 100 */   "UNDEF",
 /* 101 */   "EXT_STMT",
 /* 102 */   "EXT_FCALL_BEGIN",
@@ -144 +144 @@
 /* 141 */   "DECLARE_FUNCTION",
 /* 142 */   "RAISE_ABSTRACT_ERROR",
-/* 143 */   "DECLARE_CONST",
+/* 143 */   "UNDEF",
 /* 144 */   "ADD_INTERFACE",
-/* 145 */   "DECLARE_INHERITED_CLASS_DELAYED",
+/* 145 */   "UNDEF",
 /* 146 */   "VERIFY_ABSTRACT_CLASS",
 /* 147 */   "ASSIGN_DIM",
 /* 148 */   "ISSET_ISEMPTY_PROP_OBJ",
 /* 149 */   "HANDLE_EXCEPTION",
-/* 150 */   "USER_OPCODE",
-/* 151 */   "UNDEF",
-/* 152 */   "JMP_SET",
-/* 153 */   "DECLARE_LAMBDA_FUNCTION"
+/* 150 */   "USER_OPCODE"
 };