Changeset 644

Timestamp:

2009-07-06T11:50:01+02:00 (4 years ago)

Author:

moo

Message:

merged r642,r643 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• Makefile.frag (modified) (1 diff)
• config.w32 (modified) (1 diff)
• processor/processor.m4 (modified) (1 diff)

branches/1.3/Makefile.frag

@@ -12 +12 @@
 $(XCACHE_STRUCTINFO_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk
     @echo $(XCACHE_STRUCTINFO_OUT) is optional if XCache test is not enabled, feel free if it awk failed to produce it
-    -$(XCACHE_AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv -f $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT)
+    -$(XCACHE_AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT).tmp && mv $(XCACHE_STRUCTINFO_OUT).tmp $(XCACHE_STRUCTINFO_OUT)
 
 $(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO_OUT) $(XCACHE_PROC_SOURCES)
     $(M4) -D srcdir='`'"$(srcdir)'" -D builddir='`'"$(builddir)'" $(XCACHE_ENABLE_TEST) $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp
-    mv -f $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT)
+    mv $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT)
 
 $(XCACHE_PROC_H): $(XCACHE_PROC_OUT)
-    $(GREP) 'export: ' $(XCACHE_PROC_OUT) | $(SED) 's/.*export:\(.*\):export.*/\1/g' | $(XCACHE_INDENT) > $(XCACHE_PROC_H).tmp
-    mv -f $(XCACHE_PROC_H).tmp $(XCACHE_PROC_H)
+    $(GREP) 'export: ' $(XCACHE_PROC_OUT) | $(SED) 's/.*export:\(.*\):export.*/\1/g' > $(XCACHE_PROC_H)
+    -$(XCACHE_INDENT) < $(XCACHE_PROC_H) > $(XCACHE_PROC_H).tmp && mv $(XCACHE_PROC_H).tmp $(XCACHE_PROC_H)
 
 $(XCACHE_PROC_C): $(XCACHE_PROC_OUT) $(XCACHE_PROC_H)
-    $(XCACHE_INDENT) < $(XCACHE_PROC_OUT) > $(XCACHE_PROC_C).tmp
-    mv -f $(XCACHE_PROC_C).tmp $(XCACHE_PROC_C)
+    cp $(XCACHE_PROC_OUT) $(XCACHE_PROC_C)
+    -$(XCACHE_INDENT) < $(XCACHE_PROC_OUT) > $(XCACHE_PROC_C).tmp && mv $(XCACHE_PROC_C).tmp $(XCACHE_PROC_C)
 
 $(builddir)/processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c

branches/1.3/config.w32

@@ -116 +116 @@
     frag = frag.replace(/.*\$\(CC\).* -E (.*) -o (.*)/, ccrule + " /E $1 > $2");
     frag = frag.replace(/ -o /g, " /Fo");
-    frag = frag.replace(/mv -f /g, "move ");
+    frag = frag.replace(/cp /g, "copy ");
+    frag = frag.replace(/mv /g, "move ");
     frag = frag.replace(/ \|\| /g, "\r\n\tif errorlevel 1 ");
     frag = frag.replace(/ && /g, "\r\n\tif not errorlevel 1 ");

branches/1.3/processor/processor.m4

@@ -220 +220 @@
 DEF_STRUCT_P_FUNC(`zend_arg_info', , `
     DISPATCH(zend_uint, name_len)
-    PROC_ZSTRING_L(, name, name_len)
+    COPY(name)
     DISPATCH(zend_uint, class_name_len)
-    PROC_ZSTRING_L(, class_name, class_name_len)
+    COPY(class_name)
     DISPATCH(zend_bool, array_type_hint)
     DISPATCH(zend_bool, allow_null)