Commit:    eab14993febbd3d083c1d45715af122baac140eb
Author:    Sebastian Bergmann <sebast...@php.net>         Thu, 6 Dec 2012 
09:28:35 +0100
Parents:   cd6bf838d5af7e4b402b57fc10526e6c453ad5c5
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=eab14993febbd3d083c1d45715af122baac140eb

Log:
Invoke re2c with --no-generation-date to prevent unintentional / unnecessary 
changes in generated files.

Changed paths:
  M  Makefile.frag
  M  Zend/Makefile.am
  M  ext/date/lib/parse_date.c
  M  ext/date/lib/parse_iso_intervals.c
  M  ext/pdo/Makefile.frag
  M  ext/pdo/pdo_sql_parser.c
  M  ext/phar/Makefile.frag
  M  ext/phar/phar_path_check.c
  M  ext/standard/Makefile.frag
  M  ext/standard/url_scanner_ex.c
  M  ext/standard/var_unserializer.c
  M  win32/build/Makefile


Diff:
diff --git a/Makefile.frag b/Makefile.frag
index c8b3cb2..12646c2 100644
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -7,7 +7,7 @@ $(builddir)/zend_language_scanner.lo: 
$(srcdir)/zend_language_parser.h
 $(builddir)/zend_ini_scanner.lo: $(srcdir)/zend_ini_parser.h
 
 $(srcdir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-       @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c 
Zend/zend_language_scanner.l)
+       @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date 
--case-inverted -cbdFt Zend/zend_language_scanner_defs.h 
-oZend/zend_language_scanner.c Zend/zend_language_scanner.l)
 
 $(srcdir)/zend_language_parser.h: $(srcdir)/zend_language_parser.c
 $(srcdir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -18,6 +18,6 @@ $(srcdir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
        @$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
 
 $(srcdir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-       @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l)
+       @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date 
--case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c 
Zend/zend_ini_scanner.l)
 
 $(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo 
$(builddir)/zend_compile.lo: $(srcdir)/zend_language_parser.h
diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index e5757fa..6417f3e 100644
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -32,7 +32,7 @@ zend_ini_scanner.lo: zend_ini_parser.h
 # Language parser/scanner rules
 
 zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-       $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
$(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
+       $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt 
$(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
 
 zend_language_parser.h: zend_language_parser.c
 zend_language_parser.c: $(srcdir)/zend_language_parser.y
@@ -44,7 +44,7 @@ zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
        $(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c
 
 zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-       $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
$(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
+       $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt 
$(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l
 
 zend_ini_parser.h: zend_ini_parser.c
 
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 4829da6..1ccddd2 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Sep 30 20:14:42 2012 */
+/* Generated by re2c 0.13.5 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
    +----------------------------------------------------------------------+
diff --git a/ext/date/lib/parse_iso_intervals.c 
b/ext/date/lib/parse_iso_intervals.c
index 6be5bf1..fce91cf 100644
--- a/ext/date/lib/parse_iso_intervals.c
+++ b/ext/date/lib/parse_iso_intervals.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Dec  5 22:02:35 2011 */
+/* Generated by re2c 0.13.5 */
 #line 1 "ext/date/lib/parse_iso_intervals.re"
 /*
    +----------------------------------------------------------------------+
diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag
index 98f5c5f..5ba5f80 100644
--- a/ext/pdo/Makefile.frag
+++ b/ext/pdo/Makefile.frag
@@ -6,7 +6,7 @@ PDO_HEADER_FILES= \
 
 
 $(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re
-       (cd $(top_srcdir); $(RE2C) -o ext/pdo/pdo_sql_parser.c 
ext/pdo/pdo_sql_parser.re)
+       (cd $(top_srcdir); $(RE2C) --no-generation-date -o 
ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re)
 
 install-pdo-headers:
        @echo "Installing PDO headers:          
$(INSTALL_ROOT)$(phpincludedir)/ext/pdo/"
diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index 0267d15..365b022 100644
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Apr 19 12:42:11 2012 */
+/* Generated by re2c 0.13.5 */
 #line 1 "ext/pdo/pdo_sql_parser.re"
 /*
   +----------------------------------------------------------------------+
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index b1c820f..e2b016d 100644
--- a/ext/phar/Makefile.frag
+++ b/ext/phar/Makefile.frag
@@ -1,5 +1,5 @@
 $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re
-       @(cd $(top_srcdir); $(RE2C) -b -o ext/phar/phar_path_check.c 
ext/phar/phar_path_check.re)
+       @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o 
ext/phar/phar_path_check.c ext/phar/phar_path_check.re)
 
 pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
 
diff --git a/ext/phar/phar_path_check.c b/ext/phar/phar_path_check.c
index 7a8ea60..d03a2b3 100644
--- a/ext/phar/phar_path_check.c
+++ b/ext/phar/phar_path_check.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Jan  1 10:36:11 2012 */
+/* Generated by re2c 0.13.5 */
 #line 1 "ext/phar/phar_path_check.re"
 /*
   +----------------------------------------------------------------------+
diff --git a/ext/standard/Makefile.frag b/ext/standard/Makefile.frag
index 4e94962..8b6e3e2 100644
--- a/ext/standard/Makefile.frag
+++ b/ext/standard/Makefile.frag
@@ -1,9 +1,9 @@
 
 $(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re
-       @(cd $(top_srcdir); $(RE2C) -b -o ext/standard/var_unserializer.c 
ext/standard/var_unserializer.re)
+       @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o 
ext/standard/var_unserializer.c ext/standard/var_unserializer.re)
 
 $(srcdir)/url_scanner_ex.c: $(srcdir)/url_scanner_ex.re
-       @(cd $(top_srcdir); $(RE2C) -b -o ext/standard/url_scanner_ex.c 
ext/standard/url_scanner_ex.re)
+       @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o 
ext/standard/url_scanner_ex.c    ext/standard/url_scanner_ex.re)
 
 $(builddir)/info.lo: $(builddir)/../../main/build-defs.h
 
diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index a034c3b..f66b562 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue May 15 13:07:17 2012 */
+/* Generated by re2c 0.13.5 */
 #line 1 "ext/standard/url_scanner_ex.re"
 /*
   +----------------------------------------------------------------------+
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 21f9958..59995fb 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Jan  1 10:36:31 2012 */
+/* Generated by re2c 0.13.5 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
diff --git a/win32/build/Makefile b/win32/build/Makefile
index e2d6254..057b584 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -55,10 +55,10 @@ Zend\zend_language_parser.c Zend\zend_language_parser.h: 
Zend\zend_language_pars
 
 !if $(RE2C) != ""
 Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l
-       $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
+       $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt 
Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
 
 Zend\zend_language_scanner.c: Zend\zend_language_scanner.l
-       $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt 
Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c 
Zend/zend_language_scanner.l
+       $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt 
Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c 
Zend/zend_language_scanner.l
 !endif
 
 !if $(PGOMGR) != ""


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to