[PHP4BETA] CVS update: php4
| From: | zeev | Date: | Mon, 26 Apr 1999 19:02:59 +0000 |
| Subject: | [PHP4BETA] CVS update: php4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-562@lists.php.net to get a copy of this message | ||
Date: Monday April 26, 1999 @ 15:02
Author: zeev
Update of /repository/php4
In directory php:/tmp/cvs-serv23877
Modified Files:
configuration-parser.y configuration-scanner.l php4dll.dsp
php4dllts.dsp
Log Message:
Somehow the rules for the configuration parser/scanners disappeared
Index: php4/configuration-parser.y
diff -u php4/configuration-parser.y:1.10 php4/configuration-parser.y:1.11
--- php4/configuration-parser.y:1.10 Mon Apr 26 10:00:46 1999
+++ php4/configuration-parser.y Mon Apr 26 15:02:59 1999
@@ -30,7 +30,7 @@
-/* $Id: configuration-parser.y,v 1.10 1999/04/26 14:00:46 zeev Exp $ */
+/* $Id: configuration-parser.y,v 1.11 1999/04/26 19:02:59 zeev Exp $ */
#define DEBUG_CFG_PARSER 1
#include "php.h"
@@ -347,6 +347,7 @@
%token CFG_FALSE
%token EXTENSION
%token T_ZEND_EXTENSION
+%token T_ZEND_EXTENSION_TS
%%
@@ -378,7 +379,18 @@
php3_dl(&$3,MODULE_PERSISTENT,&dummy);
}
- | T_ZEND_EXTENSION '=' string { zend_load_extension($3.value.str.val);
free($3.value.str.val); }
+ | T_ZEND_EXTENSION '=' string {
+#ifndef ZTS
+ zend_load_extension($3.value.str.val);
+#endif
+ free($3.value.str.val);
+ }
+ | T_ZEND_EXTENSION_TS '=' string {
+#ifdef ZTS
+ zend_load_extension($3.value.str.val);
+#endif
+ free($3.value.str.val);
+ }
| SECTION {
if (parsing_mode==PARSING_MODE_BROWSCAP) {
pval tmp;
Index: php4/configuration-scanner.l
diff -u php4/configuration-scanner.l:1.1.1.1 php4/configuration-scanner.l:1.2
--- php4/configuration-scanner.l:1.1.1.1 Wed Apr 7 17:01:51 1999
+++ php4/configuration-scanner.l Mon Apr 26 15:02:59 1999
@@ -59,6 +59,11 @@
return T_ZEND_EXTENSION;
}
+
+<INITIAL>"zend_extension_ts" {
+ return T_ZEND_EXTENSION_TS;
+}
+
<INITIAL>[ ]*("true"|"on"|"yes")[ ]* {
cfglval->value.str.val = php3_strndup("1",1);
cfglval->value.str.len = 1;
Index: php4/php4dll.dsp
diff -u php4/php4dll.dsp:1.2 php4/php4dll.dsp:1.3
--- php4/php4dll.dsp:1.2 Mon Apr 26 10:11:20 1999
+++ php4/php4dll.dsp Mon Apr 26 15:02:59 1999
@@ -653,6 +653,39 @@
# Begin Source File
SOURCE=".\configuration-parser.y"
+
+!IF "$(CFG)" == "php4dll - Win32 Debug"
+
+# Begin Custom Build
+InputPath=".\configuration-parser.y"
+
+BuildCmds= \
+ bison --output=configuration-parser.c -v -d -S "C:\Program
Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
+
+"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+
+# Begin Custom Build
+InputPath=".\configuration-parser.y"
+
+BuildCmds= \
+ bison --output=configuration-parser.c -v -d -S "C:\Program
Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
+
+"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
# End Source File
# End Group
# Begin Group "Scanners"
@@ -661,6 +694,29 @@
# Begin Source File
SOURCE=".\configuration-scanner.l"
+
+!IF "$(CFG)" == "php4dll - Win32 Debug"
+
+# Begin Custom Build
+InputPath=".\configuration-scanner.l"
+
+"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+
+# Begin Custom Build
+InputPath=".\configuration-scanner.l"
+
+"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l
+
+# End Custom Build
+
+!ENDIF
+
# End Source File
# End Group
# End Target
Index: php4/php4dllts.dsp
diff -u php4/php4dllts.dsp:1.2 php4/php4dllts.dsp:1.3
--- php4/php4dllts.dsp:1.2 Mon Apr 26 10:11:20 1999
+++ php4/php4dllts.dsp Mon Apr 26 15:02:59 1999
@@ -653,6 +653,39 @@
# Begin Source File
SOURCE=".\configuration-parser.y"
+
+!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+
+# Begin Custom Build
+InputPath=".\configuration-parser.y"
+
+BuildCmds= \
+ bison --output=configuration-parser.c -v -d -S "C:\Program
Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
+
+"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+
+# Begin Custom Build
+InputPath=".\configuration-parser.y"
+
+BuildCmds= \
+ bison --output=configuration-parser.c -v -d -S "C:\Program
Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y
+
+"configuration-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
# End Source File
# End Group
# Begin Group "Scanners"
@@ -661,6 +694,29 @@
# Begin Source File
SOURCE=".\configuration-scanner.l"
+
+!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+
+# Begin Custom Build
+InputPath=".\configuration-scanner.l"
+
+"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+
+# Begin Custom Build
+InputPath=".\configuration-scanner.l"
+
+"configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l
+
+# End Custom Build
+
+!ENDIF
+
# End Source File
# End Group
# End Target
--
PHP 4 Beta