diff options
author | SVN Migration <svn@php.net> | 1999-04-07 21:05:14 +0000 |
---|---|---|
committer | SVN Migration <svn@php.net> | 1999-04-07 21:05:14 +0000 |
commit | c6bd3ba9bf157d4e1b3fca4a1ced7b65b2f677f6 (patch) | |
tree | 4fc67d7f5b0b81eddd8e6c88e4a2c0caeaf607e4 | |
parent | aceaabceffd537a0ed83fa25e189b08eae585f4a (diff) | |
download | php-git-c6bd3ba9bf157d4e1b3fca4a1ced7b65b2f677f6.tar.gz |
This commit was manufactured by cvs2svn to create tag 'CLOSED_BETA'.CLOSED_BETA
-rw-r--r-- | Zend/ZendCore.dsp (renamed from Zend/libzend.dsp) | 40 | ||||
-rw-r--r-- | Zend/ZendCore.dsw | 65 | ||||
-rw-r--r-- | Zend/ZendCore.mak | 628 | ||||
-rw-r--r-- | Zend/diffs | 8 | ||||
-rw-r--r-- | Zend/zend.c | 1 |
5 files changed, 723 insertions, 19 deletions
diff --git a/Zend/libzend.dsp b/Zend/ZendCore.dsp index 2fbe76adab..372cdf6350 100644 --- a/Zend/libzend.dsp +++ b/Zend/ZendCore.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="libzend" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="ZendCore" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=libzend - Win32 Debug +CFG=ZendCore - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "libzend.mak". +!MESSAGE NMAKE /f "ZendCore.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "libzend.mak" CFG="libzend - Win32 Debug" +!MESSAGE NMAKE /f "ZendCore.mak" CFG="ZendCore - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libzend - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libzend - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "ZendCore - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "ZendCore - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=libzend - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "libzend - Win32 Release" +!IF "$(CFG)" == "ZendCore - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -51,7 +51,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo -!ELSEIF "$(CFG)" == "libzend - Win32 Debug" +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -78,13 +78,21 @@ LIB32=link.exe -lib # Begin Target -# Name "libzend - Win32 Release" -# Name "libzend - Win32 Debug" +# Name "ZendCore - Win32 Release" +# Name "ZendCore - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=.\alloca.c +# End Source File +# Begin Source File + +SOURCE=.\sprintf.c +# End Source File +# Begin Source File + SOURCE=".\zend-parser.c" # End Source File # Begin Source File @@ -157,10 +165,6 @@ SOURCE=.\zend_ptr_stack.c # End Source File # Begin Source File -SOURCE=..\php4\zend_sprintf.c -# End Source File -# Begin Source File - SOURCE=.\zend_stack.c # End Source File # Begin Source File @@ -267,7 +271,7 @@ SOURCE=.\zend_variables.h SOURCE=".\zend-parser.y" -!IF "$(CFG)" == "libzend - Win32 Release" +!IF "$(CFG)" == "ZendCore - Win32 Release" # Begin Custom Build InputDir=. @@ -283,7 +287,7 @@ BuildCmds= \ $(BuildCmds) # End Custom Build -!ELSEIF "$(CFG)" == "libzend - Win32 Debug" +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" # Begin Custom Build InputDir=. @@ -310,9 +314,9 @@ BuildCmds= \ SOURCE=".\zend-scanner.l" -!IF "$(CFG)" == "libzend - Win32 Release" +!IF "$(CFG)" == "ZendCore - Win32 Release" -!ELSEIF "$(CFG)" == "libzend - Win32 Debug" +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" # Begin Custom Build InputPath=".\zend-scanner.l" diff --git a/Zend/ZendCore.dsw b/Zend/ZendCore.dsw new file mode 100644 index 0000000000..299757e565 --- /dev/null +++ b/Zend/ZendCore.dsw @@ -0,0 +1,65 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "ZendCore"=.\ZendCore.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "ZendDebugger"=..\ZendDebugger\ZendDebugger.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "ZendOpArrayViewer"=..\ZendOpArrayViewer\ZendOpArrayViewer.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "ZendOptimizer"=..\ZendOptimizer\ZendOptimizer.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/Zend/ZendCore.mak b/Zend/ZendCore.mak new file mode 100644 index 0000000000..eb4499791d --- /dev/null +++ b/Zend/ZendCore.mak @@ -0,0 +1,628 @@ +# Microsoft Developer Studio Generated NMAKE File, Based on ZendCore.dsp +!IF "$(CFG)" == "" +CFG=ZendCore - Win32 Debug +!MESSAGE No configuration specified. Defaulting to ZendCore - Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "ZendCore - Win32 Release" && "$(CFG)" != "ZendCore - Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "ZendCore.mak" CFG="ZendCore - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "ZendCore - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "ZendCore - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= +!ELSE +NULL=nul +!ENDIF + +!IF "$(CFG)" == "ZendCore - Win32 Release" + +OUTDIR=.\Release +INTDIR=.\Release +# Begin Custom Macros +OutDir=.\Release +# End Custom Macros + +ALL : "$(OUTDIR)\ZendCore.lib" + + +CLEAN : + -@erase "$(INTDIR)\alloc.obj" + -@erase "$(INTDIR)\alloca.obj" + -@erase "$(INTDIR)\compile.obj" + -@erase "$(INTDIR)\constants.obj" + -@erase "$(INTDIR)\execute.obj" + -@erase "$(INTDIR)\highlight.obj" + -@erase "$(INTDIR)\llist.obj" + -@erase "$(INTDIR)\opcode.obj" + -@erase "$(INTDIR)\operators.obj" + -@erase "$(INTDIR)\ptr_stack.obj" + -@erase "$(INTDIR)\sprintf.obj" + -@erase "$(INTDIR)\stack.obj" + -@erase "$(INTDIR)\variables.obj" + -@erase "$(INTDIR)\vc60.idb" + -@erase "$(INTDIR)\zend.obj" + -@erase "$(INTDIR)\zend_API.obj" + -@erase "$(INTDIR)\zend_hash.obj" + -@erase "$(INTDIR)\zend_ini.obj" + -@erase "$(OUTDIR)\ZendCore.lib" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\ZendCore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ZendCore.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ZendCore.lib" +LIB32_OBJS= \ + "$(INTDIR)\alloc.obj" \ + "$(INTDIR)\alloca.obj" \ + "$(INTDIR)\compile.obj" \ + "$(INTDIR)\constants.obj" \ + "$(INTDIR)\execute.obj" \ + "$(INTDIR)\highlight.obj" \ + "$(INTDIR)\llist.obj" \ + "$(INTDIR)\opcode.obj" \ + "$(INTDIR)\operators.obj" \ + "$(INTDIR)\ptr_stack.obj" \ + "$(INTDIR)\sprintf.obj" \ + "$(INTDIR)\stack.obj" \ + "$(INTDIR)\variables.obj" \ + "$(INTDIR)\zend.obj" \ + "$(INTDIR)\zend_hash.obj" \ + "$(INTDIR)\zend_ini.obj" \ + "$(INTDIR)\zend_API.obj" + +"$(OUTDIR)\ZendCore.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + +OUTDIR=.\Debug +INTDIR=.\Debug +# Begin Custom Macros +OutDir=.\Debug +# End Custom Macros + +ALL : ".\zend-scanner.c" ".\zend-parser.tab.h" ".\zend-parser.tab.c" ".\configuration-scanner.c" ".\configuration-parser.tab.h" ".\configuration-parser.tab.c" "$(OUTDIR)\ZendCore.lib" "$(OUTDIR)\ZendCore.bsc" + + +CLEAN : + -@erase "$(INTDIR)\alloc.obj" + -@erase "$(INTDIR)\alloc.sbr" + -@erase "$(INTDIR)\alloca.obj" + -@erase "$(INTDIR)\alloca.sbr" + -@erase "$(INTDIR)\compile.obj" + -@erase "$(INTDIR)\compile.sbr" + -@erase "$(INTDIR)\constants.obj" + -@erase "$(INTDIR)\constants.sbr" + -@erase "$(INTDIR)\execute.obj" + -@erase "$(INTDIR)\execute.sbr" + -@erase "$(INTDIR)\highlight.obj" + -@erase "$(INTDIR)\highlight.sbr" + -@erase "$(INTDIR)\llist.obj" + -@erase "$(INTDIR)\llist.sbr" + -@erase "$(INTDIR)\opcode.obj" + -@erase "$(INTDIR)\opcode.sbr" + -@erase "$(INTDIR)\operators.obj" + -@erase "$(INTDIR)\operators.sbr" + -@erase "$(INTDIR)\ptr_stack.obj" + -@erase "$(INTDIR)\ptr_stack.sbr" + -@erase "$(INTDIR)\sprintf.obj" + -@erase "$(INTDIR)\sprintf.sbr" + -@erase "$(INTDIR)\stack.obj" + -@erase "$(INTDIR)\stack.sbr" + -@erase "$(INTDIR)\variables.obj" + -@erase "$(INTDIR)\variables.sbr" + -@erase "$(INTDIR)\vc60.idb" + -@erase "$(INTDIR)\vc60.pdb" + -@erase "$(INTDIR)\zend.obj" + -@erase "$(INTDIR)\zend.sbr" + -@erase "$(INTDIR)\zend_API.obj" + -@erase "$(INTDIR)\zend_API.sbr" + -@erase "$(INTDIR)\zend_hash.obj" + -@erase "$(INTDIR)\zend_hash.sbr" + -@erase "$(INTDIR)\zend_ini.obj" + -@erase "$(INTDIR)\zend_ini.sbr" + -@erase "$(OUTDIR)\ZendCore.bsc" + -@erase "$(OUTDIR)\ZendCore.lib" + -@erase "configuration-parser.tab.c" + -@erase "configuration-parser.tab.h" + -@erase "configuration-scanner.c" + -@erase "zend-parser.tab.c" + -@erase "zend-parser.tab.h" + -@erase "zend-scanner.c" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ZendCore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ZendCore.bsc" +BSC32_SBRS= \ + "$(INTDIR)\alloc.sbr" \ + "$(INTDIR)\alloca.sbr" \ + "$(INTDIR)\compile.sbr" \ + "$(INTDIR)\constants.sbr" \ + "$(INTDIR)\execute.sbr" \ + "$(INTDIR)\highlight.sbr" \ + "$(INTDIR)\llist.sbr" \ + "$(INTDIR)\opcode.sbr" \ + "$(INTDIR)\operators.sbr" \ + "$(INTDIR)\ptr_stack.sbr" \ + "$(INTDIR)\sprintf.sbr" \ + "$(INTDIR)\stack.sbr" \ + "$(INTDIR)\variables.sbr" \ + "$(INTDIR)\zend.sbr" \ + "$(INTDIR)\zend_hash.sbr" \ + "$(INTDIR)\zend_ini.sbr" \ + "$(INTDIR)\zend_API.sbr" + +"$(OUTDIR)\ZendCore.bsc" : "$(OUTDIR)" $(BSC32_SBRS) + $(BSC32) @<< + $(BSC32_FLAGS) $(BSC32_SBRS) +<< + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ZendCore.lib" +LIB32_OBJS= \ + "$(INTDIR)\alloc.obj" \ + "$(INTDIR)\alloca.obj" \ + "$(INTDIR)\compile.obj" \ + "$(INTDIR)\constants.obj" \ + "$(INTDIR)\execute.obj" \ + "$(INTDIR)\highlight.obj" \ + "$(INTDIR)\llist.obj" \ + "$(INTDIR)\opcode.obj" \ + "$(INTDIR)\operators.obj" \ + "$(INTDIR)\ptr_stack.obj" \ + "$(INTDIR)\sprintf.obj" \ + "$(INTDIR)\stack.obj" \ + "$(INTDIR)\variables.obj" \ + "$(INTDIR)\zend.obj" \ + "$(INTDIR)\zend_hash.obj" \ + "$(INTDIR)\zend_ini.obj" \ + "$(INTDIR)\zend_API.obj" + +"$(OUTDIR)\ZendCore.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ENDIF + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("ZendCore.dep") +!INCLUDE "ZendCore.dep" +!ELSE +!MESSAGE Warning: cannot find "ZendCore.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "ZendCore - Win32 Release" || "$(CFG)" == "ZendCore - Win32 Debug" +SOURCE=.\zend_alloc.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\alloc.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\alloc.obj" "$(INTDIR)\alloc.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\alloca.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\alloca.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\alloca.obj" "$(INTDIR)\alloca.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_compile.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\compile.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\compile.obj" "$(INTDIR)\compile.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_constants.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\constants.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\constants.obj" "$(INTDIR)\constants.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_execute.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\execute.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\execute.obj" "$(INTDIR)\execute.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_highlight.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\highlight.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\highlight.obj" "$(INTDIR)\highlight.sbr" : $(SOURCE) "$(INTDIR)" ".\zend-parser.tab.h" + + +!ENDIF + +SOURCE=.\zend_llist.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\llist.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\llist.obj" "$(INTDIR)\llist.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_opcode.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\opcode.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\opcode.obj" "$(INTDIR)\opcode.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_operators.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\operators.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\operators.obj" "$(INTDIR)\operators.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_ptr_stack.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\ptr_stack.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\ptr_stack.obj" "$(INTDIR)\ptr_stack.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\sprintf.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\sprintf.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\sprintf.obj" "$(INTDIR)\sprintf.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_stack.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\stack.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\stack.obj" "$(INTDIR)\stack.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_variables.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\variables.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\variables.obj" "$(INTDIR)\variables.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\zend.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\zend.obj" "$(INTDIR)\zend.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_API.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\zend_API.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\zend_API.obj" "$(INTDIR)\zend_API.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_hash.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\zend_hash.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\zend_hash.obj" "$(INTDIR)\zend_hash.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=.\zend_ini.c + +!IF "$(CFG)" == "ZendCore - Win32 Release" + + +"$(INTDIR)\zend_ini.obj" : $(SOURCE) "$(INTDIR)" + + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + + +"$(INTDIR)\zend_ini.obj" "$(INTDIR)\zend_ini.sbr" : $(SOURCE) "$(INTDIR)" + + +!ENDIF + +SOURCE=".\configuration-parser.y" + +!IF "$(CFG)" == "ZendCore - Win32 Release" + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + +InputPath=".\configuration-parser.y" + +".\configuration-parser.tab.c" ".\configuration-parser.tab.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <<tempfile.bat + @echo off + bison -d -S "C:\Program Files\Cygnus\share\bison.simple" -p cfg configuration-parser.y +<< + + +!ENDIF + +SOURCE=".\zend-parser.y" + +!IF "$(CFG)" == "ZendCore - Win32 Release" + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + +InputPath=".\zend-parser.y" + +".\zend-parser.tab.c" ".\zend-parser.tab.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <<tempfile.bat + @echo off + bison -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y +<< + + +!ENDIF + +SOURCE=".\configuration-scanner.l" + +!IF "$(CFG)" == "ZendCore - Win32 Release" + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + +InputPath=".\configuration-scanner.l" + +".\configuration-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <<tempfile.bat + @echo off + flex -i -Pcfg -oconfiguration-scanner.c configuration-scanner.l +<< + + +!ENDIF + +SOURCE=".\zend-scanner.l" + +!IF "$(CFG)" == "ZendCore - Win32 Release" + +!ELSEIF "$(CFG)" == "ZendCore - Win32 Debug" + +InputPath=".\zend-scanner.l" + +".\zend-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + <<tempfile.bat + @echo off + flex -i -Pzend -ozend-scanner.c zend-scanner.l +<< + + +!ENDIF + + +!ENDIF + diff --git a/Zend/diffs b/Zend/diffs new file mode 100644 index 0000000000..5915889366 --- /dev/null +++ b/Zend/diffs @@ -0,0 +1,8 @@ +Index: zend_execute.c +=================================================================== +RCS file: /repository/Zend/ZendCore/zend_execute.c,v +retrieving revision 1.25 +retrieving revision 1.26 +diff -r1.25 -r1.26 +17d16 +< /* $Id$ */ diff --git a/Zend/zend.c b/Zend/zend.c index e84a1af549..7fa2845df7 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -14,7 +14,6 @@ +----------------------------------------------------------------------+ */ - #include "zend.h" #include "zend_operators.h" #include "zend_variables.h" |