fix bug send useragent with new line char

That is the latest stable version, and certainly progress over Nginx
1.17.6 which has been released almost five years ago.

.gitattributes

@@ -0,0 +1,7 @@
+*.m4  text eol=lf
+*.awk text eol=lf
+*.c   text eol=lf
+*.h   text eol=lf
+*.php text eol=lf
+*.json text eol=lf
+*.md text eol=lf

.gitignore

@@ -1,10 +1,26 @@
 php53
 php54
 php55
+php56
+php70
+php71
+php72
 phpmaster
 php
+!lib/php
+!bin/php
 rmtools-client
 rmtools.base
 logs
 PFTT
-
+\.tmp
+\.cache
+oracle
+# either these two become submodules, or uncomment them
+#pgo-build
+#rmtools*
+phpsdk-local.bat
+pgo/work
+!pgo/tpl/php
+!lib/php/libsdk/SDK/Build/PGO/Server/PHP
+*.swp

LICENSE

@@ -0,0 +1,9 @@
+Copyright 2017-2019 Anatol Belski
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,8 +1,230 @@
-# PHP SDK
-
-PHP SDK is a toolset for building PHP under windows
-
-## Usage
-
-- git checkout https://github.com/OSTC/php-sdk-binary-tools.git c:\php-sdk
-- follow the instructions on the PHP [wiki page](https://wiki.php.net/internals/windows/stepbystepbuild "PHP wiki page")
+# PHP SDK
+
+PHP SDK is a tool kit for Windows PHP builds.
+
+# License
+
+The PHP SDK itself and the SDK own tools and code are licensed under the BSD 2-Clause license. With the usage of the other tools, you accept the respective licenses.
+
+# Overview
+
+The toolset consists on a mix of the hand written scripts, selected MSYS2 parts and standalone programs. It supports any workflows, be it a custom, local or a CI build whatsoever.
+
+The PHP SDK 2.2+ is compatible with PHP 7.2 and above.
+
+The PHP SDK 2.1 is required to build PHP 7.1 or 7.0.
+
+The legacy binary tools SDK is available from the [legacy branch](https://github.com/php/php-sdk-binary-tools/tree/legacy) and is suitable to build PHP 5.
+
+# Requirements
+
+- A 64-bit build host
+- Windows 7 or later
+- `Visual C++ 2017` or `Visual C++ 2019` must be installed prior SDK usage. Required components
+  - C++ dev
+  - Windows SDK
+  - .NET dev
+- if `Cygwin`, `MingW` or any other cross solution is installed, please read notes in the pitfalls section
+
+# Tools
+
+## SDK
+
+- starter scripts, named phpsdk-<crt>-<arch>.bat
+- `phpsdk_buildtree` - initialize the development filesystem structure
+- `phpsdk_deps`      - handle dependency libraries
+- `phpsdk_dllmap`    - create a JSON listing of DLLs contained in zip files
+- `phpsdk_pgo`       - run PGO training 
+- `phpsdk_version`   - show SDK version
+- `task.exe`         - wrapper to hide the given command line
+
+## Other tools
+
+- `bison` 3.3.2, `re2c` 1.1.1, `lemon`
+- `awk`, `gawk`, `sed`, `grep`, `jq`
+- `diff`, `diff3`, `patch`
+- `md5sum`, `sha1sum`, `sha224sum`, `sha256sum`, `sha384sum`, `sha512sum`
+- `7za`, `zip`, `unzip`, `unzipsfx`
+- `wget`, `pwgen`
+
+## Optional, not included
+
+These are not included with the PHP SDK, but might be useful. While Visual C++ is the only required, the others might enable some additional functionality. Care yourself about making them available on your system, if relevant.
+
+- `Git`        - useful for PHP source management
+- `Cppcheck`   - used for static analysis
+- `clang`      - useful for experimental builds and for static analysis
+- `ICC`        - useful for experimental builds
+- `ConEmu`     - console emulator with tabs and more
+
+# Usage
+
+The PHP SDK should be unzipped into the shortest possible path, preferably somewhere near the drive root.
+
+Usually, the first step to start the PHP SDK is by invoking one of the suitable starter scripts. This automatically puts the console on the correct environment relevant for the desired PHP build configuration.
+
+It is not required to hold the source in the PHP SDK directory. It could be useful, for example, to simplify the SDK updates.
+
+## Basic usage example
+
+- `git clone https://github.com/php/php-sdk-binary-tools.git c:\php-sdk`
+- `cd c:\php-sdk`
+- `git checkout php-sdk-2.1.9` or later
+- invoke `phpsdk-vc15-x64.bat`
+- `phpsdk_buildtree phpmaster`
+- `git clone https://github.com/php/php-src.git && cd php-src`, or fetch a zipball
+- `phpsdk_deps --update --branch master`, use `phpsdk_deps --update --branch X.Y` for a non master branch
+- do the build, eg. `buildconf && configure --enable-cli && nmake`
+
+More extensive documentation can be found on the [wiki](https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2 "PHP wiki page").
+
+## The old way
+
+- `git clone https://github.com/php/php-sdk-binary-tools.git c:\php-sdk`
+- follow the instructions on the PHP [wiki page](https://wiki.php.net/internals/windows/stepbystepbuild "PHP wiki page")
+
+# Customizing
+
+## Custom environment setup
+
+A script called phpsdk-local.bat has to be put into the PHP SDK root. If present, it will be automatically picked up by the starter script. A template for such a script is included with the PHP SDK. This allows to automatically meet any required preparations, that are not foreseen by the standard PHP SDK startup. Be careful while creating your own phpsdk-local. It's your responsibility to ensure the regular PHP SDK startup isn't broken after phpsdk-local.bat was injected into the startup sequence.
+
+## Console emulator integration
+
+The starter scripts can be also easy integrated with the consoles other than standard cmd.exe. For the reference, here's an example ConEmu task
+
+`C:\php-sdk\phpsdk-vc15-x64.bat -cur_console:d:C:\php-sdk\php72\vc15\x64\php-src`
+
+## Unattended builds
+
+An elementary functionality to run unattended builds is included. See an example on how to setup a simple unattended build task in the doc directory.
+
+Be aware, that starter scripts always start a new shell. Scripts intended to run as a task need to be passed with `-t` argument to a starter script.
+
+# Upgrading
+
+- backup phpsdk-local.bat
+- backup the source trees and any other custom files in the PHP SDK root, if any present
+- move the PHP SDK folder into trash
+- download, unpack and the new PHP SDK version under the same path
+- move the custom files back in their respective places
+
+If the PHP SDK is kept as a git checkout, merely what is needed instead is to git fetch and to checkout an updated git tag.
+
+# Extending
+
+The SDK tools are based on the KISS principle and should be kept so. Basic tools are implemented as simple batch script. The minimalistic `PHP` is available for internal SDK purposes. It can be used, if more complexity is required. A suitable PHP binary is bound with the PHP SDK. If you have an idea for some useful tool or workflow, please open a ticket or PR, so it can be discussed, implemented and added to the SDK. By contributing an implementation, you should also accept the SDK license.
+
+# PGO
+
+As of the version 2.1.0, the SDK includes a tool for the [PGO](https://docs.microsoft.com/en-us/cpp/build/reference/profile-guided-optimizations) optimization. Several training cases are included by default, which are based on the real life opensource applications. The PGO optimization can give an overall speedup up to 30%. The work on adding more training scenarios for the widely used opensource apps is ongoing. If you have a training scenario to share, please create a PR to this repo. Any new training cases are thoroughly validated through the extensive performance tests.
+
+## Preparing PGO training environment
+- the pgo folder in the SDK root dir contains templates and scenarios for PGO training
+- adjust and execute [doc/phpsdk_pgo_prep_elevated.bat.example](doc/phpsdk_pgo_prep_elevated.bat.example) to open ports required for PHP SDK training servers
+- run `phpsdk_pgo --init`. Note that composer requires huge amounts of memory, so
+  it may be necessary to set the environment variable `COMPOSER_MEMORY_LIMIT=-1`.
+  The PGO initialization may not succeed in x86 enviroments.
+
+## Creating PGO build
+- compile PHP configured using `--enable-pgi`
+- run `phpsdk_pgo --train`
+- run `nmake clean-pgo`
+- rebuild PHP `--with-pgo`
+
+## Adding custom PGO training scenario
+
+A custom scenario can be used to produce a custom PHP binary dedicated to an arbitrary application. 
+
+The existing training cases can be found in [pgo/cases](pgo/cases). Assumed the case would be named `myapp`, the general steps to setup were
+
+- create the case directory under `pgo/cases/myapp`
+- create `pgo/cases/myapp/phpsdk_pgo.json` with the necessary definitions 
+- create `pgo/cases/myapp/nginx.partial.conf` with a partial NGINX template
+- create `pgo/cases/myapp/TrainingCaseHandler.php` with a class as defined in the [interface](lib/php/libsdk/SDK/Build/PGO/Interfaces/TrainingCase.php)
+
+After a training case is implemented and put under `pgo/cases`, the work environment needs to be reinitialized. The tool puts all the training data and necessary applications under `pgo/work`. Rename or remove that directory and rerun `phpsdk_pgo --init`.
+
+To skip a training case, add a file named `inactive` into the case folder.
+
+# Debugging PHP
+
+This part covers debugging possibilities for the builds produced by the native VS compilers.
+For the cross compiled builds produced with toolsets other than VC++, please check the
+documentation for the corresponding toolsets. In any case, general principles on debugging
+native programs apply.
+
+Either a debug build of PHP or enabled debug symbols are required to be able to debug PHP.
+A debug build is usually more suitable for the development process and can be produced by
+adding `--enable-debug` to the configure options. A release build with debug symbols can
+be produced by adding `--enable-debug-pack`. These options are mutually exclusive.
+
+## Debugging with Visual Studio
+
+- Configure with either `--enable-debug` or `--enable-debug-pack`.
+- A debug build might bring better experience for dev, but sometimes you want to debug a release build.
+- `nmake run ARGS=yourscript.php DEBUGGER=1`, that will open a Visual Studio window.
+- Any additional runtime options for PHP or the script executed go to ARGS, too.
+- Select `Debug -> New Breakpoint -> Function Breakpoint` and add a function where the debugger should break.
+- Click `Start`.
+
+Adding a breakpoint before starting debugging might be not necessary, if a crash is debugged. When such a script runs
+under the debugger, the debugger will stop at the crashing point. In that case, a breakpoint can be added
+around the crashed code directly.
+
+## Debugging test suite with Visual Studio
+
+The [Microsoft Child Process Debugging Power Tool](https://marketplace.visualstudio.com/items?itemName=vsdbgplat.MicrosoftChildProcessDebuggingPowerTool)
+plugin for Visual Studio is required. After installing it, following these steps
+
+- `nmake test TESTS=ext/myext/tests/sometest.phpt DEBUGGER=1`
+- Select `Debug -> Other Debug Targets -> Child Process Debugging Settings` and enable child process debugging.
+- If necessary, add a breakpoint and start debugging as described in the previous section.
+
+## Debugging with WinDbg
+
+PHP can also be debugged with the tools from the WinDbg package. There is currently no way
+implemented in the Makefile to start the WinDbg integrated, so it needs to de done manually.
+Either a debug build or a release build with debug symbols is still required, as described
+previously.
+
+# Support
+
+- Join `#winphp-dev` on Freenode to discuss any ideas or questions
+- File an issue on GitHub
+
+# Pitfalls
+
+- SDK or PHP sources put into paths including spaces might cause issue.
+- SDK or PHP sources put into too long paths, will cause an issue.
+- If Cygwin, MSYS2 or MinGW flavors are exposed in global PATH, it might cause issues. If it's unavoidable, ensure SDK preceeds it on the PATH.
+- When fetching the binary SDK from git, git `core.autocrlf` configuration directive set to `false` is recommended.
+- Tools, based on MSYS2, only accept paths with forward slashes.
+- Both Visual C++ toolset and the Windows SDK components have to be installed for the PHP SDK to work properly. 
+- The VC++ toolset is still required, even if another compiler, fe. clang, is intended to be used.
+- `task.exe` is not a console application, some systems might not propagate exit code except the batch is explicitly run from `cmd /c`, etc.
+- `7za` should be preferred over `unzip` and `zip` for compatibility reasons.
+- If you experience some strange crashes on MSYS2 tools, try the phpsdk_rebase_msys2 tool. MSYS2 tools might be have unstable
+  on ASLR enabled systems.
+
+# Internal notes
+
+## Releases
+
+Users of the PHP SDK are supposed to use tagged versions for stability and
+reproducability.  This requires the maintainers of the PHP SDK to create such
+tags for *all* *relevant* *changes*.  The tag format should be `php-sdk-X.Y.Z`,
+with the common major, minor and revision numbers.
+
+Comprehensive changes, which would be hard to test extensively, such as updates
+to the bundled PHP or the MinGW tools, should walk through a QA (aka. pre-release)
+process, typically with beta versions (e.g. `php-sdk-X.Y.Zbeta1`).  Only after
+these have been thoroughly tested, and all relevant issues have been resolved,
+a GA release should be tagged.
+
+After each tag, a couple of other repositories should be informed about the
+available update, ideally in form of a pull request.  These repositories are:
+
+* https://github.com/php/php-src (for Windows CI)
+* https://github.com/php/php-windows-builder
+* https://github.com/php/setup-php-sdk

VERSION

@@ -0,0 +1 @@
+2.3.1-dev

bin/Copy of bison.simple

@@ -1,761 +0,0 @@
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/local/share/bison.simple"
-/* This file comes from bison-1.28.  */
-
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-	 instead, just don't use alloca.  */
-#include <malloc.h>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-		 and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
-#define YYEOF		0
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL		goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-#ifndef YYPURE
-#define YYLEX		yylex()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
-
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
-
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
-
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
-#endif
-
-int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
-
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
-
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
-
-#ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
-#endif
-
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
-
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
-#endif
-
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#else /* __cplusplus */
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
-{
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#endif
-#endif
-
-#line 217 "/usr/local/share/bison.simple"
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-#ifdef YYPARSE_PARAM
-int yyparse (void *);
-#else
-int yyparse (void);
-#endif
-#endif
-
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
-
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
-
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
-
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
-
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
-
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
-
-  int yylen;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss - 1;
-  yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
-
-  *++yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
-      /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
-#else /* no yyoverflow */
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  if (yyfree_stacks)
-	    {
-	      free (yyss);
-	      free (yyvs);
-#ifdef YYLSP_NEEDED
-	      free (yyls);
-#endif
-	    }
-	  return 2;
-	}
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-	yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-		   size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-		   size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-		   size * (unsigned int) sizeof (*yylsp));
-#endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
-
-      if (yyssp >= yyss + yystacksize - 1)
-	YYABORT;
-    }
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
-
-  goto yybackup;
- yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
-	}
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-/* Do the default action for the current state.  */
-yydefault:
-
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
-yyreduce:
-  yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      int i;
-
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-$   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/local/share/bison.simple"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
-
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-yyerrlab:   /* here on detecting error */
-
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
-
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
-	    {
-	      strcpy(msg, "parse error");
-
-	      if (count < 5)
-		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
-		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
-		      }
-		}
-	      yyerror(msg);
-	      free(msg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exceeded");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
-    }
-
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
-
-  if (yyerrstatus == 3)
-    {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-yyerrdefault:  /* current state does not do anything special for the error token. */
-
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
-#endif
-
-yyerrpop:   /* pop the current state because it cannot handle the error token */
-
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-yyerrhandle:
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 0;
-
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 1;
-}

bin/bison.simple

@@ -1,761 +0,0 @@
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "bison.simple"
-/* This file comes from bison-1.27.  */
-
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-	 instead, just don't use alloca.  */
-#include <malloc.h>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-		 and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
-#define YYEOF		0
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL		goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-#ifndef YYPURE
-#define YYLEX		yylex()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
-
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
-
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
-
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
-#endif
-
-int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
-
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
-
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
-
-#ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
-#endif
-
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
-
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
-#endif
-
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#else /* __cplusplus */
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
-{
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#endif
-#endif
-
-#line 216 "bison.simple"
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-#ifdef YYPARSE_PARAM
-int yyparse (void *);
-#else
-int yyparse (void);
-#endif
-#endif
-
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
-
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
-
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
-
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
-
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
-
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
-
-  int yylen;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss - 1;
-  yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
-
-  *++yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
-      /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
-#else /* no yyoverflow */
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  if (yyfree_stacks)
-	    {
-	      free (yyss);
-	      free (yyvs);
-#ifdef YYLSP_NEEDED
-	      free (yyls);
-#endif
-	    }
-	  return 2;
-	}
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-	yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-		   size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-		   size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-		   size * (unsigned int) sizeof (*yylsp));
-#endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
-
-      if (yyssp >= yyss + yystacksize - 1)
-	YYABORT;
-    }
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
-
-  goto yybackup;
- yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
-	}
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-/* Do the default action for the current state.  */
-yydefault:
-
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
-yyreduce:
-  yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      int i;
-
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-$   /* the action file gets copied in in place of this dollarsign */
-#line 542 "bison.simple"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
-
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-yyerrlab:   /* here on detecting error */
-
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
-
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
-	    {
-	      strcpy(msg, "parse error");
-
-	      if (count < 5)
-		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
-		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
-		      }
-		}
-	      yyerror(msg);
-	      free(msg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exceeded");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
-    }
-
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
-
-  if (yyerrstatus == 3)
-    {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-yyerrdefault:  /* current state does not do anything special for the error token. */
-
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
-#endif
-
-yyerrpop:   /* pop the current state because it cannot handle the error token */
-
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-yyerrhandle:
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 0;
-
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 1;
-}

bin/dateformat.bat

@@ -1,82 +0,0 @@
-@ECHO OFF
-IF NOT "%OS%"=="Windows_NT" GOTO Syntax
-IF      "%?1"==""           GOTO Syntax
-IF NOT  "%?6"==""           GOTO Syntax
-ECHO .%* | FIND "?" > NUL && GOTO Syntax
-
-SETLOCAL ENABLEDELAYEDEXPANSION
-FOR /F "tokens=2-4 delims=(/-)" %%A IN ('VER ?| DATE') DO (
-	SET Var1=%%A
-	SET Var2=%%B
-	SET Var3=%%C
-)
-FOR /F "tokens=2 delims=:" %%A IN ('VER ?| DATE ?| FIND /V "("') DO (
-	FOR /F "tokens=1-3 delims=/- " %%B IN ("%%A") DO (
-		SET %Var1%=%%B
-		SET %Var2%=%%C
-		SET %Var3%=%%D
-	)
-)
-IF /I NOT "%?1"=="%Var1%" IF /I NOT "%?1"=="%Var2%" IF /I NOT "%?1"=="%Var3%" (
-	ENDLOCAL
-	GOTO Syntax
-)
-IF /I "%?4"=="/LZ" (SET Delim=) ELSE (SET Delim=%4)
-IF /I NOT "%?3"=="%Var1%" IF /I NOT "%?3"=="%Var2%" IF /I NOT "%?3"=="%Var3%" IF /I NOT "%?3"=="/LZ" (SET Delim=%?3)
-IF /I NOT "%?2"=="%Var1%" IF /I NOT "%?2"=="%Var2%" IF /I NOT "%?2"=="%Var3%" IF /I NOT "%?2"=="/LZ" (SET Delim=%?2)
-ECHO.%* | FIND /I "/LZ" >NUL
-IF NOT ERRORLEVEL 1 CALL :AddLeadingZero
-SET DateFmt=!%1!
-IF /I NOT "%?2"=="%Delim%" IF /I NOT "%?2"=="/LZ" (SET DateFmt=%DateFmt%%Delim%!%2!)
-IF /I NOT "%?3"=="%Delim%" IF /I NOT "%?3"=="/LZ" (SET DateFmt=%DateFmt%%Delim%!%3!)
-ENDLOCAL & SET DateFmt=%DateFmt%
-
-SET DateFmt
-
-GOTO:EOF
-
-
-:AddLeadingZero
-CALL SET Char1=%%%Var1%:?0,1%%
-IF NOT "%Char1%"=="0" (
-	IF !%Var1%! LSS 10 SET %Var1%=0!%Var1%!
-)
-CALL SET Char1=%%%Var2%:?0,1%%
-IF NOT "%Char1%"=="0" (
-	IF !%Var2%! LSS 10 SET %Var2%=0!%Var2%!
-)
-CALL SET Char1=%%%Var3%:?0,1%%
-IF NOT "%Char1%"=="0" (
-	IF !%Var3%! LSS 10 SET %Var3%=0!%Var3%!
-)
-GOTO:EOF
-
-
-:Syntax
-ECHO DateFmt.bat,  Version 0.52 BETA for Windows NT 4 and later
-ECHO Display the current date in the specified format
-ECHO.
-ECHO Usage:  DATEFMT  date_format  [ delimiter ]  [ /LZ ]
-ECHO.
-IF     "%OS%"=="Windows_NT" FOR /F "tokens=2-4 delims=()/-" %%A IN ('VER ?| DATE ?| FIND "("') DO ECHO Where:  date_format is any combination of %%A, %%B and/or %%C
-IF NOT "%OS%"=="Windows_NT" ECHO Where:  date_format is any combination of dd, mm and/or yy
-ECHO                     (these date_format options are always in the computer's
-IF NOT "%OS%"=="Windows_NT" ECHO                     local language; to look them up, type VER ¦ DATE)
-IF NOT "%OS%"=="Windows_NT" GOTO Skip
-ECHO                     local language; to look them up, type VER ?| DATE)
-:Skip
-ECHO         delimiter   is the delimiter to be used in the end result
-ECHO         /LZ         use leading zeroes in the end result
-ECHO.
-ECHO Examples (for English Windows versions):
-ECHO DATEFMT yy mm dd        ---  2007115    (January 15 or November 5, 2007)
-ECHO DATEFMT yy mm dd -      ---  2007-11-5  (November 5, 2007)
-ECHO DATEFMT yy mm dd - /LZ  ---  2007-11-05 (November 5, 2007)
-ECHO DATEFMT mm /LZ          ---  01         (January)
-ECHO DATEFMT yy mm - /LZ     ---  2007-06    (June 2007)
-ECHO DATEFMT dd mm dd * /LZ  ---  11*03*11   (March 11)
-ECHO.
-ECHO Inspired by Simon Sheppard's GetDate.bat
-ECHO http://www.ss64.com/ntsyntax/getdate.html
-ECHO Written by Rob van der Woude
-ECHO http://www.robvanderwoude.com

bin/datetime.bat

@@ -1,3 +0,0 @@
-for /F "tokens=1-4 delims=:., " %%a in ('time/T') do set _TIME=%%a%%b%%c
-for /F "tokens=2-5 delims=:.,/ " %%a in ('date/T') do set _DATE=%%a%%b%%c
-SET SNAPDATETIME=%_DATE%%_TIME%

bin/patch.bat

@@ -1,3 +0,0 @@
-@echo off
-c:\Users\pierre\Documents\php-sdk\bin\patch.exe < %1
-pause

bin/php/do_php.bat

@@ -0,0 +1,3 @@
+@echo ofF
+
+%~dp0php.exe -c %~dp0php.ini -d curl.cainfo=%PHP_SDK_ROOT_PATH%\msys2\usr\ssl\cert.pem -d extension_dir=%~dp0ext %*

bin/php/php.ini

@@ -0,0 +1,13 @@
+
+extension=php_curl.dll
+extension=php_ftp.dll
+extension=php_sqlite3.dll
+extension=php_openssl.dll
+extension=php_mbstring.dll
+extension=php_mysqli.dll
+extension=php_zip.dll
+memory_limit=4G
+
+error_reporting=-1
+display_errors=1
+display_startup_errors=1

bin/phpsdk_buildtree.bat

@@ -4,38 +4,43 @@ IF "%1" EQU "" GOTO Help
 IF "%2" NEQ ""   SET _=%2\%1
 IF "%2" EQU ""   SET _=%CD%\%1
 
-MD %_%\vc9\x86\deps\bin
-MD %_%\vc9\x86\deps\lib
-MD %_%\vc9\x86\deps\include
-MD %_%\vc9\x64\deps\bin
-MD %_%\vc9\x64\deps\lib
-MD %_%\vc9\x64\deps\include
+rem if we're in the starter script shell, create the only struct that corresponds to the current env
+rem otherwise - retain the old behavior, create structs for all the known build combinations and don't cd
 
-MD %_%\vc11\x86\deps\bin
-MD %_%\vc11\x86\deps\lib
-MD %_%\vc11\x86\deps\include
-MD %_%\vc11\x64\deps\bin
-MD %_%\vc11\x64\deps\lib
-MD %_%\vc11\x64\deps\include
+cmd /c "exit /b 0"
 
-MD %_%\vc12\x86\deps\bin
-MD %_%\vc12\x86\deps\lib
-MD %_%\vc12\x86\deps\include
-MD %_%\vc12\x64\deps\bin
-MD %_%\vc12\x64\deps\lib
-MD %_%\vc12\x64\deps\include
+if "%PHP_SDK_ARCH%" NEQ "" (
+	if "%PHP_SDK_VS%" NEQ "" (
+		MD %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%\deps\bin
+		MD %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%\deps\lib
+		MD %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%\deps\include
+		cd %_%\%PHP_SDK_VS%\%PHP_SDK_ARCH%
+		goto exit
+	)
+	goto create_all
+) else (
+:create_all
+	for %%i in (vc14 vc15 vs16 vs17) do (
+		MD %_%\%%i\x86\deps\bin
+		MD %_%\%%i\x86\deps\lib
+		MD %_%\%%i\x86\deps\include
+		MD %_%\%%i\x64\deps\bin
+		MD %_%\%%i\x64\deps\lib
+		MD %_%\%%i\x64\deps\include
+		MD %_%\%%i\arm64\deps\bin
+		MD %_%\%%i\arm64\deps\lib
+		MD %_%\%%i\arm64\deps\include
+	)
+)
 
-MD %_%\vc14\x86\deps\bin
-MD %_%\vc14\x86\deps\lib
-MD %_%\vc14\x86\deps\include
-MD %_%\vc14\x64\deps\bin
-MD %_%\vc14\x64\deps\lib
-MD %_%\vc14\x64\deps\include
+set _=
 
 GOTO EXIT
 
 :help
-echo createbuildtree ^<nameofthetree^> [PATH]
+echo phpsdk_buildtree ^<nameofthetree^> [PATH]
 echo  Create the common directory structure used by the PHP SDK
 
 :EXIT
+exit /b %errorlevel%
+

bin/phpsdk_deps.bat

@@ -0,0 +1,16 @@
+@echo off
+
+cmd /c "exit /b 0"
+
+if "%PHP_SDK_PHP_CMD%"=="" (
+	call %~dp0phpsdk_setvars.bat
+	if "!PHP_SDK_PHP_CMD!"=="" (
+		echo PHP SDK is not setup
+		exit /b 3
+	)
+)
+
+call %PHP_SDK_PHP_CMD% %PHP_SDK_BIN_PATH%\phpsdk_deps.php %*
+
+exit /b %errorlevel%
+

bin/phpsdk_deps.php

@@ -0,0 +1,217 @@
+<?php
+
+include __DIR__ . "/../lib/php/autoload.php";
+
+use SDK\{Config, Exception};
+
+$sopt = "s:cuhb:a:d:t:fnp";
+$lopt = array(
+	"branch:",
+	"update",
+	"check",
+	"stability:",
+	"arch:",
+	"crt:",
+	"help",
+	"deps:",
+	"force",
+	"no-backup",
+	"pack",
+);
+
+$cmd = NULL;
+$stability = NULL;
+$arch = NULL;
+$branch = NULL;
+$crt = NULL;
+$force = false;
+$backup = true;
+
+try {
+
+	$branch = NULL;
+
+	$opt = getopt($sopt, $lopt);
+	foreach ($opt as $name => $val) {
+		switch ($name) {
+			default:
+				throw new Exception("Unknown switch '$name'");
+				break;
+
+			case "h":
+			case "help":
+				usage(0);
+				break;
+
+			case "b":
+			case "branch":
+				/* Branch config depends on other information. We can set it
+					right away, because the option order can't be  guaranteed. */
+				$branch = $val;
+				break;
+
+			case "s":
+			case "stability":
+				Config::setCurrentStabilityName($val);
+				break;
+
+			case "a":
+			case "arch":
+				Config::setCurrentArchName($val);
+				break;
+
+			case "d":
+			case "deps":
+				Config::setDepsLocalPath($val);
+				break;
+
+			case "c":
+			case "check":
+				$cmd = "check";
+				break;
+			case "u":
+			case "update":
+				$cmd = "update";
+				break;
+
+			case "t":
+			case "crt":
+				Config::setCurrentCrtName($val);
+				break;
+
+			case "f":
+			case "force":
+				$force = true;
+				break;
+
+			case "n":
+			case "no-backup":
+				$backup = false;
+				break;
+
+			case "p":
+			case "pack":
+				$cmd = "pack";
+				break;
+		}
+	}
+
+	if (NULL == $branch) {
+		$branch = Config::guessCurrentBranchName();
+		if (NULL == $branch) {
+			throw new Exception("Couldn't determine current branch name, expect an explicit input.");
+		}
+	}
+	Config::setCurrentBranchName($branch);
+
+	if (NULL === $cmd) {
+		usage();
+	}
+
+	if (NULL === Config::getDepsLocalPath()) {
+		usage(3);
+	}
+
+	$branch = Config::getCurrentBranchName();
+	if (NULL == $branch) {
+		usage(3);
+	}
+
+	$arch = Config::getCurrentArchName();
+	if (NULL === $arch) {
+		usage(3);
+	}
+
+	if (NULL === Config::getCurrentCrtName()) {
+		usage(3);
+	}
+	/* The current CRT needs to match the config one. */
+	$active_crt = getenv("PHP_SDK_VS");
+	if (Config::getCurrentCrtName() != $active_crt && !$force) {
+		throw new Exception("Active CRT name '$active_crt' differs from the branch CRT name '" . Config::getCurrentCrtName() . "'.");
+	}
+
+	$branch_data = Config::getCurrentBranchData();
+	echo "\nConfiguration: " . Config::getCurrentBranchName() . "-$branch_data[crt]-$branch_data[arch]-$branch_data[stability]\n\n";
+
+	/* Let the dep manager to run the command. */
+	$dm = new SDK\Build\Dependency\Manager(Config::getDepsLocalPath(), $branch_data["stability"], $branch_data["arch"]);
+	switch ($cmd) {
+		default:
+			throw new Exception("Unknown command '$cmd'");
+		break;
+		case "check":
+			$ret = $dm->updatesAvailable();
+			if ($ret) {
+				msg("Updates are available.", 7);
+			} else {
+				msg("No updates are available.");
+			}
+			break;
+		case "update":
+			if ($force) {
+				print "Replacing the current deps by the force option.\n\n";
+			}
+			$dm->performUpdate($msg, $force, $backup);
+			msg($msg);
+			break;
+		case "pack":
+			$path_to_pack = Config::getDepsLocalPath();
+			$pack_path = dirname($path_to_pack) . DIRECTORY_SEPARATOR . "deps-$branch-$branch_data[crt]-$branch_data[arch].7z";
+			print "Packaging '$path_to_pack' as '$pack_path'.\n\n";
+			if ($force && is_file($pack_path)) {
+				unlink($pack_path);
+			}
+			system("7za a $pack_path $path_to_pack", $st);
+			exit((int)$st);
+			break;
+	}
+
+} catch (Throwable $e) {
+	//var_dump($e);
+	//echo "\nError: ", $e->getMessage(), PHP_EOL;
+	throw $e;
+	exit(3);
+}
+
+function usage(int $code = -1)
+{
+	echo "PHP SDK dependency handling tool.", PHP_EOL;
+	echo "Usage: ", PHP_EOL, PHP_EOL;
+	echo "Configuration:", PHP_EOL;
+	echo "  -b --branch    Branch name, eg. 7.0, 7.1, etc. If omited, several guess methods apply.", PHP_EOL;
+	echo "  -a --arch      Architecture, x86 or x64 or arm64. If omited, cl.exe is used to guess.", PHP_EOL;
+	echo "  -t --crt       CRT, marked by the corresponding VC++ version, eg. vc11, vc14, etc.", PHP_EOL;
+	echo "  -s --stability One of stable or staging.", PHP_EOL, PHP_EOL;
+	echo "Commands:", PHP_EOL;
+	echo "  -c --check     Check for dependency updates. If updates are available, the exit code is set to 7.", PHP_EOL;
+	echo "  -u --update    Update dependencies. If deps directory already exists, backup copy is created automatically.", PHP_EOL;
+	echo "  -p --pack      Archive the dependency directory.", PHP_EOL, PHP_EOL;
+	echo "Misc:", PHP_EOL;
+	echo "  -d --deps      Path to the dependencies directory. If omited, CWD is used to guess.", PHP_EOL;
+	echo "  -f --force     Force the operation even if there are no upgrades available.", PHP_EOL;
+	echo "  -n --no-backup Replace the current dependencies without creating backup.", PHP_EOL;
+	echo "  -h --help      Show help message.", PHP_EOL, PHP_EOL;
+	echo "Example: ", PHP_EOL;
+	echo "  phpsdk_deps -c -b master", PHP_EOL;
+	echo "  phpsdk_deps -u -b 7.0 -a x86 -d c:\\path\\to\\deps\\dir", PHP_EOL, PHP_EOL;
+
+	$code = -1 == $code ? 0 : $code;
+	exit($code);
+}
+
+function msg(string $s, int $code = 0) {
+	echo $s, PHP_EOL;
+	exit($code);
+}
+
+exit(0);
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

bin/phpsdk_dllmap.bat

@@ -0,0 +1,16 @@
+@echo off
+
+cmd /c "exit /b 0"
+
+if "%PHP_SDK_PHP_CMD%"=="" (
+	call %~dp0phpsdk_setvars.bat
+	if "!PHP_SDK_PHP_CMD!"=="" (
+		echo PHP SDK is not setup
+		exit /b 3
+	)
+)
+
+call %PHP_SDK_PHP_CMD% %PHP_SDK_BIN_PATH%\phpsdk_dllmap.php %*
+
+exit /b %errorlevel%
+

bin/phpsdk_dllmap.php

@@ -6,7 +6,7 @@
 	- create mappings between dll filename and zip filename
 
 	Usage:
-	php dllmap.php path0 [ path1 ... ] > dllmapping.json
+	php dllmap.php [--pretty] path0 [ path1 ... ] > dllmapping.json
 */
 
 
@@ -20,8 +20,25 @@
 	"C:\\tmp\\libs",
 );*/
 
+$sopt = "p";
+$lopt = array(
+	"pretty",
+);
+
+$flags = 0;
+$opt = getopt($sopt, $lopt);
+foreach ($opt as $name => $val) {
+	switch ($name) {
+		case "p":
+		case "pretty":
+			$flags = JSON_PRETTY_PRINT;
+			break;
+	}
+}
+
+
 $dirs = array();
-foreach (array_slice($_SERVER["argv"], 1) as $item) {
+foreach (array_slice($_SERVER["argv"], (0 == $flags ? 1 : 2)) as $item) {
 	if (file_exists($item) && is_dir($item)) {
 		$dirs[] = $item;
 	}
@@ -32,26 +49,7 @@ if (empty($dirs)) {
 	die;
 }
 
-
-$out = array(
-	"vc9" => array(
-		"x86" => array(),
-		"x64" => array(),
-	),
-	"vc11" => array(
-		"x86" => array(),
-		"x64" => array(),
-	),
-	"vc12" => array(
-		"x86" => array(),
-		"x64" => array(),
-	),
-	"vc14" => array(
-		"x86" => array(),
-		"x64" => array(),
-	),
-);
-
+$out = array();
 
 foreach ($dirs as $path) {
 	$dir = new DirectoryIterator($path);
@@ -67,29 +65,36 @@ foreach ($dirs as $path) {
 			continue;
 		}
 
-		if (!preg_match(",.*-(vc\d+)-(x\d\d)\.zip,", $filename, $m)) {
+		if (!preg_match(",.*-(v[c|s]\d+)-(x\d\d)\.zip,", $filename, $m)) {
 			continue;
 		}
 
 		$crt = $m[1];
 		$arch = $m[2];
 
+		if (!isset($out[$crt])) {
+			$out[$crt] = array();
+		}
+		if (!isset($out[$crt][$arch])) {
+			$out[$crt][$arch] = array();
+		}
+
 		$zip = new ZipArchive();
 
 		$zip->open($pathname);
 
 		$dlls = array();
 
-		for( $i = 0; $i < $zip->numFiles; $i++ ){
-			$stat = $zip->statIndex( $i );
-			
+		for ($i = 0; $i < $zip->numFiles; $i++) {
+			$stat = $zip->statIndex($i);
+
 			if (substr($stat['name'], -3) != "dll") {
 				continue;
 			}
 
 			$dlls[] = basename($stat['name']);
 		} 
-		
+
 		$zip->close();
 		unset($zip);
 
@@ -100,5 +105,13 @@ foreach ($dirs as $path) {
 	}
 }
 
-echo json_encode($out);
+echo json_encode($out, $flags);
 
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

bin/phpsdk_dumpenv.bat

@@ -0,0 +1,22 @@
+@echo off
+
+if "%PHP_SDK_OS_ARCH%"=="" (
+	echo PHP SDK is not setup
+	exit /b 3
+)
+
+cmd /c "exit /b 0"
+
+echo.
+
+call %PHP_SDK_BIN_PATH%\phpsdk_version.bat
+echo.
+
+echo OS architecture:    %PHP_SDK_OS_ARCH% 
+echo Build architecture: %PHP_SDK_ARCH% 
+echo Visual C++:         %PHP_SDK_VC_TOOLSET_VER%
+echo PHP-SDK path:       %PHP_SDK_ROOT_PATH%
+
+
+exit /b %errorlevel%
+

bin/phpsdk_pgo.bat

@@ -0,0 +1,14 @@
+@echo off
+
+if "%PHP_SDK_PHP_CMD%"=="" (
+	call %~dp0phpsdk_setvars.bat
+	if "!PHP_SDK_PHP_CMD!"=="" (
+		echo PHP SDK is not setup
+		exit /b 3
+	)
+)
+
+cmd /c %PHP_SDK_PHP_CMD% %PHP_SDK_BIN_PATH%\phpsdk_pgo.php %*
+
+exit /b %errorlevel%
+

bin/phpsdk_pgo.php

@@ -0,0 +1,134 @@
+<?php
+
+include __DIR__ . "/../lib/php/autoload.php";
+
+use SDK\Config;
+use SDK\Exception;
+use SDK\Build\PGO\Controller;
+
+$sopt = "itudhs:frc:";
+$lopt = array("init", "train", "up", "down", "help", "scenario:", "force", "ready", "cases:");
+
+$cmd = NULL;
+/* TODO For now we simply check the current php build, this could be extended to take arbitrary binaries. */
+$deps_root = NULL;
+$php_root = NULL;
+$scenario = NULL;
+$force = false;
+$cases = NULL;
+
+try {
+	$opt = getopt($sopt, $lopt);
+	foreach ($opt as $name => $val) {
+		switch ($name) {
+			case "i":
+			case "init":
+				$cmd = "init";
+				break;
+			case "ready":
+				$cmd = "check_init";
+				break;
+			case "t":
+			case "train":
+				$cmd = "train";
+				break;
+			case "u":
+			case "up":
+				$cmd = "up";
+				break;
+			case "d":
+			case "down":
+				$cmd = "down";
+				break;
+			case "s":
+			case "scenario":
+				$scenario = $val;
+				break;
+			case "f":
+			case "force":
+				$force = true;
+				break;
+				/* XXX This option is for now only integrated for training. It
+					would make sense to integrate it also with init. */
+			case "c":
+			case "cases":
+				$cases = explode(",", $val);
+				break;
+			case "h": case "help":
+				usage(0);
+				break;
+		}
+	}
+
+	if (NULL === $cmd) {
+		usage();
+	}
+
+	$deps_root = Config::getDepsLocalPath();
+
+	if ("check_init" != $cmd) {
+		/* XXX Need these checks for more safety, as long as the dist zipballs are not supported. */
+		if (!file_exists("Makefile")) {
+			throw new Exception("Makefile not found. Arbitrary php snapshots are not supported yet, switch to the php source dir.");
+		}
+		if (preg_match(",BUILD_DIR=(.+),", file_get_contents("Makefile"), $m)) {
+			$php_root = trim($m[1]);
+		}
+		if (!$php_root || !file_exists($php_root)) {
+			throw new Exception("Invalid php root dir encountered '$php_root'.");
+		}
+	}
+
+	$controller = new Controller($cmd, $scenario, $cases);
+	$controller->handle($force);
+
+	if ("check_init" == $cmd) {
+		/* 0 for success, fail otherwise. */
+		$ret = ($controller->isInitialized() === false);
+		exit((int)$ret);
+	}
+
+	/*$env = getenv();
+	$env["PATH"] = $deps_root . DIRECTORY_SEPARATOR . "bin;" . $env["PATH"];
+
+	$php = $php_root . DIRECTORY_SEPARATOR . "php.exe";
+	$php = $php_root . DIRECTORY_SEPARATOR . "php.exe";*/
+
+} catch (Throwable $e) {
+	throw $e;
+	exit(3);
+}
+
+
+function usage(int $code = -1)
+{
+	echo "PHP SDK PGO training tool.", PHP_EOL;
+	echo "Usage: ", PHP_EOL, PHP_EOL;
+	echo "Commands:", PHP_EOL;
+	echo "  -i --init     Initialize training environment.", PHP_EOL;
+	echo "  -t --train    Run training. This involves startup, training and shutdown.", PHP_EOL;
+	echo "  -u --up       Startup training environment.", PHP_EOL;
+	echo "  -d --down     Shutdown training environment.", PHP_EOL;
+	echo "  -f --force    Force requested operation. Not every option can be forced.", PHP_EOL;
+	echo "  -s --scenario Run training with a specified scenario.", PHP_EOL;
+	echo "  -c --cases    Run training with specified cases only. If omited, all the active cases will be used.", PHP_EOL;
+
+	/*echo "  -p --php-root  PHP binary to train.", PHP_EOL;*/
+
+	$code = -1 == $code ? 0 : $code;
+	exit($code);
+}
+
+function msg(string $s, int $code = 0) {
+	echo $s, PHP_EOL;
+	exit($code);
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */

bin/phpsdk_rebase_msys2.cmd

@@ -0,0 +1,40 @@
+@echo off
+
+setlocal enableextensions enabledelayedexpansion
+
+set PHPSDK_MSYS2_BASE_ADDR=0x100400000
+set PHPSDK_MSYS2_BASE_DYNAMIC=0
+
+:getopt
+if /i "%1" equ "--help" goto help
+if /i "%1" equ "--addr" (
+	set PHPSDK_MSYS2_BASE_ADDR=%2 & shift
+	for /l %%a in (1,1,100) do if "!PHPSDK_MSYS2_BASE_ADDR:~-1!"==" " set PHPSDK_MSYS2_BASE_ADDR=!PHPSDK_MSYS2_BASE_ADDR:~0,-1!
+)
+shift
+if /i "%1" equ "--dynamic" (
+	set PHPSDK_MSYS2_BASE_DYNAMIC=1
+	shift
+)
+if not (%1)==() goto getopt
+
+IF "1" EQU "%PHPSDK_MSYS2_BASE_DYNAMIC%" (
+	echo Rebasing MSYS2 DLLs to load at a dynamic address
+	editbin /NOLOGO /DYNAMICBASE %PHP_SDK_ROOT_PATH%\msys2\usr\bin\*.dll
+) else (
+	echo Rebasing MSYS2 DLLs to load at %PHPSDK_MSYS2_BASE_ADDR%
+	editbin /NOLOGO /REBASE:BASE=%PHPSDK_MSYS2_BASE_ADDR%,DOWN %PHP_SDK_ROOT_PATH%\msys2\usr\bin\*.dll
+)
+
+set PHPSDK_MSYS2_BASE_ADDR=
+set PHPSDK_MSYS2_BASE_DYNAMIC=
+
+GOTO EXIT
+
+:help
+echo phpsdk_rebase_msys2 ^<address^>
+echo Rebase MSYS2 DLLs to the given address. If ommited, default is 0x100400000.
+
+:EXIT
+exit /b %errorlevel%
+

bin/phpsdk_setshell.bat

@@ -0,0 +1,240 @@
+@echo off
+
+if not defined PHP_SDK_RUN_FROM_ROOT (
+	echo This script should not be run directly.
+	echo Use starter scripts looking like phpsdk-^<crt^>-^<arch^>.bat in the PHP SDK root instead.
+	goto out_error
+)
+
+
+if "%1"=="" goto :help
+if "%1"=="/?" goto :help
+if "%1"=="-h" goto :help
+if "%1"=="--help" goto :help
+if "%2"=="" goto :help
+
+cmd /c "exit /b 0"
+
+set PHP_SDK_VS=%1
+if /i not "%PHP_SDK_VS:~0,2%"=="vc" (
+	if /i not "%PHP_SDK_VS:~0,2%"=="vs" (
+:malformed_vc_string
+		echo Malformed CRT string "%1"
+		set PHP_SDK_VS=
+		goto out_error
+	)
+)
+if ""=="%PHP_SDK_VS:~2%" (
+	goto malformed_vc_string
+)
+set /a TMP_CHK=%PHP_SDK_VS:~2%
+if 14 gtr %TMP_CHK% (
+	if "0"=="%TMP_CHK%" (
+		if not "0"=="%PHP_SDK_VS:~2%" (
+			set TMP_CHK=
+			goto malformed_vc_string
+		)
+	)
+
+	echo At least vc14 is required
+	set PHP_SDK_VS=
+	set TMP_CHK=
+	goto out_error
+)
+set PHP_SDK_VS_NUM=%TMP_CHK%
+set TMP_CHK=
+
+rem check target arch
+if "%2"=="x86" set PHP_SDK_ARCH=%2
+if "%2"=="x64" set PHP_SDK_ARCH=%2
+if "%2"=="x86_64" set PHP_SDK_ARCH=x64
+if "%2"=="amd64" set PHP_SDK_ARCH=x64
+if "%2"=="arm64" set PHP_SDK_ARCH=%2
+if "%PHP_SDK_ARCH%"=="" (
+	echo Unsupported target arch %2 >&2
+	goto out_error
+)
+
+set TOOLSET=
+if NOT "%3"=="" SET TOOLSET=%3 
+
+rem check OS arch
+rem todo: allow user choose host sdk arch (i.e. x64 target can be compiled at x64(native) or x86(cross))
+for /f "usebackq tokens=1*" %%i in (`wmic cpu get Architecture /value /format:table ^| findstr /r "[1234567890][1234567890]*"`) do (
+	set PHP_SDK_OS_ARCH_NUM=%%i
+)
+
+goto os_arch_cases
+:os_arch_error
+echo Unsupported OS arch %PHP_SDK_OS_ARCH% >&2
+goto out_error
+
+:os_arch_cases
+if "%PHP_SDK_OS_ARCH_NUM%"=="0" set PHP_SDK_OS_ARCH=x86
+if "%PHP_SDK_OS_ARCH_NUM%"=="1" (set PHP_SDK_OS_ARCH=mips && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="2" (set PHP_SDK_OS_ARCH=alpha && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="3" (set PHP_SDK_OS_ARCH=ppc && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="4" (set PHP_SDK_OS_ARCH=shx && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="5" (set PHP_SDK_OS_ARCH=arm32 && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="6" (set PHP_SDK_OS_ARCH=ia64 && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="7" (set PHP_SDK_OS_ARCH=alpha64 && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="8" (set PHP_SDK_OS_ARCH=msil && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="9" set PHP_SDK_OS_ARCH=x64
+rem wow64
+if "%PHP_SDK_OS_ARCH_NUM%"=="10" set PHP_SDK_OS_ARCH=x86
+if "%PHP_SDK_OS_ARCH_NUM%"=="11" (set PHP_SDK_OS_ARCH=neutral && goto os_arch_error)
+if "%PHP_SDK_OS_ARCH_NUM%"=="12" set PHP_SDK_OS_ARCH=arm64
+if "%PHP_SDK_OS_ARCH_NUM%"=="13" (set PHP_SDK_OS_ARCH=arm32 && goto os_arch_error)
+rem woa64
+if "%PHP_SDK_OS_ARCH_NUM%"=="14" set PHP_SDK_OS_ARCH=x86
+if "%PHP_SDK_OS_ARCH%"=="" (
+	goto os_arch_error
+)
+
+set PHP_SDK_OS_ARCH_NUM=
+
+rem cross compile is ok, so we donot need this
+rem if not /i "%PHP_SDK_ARCH%"=="PHP_SDK_OS_ARCH" (
+rem 	echo 32-bit OS detected, native 64-bit toolchain is unavailable.
+rem 	goto out_error
+rem )
+
+rem get vc base dir
+if 15 gtr %PHP_SDK_VS_NUM% (
+	rem for arch other than x86, use WOW6432
+	if /i not "%PHP_SDK_OS_ARCH%"=="x86" (
+		set TMPKEY=HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%PHP_SDK_VS:~2%.0\Setup\VC
+	) else (
+		set TMPKEY=HKLM\SOFTWARE\Microsoft\VisualStudio\%PHP_SDK_VS:~2%.0\Setup\VC
+	)
+	reg query !TMPKEY! /v ProductDir >nul 2>&1
+	if errorlevel 1 (
+		echo Couldn't determine VC%PHP_SDK_VS:~2% directory
+		goto out_error;
+	)
+	for /f "tokens=2*" %%a in ('reg query !TMPKEY! /v ProductDir') do set PHP_SDK_VC_DIR=%%b
+) else (
+	rem build the version range, e.g. "[15,16)"
+	set /a PHP_SDK_VS_RANGE=PHP_SDK_VS_NUM + 1
+	set PHP_SDK_VS_RANGE="[%PHP_SDK_VS_NUM%,!PHP_SDK_VS_RANGE%!)"
+
+	set APPEND=x86.x64
+	if /i "%PHP_SDK_OS_ARCH%"=="arm64" (
+		set APPEND=ARM64
+	)
+	set VS_VERSION_ARGS="-latest"
+	if "%TOOLSET%"=="" set VS_VERSION_ARGS=-version !PHP_SDK_VS_RANGE!
+	for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo !VS_VERSION_ARGS! -requires Microsoft.VisualStudio.Component.VC.Tools.!APPEND! -property installationPath -format text') do (
+		set PHP_SDK_VC_DIR=%%b\VC
+	)
+	if not exist "!PHP_SDK_VC_DIR!" (
+		for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo !VS_VERSION_ARGS! -products Microsoft.VisualStudio.Product.BuildTools -requires Microsoft.VisualStudio.Component.VC.Tools.!APPEND! -property installationPath -format text') do (
+			set PHP_SDK_VC_DIR=%%b\VC
+		)
+		if not exist "!PHP_SDK_VC_DIR!" (
+			rem check for a preview release
+			for /f "tokens=1* delims=: " %%a in ('%~dp0\vswhere -nologo !VS_VERSION_ARGS! -prerelease -requires Microsoft.VisualStudio.Component.VC.Tools.!APPEND! -property installationPath -format text') do (
+				set PHP_SDK_VC_DIR=%%b\VC
+			)
+			if not exist "!PHP_SDK_VC_DIR!" (
+				echo Could not determine '%PHP_SDK_VS%' directory
+				goto out_error;
+			)
+		)
+	)
+	set VSCMD_ARG_no_logo=nologo
+)
+set APPEND=
+set TMPKEY=
+set PHP_SDK_VS_RANGE=
+
+if 15 gtr %PHP_SDK_VS_NUM% (
+	rem get sdk dir
+	rem if 10.0 is available, it's ok
+	rem for arch other than x86, use WOW6432
+	if /i not "%PHP_SDK_OS_ARCH%"=="x86" (
+		set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0
+	) else (
+		set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0
+	)
+	for /f "tokens=2*" %%a in ('reg query "!TMPKEY!" /v InstallationFolder') do (
+		for /f "tokens=2*" %%c in ('reg query "!TMPKEY!" /v ProductVersion') do (
+			if exist "%%bInclude\%%d.0\um\Windows.h" (
+				goto got_sdk
+			)
+		)
+	)
+
+	rem Otherwise 8.1 should be available anyway
+	rem for arch other than x86, use WOW6432
+	if /i not "%PHP_SDK_OS_ARCH%"=="x86" (
+		set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v8.1
+	) else (
+		set TMPKEY=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1
+	)
+	for /f "tokens=2*" %%a in ('reg query "!TMPKEY!" /v InstallationFolder') do (
+		if exist "%%b\Include\um\Windows.h" (
+			goto got_sdk
+		)
+	)
+
+	echo Windows SDK not found.
+	goto out_error;
+:got_sdk
+	set TMPKEY=
+)
+
+if /i "%PHP_SDK_ARCH%"=="x64" (
+	set TARGET_ARCH_NAME=amd64
+) else (
+	set TARGET_ARCH_NAME=%PHP_SDK_ARCH%
+)
+
+if /i "%PHP_SDK_OS_ARCH%"=="x64" (
+	set HOST_ARCH_NAME=amd64
+) else (
+	set HOST_ARCH_NAME=%PHP_SDK_ARCH%
+)
+
+if "%HOST_ARCH_NAME%"=="%TARGET_ARCH_NAME%" (
+	set VCVARSALL_ARCH_NAME=%HOST_ARCH_NAME%
+) else if "%HOST_ARCH_NAME%_%TARGET_ARCH_NAME%"=="amd64_x86" (
+	set VCVARSALL_ARCH_NAME=%TARGET_ARCH_NAME%
+) else (
+	set VCVARSALL_ARCH_NAME=%HOST_ARCH_NAME%_%TARGET_ARCH_NAME%
+)
+if 15 gtr %PHP_SDK_VS_NUM% (
+    if NOT "%TOOLSET%"=="" (
+        set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" !VCVARSALL_ARCH_NAME! -vcvars_ver=%TOOLSET%
+    ) else (
+        set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" !VCVARSALL_ARCH_NAME!
+    )
+) else (
+    if NOT "%TOOLSET%"=="" (
+        set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" !VCVARSALL_ARCH_NAME! -vcvars_ver=%TOOLSET%
+    ) else (
+        set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" !VCVARSALL_ARCH_NAME!
+    )
+)
+set VCVARSALL_ARCH_NAME=
+
+rem echo Visual Studio VC path %PHP_SDK_VC_DIR%
+rem echo Windows SDK path %PHP_SDK_WIN_SDK_DIR%
+
+
+goto out
+
+:help
+	echo "Start Visual Studio command line for PHP SDK"
+	echo "Usage: %0 vc arch" 
+	echo nul
+
+:out_error
+	exit /b 3
+
+:out
+rem	echo Shell configuration complete
+	exit /b 0
+
+goto :eof
+

bin/phpsdk_setvars.bat

@@ -1,13 +1,28 @@
-REM phpsdk.bat
-@ECHO OFF
-
-REM  Add skd\bin directory to the path
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-SET PHP_SDK_BIN_PATH=%PHP_SDK_SCRIPT_PATH%\..\bin
-SET PHP_SDK_PATH=%PHP_SDK_SCRIPT_PATH%\..
-
-SET PATH=%PATH%;%PHP_SDK_BIN_PATH%;%PHP_SDK_SCRIPT_PATH%;D:\apps\svn\bin
-
-REM Set BISON_SIMPLE
-SET BISON_SIMPLE=%PHP_SDK_BIN_PATH%\bison.simple
-
+@echo off
+
+cmd /c "exit /b 0"
+
+rem Add necessary dirs to the path 
+
+set PHP_SDK_BIN_PATH=%~dp0
+rem remove trailing slash
+set PHP_SDK_BIN_PATH=%PHP_SDK_BIN_PATH:~0,-1%
+
+for %%a in ("%PHP_SDK_BIN_PATH%") do set PHP_SDK_ROOT_PATH=%%~dpa
+rem remove trailing slash
+set PHP_SDK_ROOT_PATH=%PHP_SDK_ROOT_PATH:~0,-1%
+
+set PHP_SDK_MSYS2_PATH=%PHP_SDK_ROOT_PATH%\msys2\usr\bin
+set PHP_SDK_PHP_CMD=%PHP_SDK_BIN_PATH%\php\do_php.bat
+
+set PATH=%PHP_SDK_BIN_PATH%;%PHP_SDK_MSYS2_PATH%;%PATH%
+
+for /f "tokens=1* delims=: " %%a in ('link /?') do ( 
+	set PHP_SDK_VC_TOOLSET_VER=%%b
+	goto break0
+)
+:break0
+set PHP_SDK_VC_TOOLSET_VER=%PHP_SDK_VC_TOOLSET_VER:~-13%
+
+exit /b %errorlevel%
+

bin/phpsdk_version.bat

@@ -0,0 +1,16 @@
+@echo off
+
+cmd /c "exit /b 0"
+
+if "%PHP_SDK_PHP_CMD%"=="" (
+	call %~dp0phpsdk_setvars.bat
+	if "!PHP_SDK_PHP_CMD!"=="" (
+		echo PHP SDK is not setup
+		exit /b 3
+	)
+)
+
+%PHP_SDK_PHP_CMD% -r "echo 'PHP SDK ' . file_get_contents(getenv('PHP_SDK_ROOT_PATH') . '\\VERSION');"
+
+exit /b %errorlevel%
+

bin/phpsdkvars.bat

@@ -1,10 +0,0 @@
-::phpsdk.bat
-@ECHO OFF
-:: Add skd\bin directory to the path
-
-SET PHP_SDK_BIN_PATH=%~dp0
-
-SET PATH=%PATH%;%PHP_SDK_BIN_PATH%
-
-:: Set BISON_SIMPLE
-SET BISON_SIMPLE=%PHP_SDK_BIN_PATH%bison.simple

bin/snapshot.bat

@@ -1,272 +0,0 @@
-@ECHO off
-REM Configuration 
-CALL %PHP_SDK_PATH%\script\conf_tools.bat
-
-IF EXIST %PHP_SDK_PATH%\snaps.lock (
-	ECHO Snapshot script is already running
-	GOTO EXIT_LOCKED
-)
-
-SET LOG_DIR=%PHP_SDK_PATH%\log
-SET START=%CD%
-echo "LOCKED" >  %PHP_SDK_PATH%\snaps.lock
-
-IF "%1"=="" GOTO HELP
-IF "%2"=="" GOTO HELP
-IF "%3"=="" GOTO HELP
-IF "%4"=="" SET USE_CVS=Yes
-IF "%5"=="msi" SET USE_INSTALLER=Yes
-
-SET SRC_ARCHIVE=%4
-SET VC=%1
-SET BRANCH=%2
-SET DEST=%3
-FOR /F "TOKENS=1* DELIMS= " %%A IN ('DATE/T') DO SET CALL_DATE=%%B
-FOR /F "TOKENS=*" %%A IN ('TIME/T') DO SET CALL_TIME=%%A
-SET CALL_DATETIME=%CALL_DATE% %CALL_TIME%
-
-IF "%2"=="5.2" (
-	SET BRANCH=PHP_5_2
-	SET PHP_VERSION=5.2
-	GOTO START
-)
-IF "%2"=="5.3" (
-	SET BRANCH=PHP_5_3
-	SET PHP_VERSION=5.3
-	GOTO START
-)
-IF "%2"=="6.0" (
-	SET BRANCH=HEAD
-	SET PHP_VERSION=6.0
-	GOTO START
-)
-echo Invalid branch name
-GOTO EXIT
-
-:START
-for /F "tokens=1-4 delims=:., " %%a in ('time/T') do set _TIME=%%a%%b%%c
-for /F "tokens=2-5 delims=:.,/ " %%a in ('date/T') do set _DATE=%%a%%b%%c
-SET SNAPDATETIME=%_DATE%%_TIME%
-
-REM IF EXIST %3 rmdir /s /q %3
-SET OLD_INCLUDE=%INCLUDE%
-SET OLD_LIB=%LIB%
-SET OLD_PATH=%PATH%
-
-IF "%VC%"=="6" GOTO CONFIG_VC6
-IF "%VC%"=="9" GOTO CONFIG_VC9
-IF "%VC%"=="9x64" GOTO CONFIG_VC9_X64
-echo Invalid VC Version
-GOTO EXIT
-
-:CONFIG_VC6
-ECHO Setting environment for VC6-x86
-SET INCLUDE=%VC6_INCLUDE%
-SET LIB=%VC6_LIB%
-SET PATH=%VC6_PATH%;%PATH%
-SET ARCH=x86
-SET VC_VERS=VC6
-GOTO CVS
-
-:CONFIG_VC9
-ECHO Setting environment for VC9-x86
-SET INCLUDE=%VC9_INCLUDE%
-SET LIB=%VC9_LIB%
-SET PATH=%VC9_PATH%;%PATH%
-SET VC_VERS=VC9
-SET ARCH=x86
-GOTO CVS
-
-:CONFIG_VC9_X64
-ECHO Setting environment for VC9-x64
-SET INCLUDE=%VC9_X64_INCLUDE%
-SET LIB=%VC9_LIB%
-SET PATH=%VC9_X64_PATH%;%PATH%
-SET VC_VERS=VC9
-SET ARCH=x64
-
-:CVS
-IF NOT "%USE_CVS%"=="Yes" GOTO USE_LAST_ARCHIVE
-IF EXIST %DEST% RD /Q /S %DEST%
-echo checkout from  cvs %PHP_CVSROOT% -z3 checkout -r %BRANCH% -d %DEST% %PHP_MODULE%
-cvs %PHP_CVSROOT% -z3 export -r %BRANCH% -d %DEST% %PHP_MODULE% > %START%\cvs.log 2<&1
-
-GOTO TEST_DEST
-
-:USE_LAST_ARCHIVE
-ECHO Using archive %SRC_ARCHIVE% ...
-unzip -o -qq %SRC_ARCHIVE%
-FOR /D %%A IN (php-?.?-src-*) DO (
-	SET DIRNAME=%%A
-)
-ECHO Using %DIRNAME% ...
-IF EXIST %DIRNAME%.last GOTO ALREADY_DONE
-IF EXIST %DEST% RD /Q /S %DEST%
-REN %DIRNAME% %DEST%
-
-REM Clean old directories and .last file
-FOR /D %%A IN (php-?.?-src-*) DO (
-	RD /Q /S %%A
-)
-FOR /F "tokens=4 delims=-" %%A IN ("%DIRNAME%") DO SET SNAPDATETIME=%%A
-
-:TEST_DEST
-echo Testing %DEST%...
-IF EXIST %DEST% GOTO DEST_EXISTS 
-ECHO CVS or Archive ERROR %DEST% cannot be found
-GOTO EXIT
-
-:DEST_EXISTS
-echo Compiling...
-cd %DEST%
-
-echo Buildconf log for %SNAPDATETIME% called at %CALL_DATETIME% >> %START%\buildconf.log
-call buildconf.bat > %START%\buildconf.log 2<&1
-
-echo Configure log for %SNAPDATETIME% called at %CALL_DATETIME% > %START%\configure.log 2<&1
-cscript /nologo configure.js %CONFIGURE_ARGS% >> %START%\configure.log 2<&1
-
-echo Compile log for %SNAPDATETIME% called at %CALL_DATETIME% > %START%\compile.log
-nmake snap >> %START%\compile.log 2<&1
-
-:TRANSFERT
-echo Transfert files to %SSH_HOST%
-cd %DEST%
-IF EXIST Release_TS GOTO RELEASE_TS
-IF EXIST Release GOTO RELEASE_NTS
-
-:RELEASE_TS
-SET PHP_BUILD_DIR=Release_TS
-SET PHP_EXE=Release_TS\php.exe
-SET NTS_POSTFIX=
-SET NTS=ts
-IF NOT EXIST %PHP_EXE% (
-	ECHO Build error.
-	GOTO EXIT
-)
-GOTO REMOTE_COPY
-
-:RELEASE_NTS
-SET PHP_BUILD_DIR=Release
-SET PHP_EXE=Release\php.exe
-SET NTS_POSTFIX=-nts
-SET NTS=nts
-IF NOT EXIST %PHP_EXE% (
-	ECHO Build error.
-	GOTO EXIT
-)
-:REMOTE_COPY
-FOR /F "tokens=*" %%A IN ('%PHP_EXE% -r "echo substr(phpversion(),0,3);"') DO SET _PHPVERSION_SHORT=%%A
-FOR /F "tokens=*" %%A IN ('%PHP_EXE% -r "echo phpversion();"') DO SET _PHPVERSION_STRING=%%A
-IF "%USE_CVS%"=="Yes" FOR /F "tokens=*" %%A IN ('%PHP_EXE% -r "echo date('YmdHi');"') DO SET SNAPDATETIME=%%A
-
-SET SSH_URL=%SSH_USER%@%SSH_HOST%
-echo %SSH_KEY%
-FOR %%A IN (%START%\*.log) DO (
-	ECHO copying %LOG_DIR%\%%~nA-%_PHPVERSION_SHORT%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log ...
-	COPY %START%\%%~nA.log %LOG_DIR%\%%~nA-%_PHPVERSION_SHORT%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log
-	"%PUTTYBASE%pscp.exe" -batch -q -i %SSH_KEY% -l %SSH_USER% %LOG_DIR%\%%~nA-%_PHPVERSION_SHORT%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log %SSH_URL%:%REMOTE_PATH% >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-)
-
-FOR %%A IN (%PHP_BUILD_DIR%\*.zip) DO (
-	echo Copying %%~nA-%SNAPDATETIME%.zip ...
-	"%PUTTYBASE%pscp.exe" -batch -q -i %SSH_KEY% -l %SSH_USER% %PHP_BUILD_DIR%\%%~nA.zip %SSH_URL%:%REMOTE_PATH%/%%~nA-%SNAPDATETIME%.zip >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-	copy %PHP_BUILD_DIR%\%%~nA.zip %PHP_BUILD_DIR%\%%~nA-%SNAPDATETIME%.zip
-)
-
-
-REM Remove old links and create the "-latest links"
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% "rm -f" %REMOTE_PATH%/php-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.zip >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% "rm -f" %REMOTE_PATH%/php-debug-pack-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.zip  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% "rm -f" %REMOTE_PATH%/php-test-pack-%_PHPVERSION_SHORT%-latest.zip  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% "rm -f" %REMOTE_PATH%/compile-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% "rm -f" %REMOTE_PATH%/buildconf-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% "rm -f" %REMOTE_PATH%/configure-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% "rm -f"  %REMOTE_PATH%/cache.info  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-
-SET VERSION_INFO=%_PHPVERSION_STRING%%NTS_POSTFIX%-Win32
-
-IF "%PHP_VERSION%"=="5.2" GOTO OLD_NAMING
-
-:CLEAN_NAMING
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/php-%VERSION_INFO%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.zip %REMOTE_PATH%/php-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.zip >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/php-debug-pack-%VERSION_INFO%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.zip %REMOTE_PATH%/php-debug-pack-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.zip  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/php-test-pack-%_PHPVERSION_STRING%-%SNAPDATETIME%.zip %REMOTE_PATH%/php-test-pack-%_PHPVERSION_SHORT%-latest.zip  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/compile-%PHP_VERSION%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log %REMOTE_PATH%/compile-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/buildconf-%PHP_VERSION%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log %REMOTE_PATH%/buildconf-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/configure-%PHP_VERSION%-%VC_VERS%-%ARCH%%NTS_POSTFIX%-%SNAPDATETIME%.log %REMOTE_PATH%/configure-%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-latest.log  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-
-SET PHP_ZIP_FILE=%PHP_BUILD_DIR%\php-%VERSION_INFO%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.zip
-GOTO INSTALLER
-
-:OLD_NAMING
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/php-%VERSION_INFO%-%SNAPDATETIME%.zip %REMOTE_PATH%/php-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.zip >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/php-debug-pack-%VERSION_INFO%-%SNAPDATETIME%.zip %REMOTE_PATH%/php-debug-pack-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.zip  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/compile-%PHP_VERSION%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log %REMOTE_PATH%/compile-%PHP_VERSION%-%VC_VERS%-%ARCH%-latest.log  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/buildconf-%PHP_VERSION%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log %REMOTE_PATH%/buildconf-%PHP_VERSION%-%VC_VERS%-%ARCH%-latest.log  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/configure-%PHP_VERSION%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log %REMOTE_PATH%/configure-%PHP_VERSION%-%VC_VERS%-%ARCH%-latest.log  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-
-SET PHP_ZIP_FILE=%PHP_BUILD_DIR%\php-%VERSION_INFO%-%SNAPDATETIME%.zip
-GOTO INSTALLER
-
-
-:INSTALLER
-echo ************************ 3
-IF "%USE_INSTALLER%"=="Yes" (
-	echo ************************ 3.1 installer
-	FOR %%A IN (%PHP_ZIP_FILE%) DO (
-		echo snapshot_installer.bat %PHP_VERSION%.0 %NTS% %VC_VERS% %ARCH% %%~fA
-		CALL snapshot_installer.bat %PHP_VERSION%.0 %NTS% %VC_VERS% %ARCH% %%~fA >> %LOG_DIR%\msi_%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log 2<&1
-	)
-)
-
-FOR %%A IN (%PHP_BUILD_DIR%\*.msi) DO (
-	echo Copying %%~nA.msi ...
-	"%PUTTYBASE%pscp.exe" -batch -q -i %SSH_KEY% -l %SSH_USER% %PHP_BUILD_DIR%\%%~nA.msi %SSH_URL%:%REMOTE_PATH%/%%~nA.msi >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log 2<&1
-	"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% rm %REMOTE_PATH%/php-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.msi >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log 2<&1
-	"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% ln -s %REMOTE_PATH%/%%~nA.msi %REMOTE_PATH%/php-%PHP_VERSION%%NTS_POSTFIX%-win32-%VC_VERS%-%ARCH%-latest.msi >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%VC_VERS%-%ARCH%-%SNAPDATETIME%.log 2<&1
-)
-
-"%PUTTYBASE%plink.exe" -i %SSH_KEY% -l %SSH_USER% %SSH_HOST% "sha1sum %REMOTE_PATH%/*-latest.zip %REMOTE_PATH%/*-latest.msi > %REMOTE_PATH%/sha1sum.txt"  >> %LOG_DIR%\scp_%PHP_VERSION%%NTS_POSTFIX%-%SNAPDATETIME%.log 2<&1
-
-echo ************************ 4
-GOTO EXIT
-	
-:HELP
-ECHO snapshot ^<VC version^> ^<branch/tag^> ^<destination^>
-GOTO EXIT
-
-:ALREADY_DONE
-ECHO Snapshot for %DIRNAME% already done
-
-
-:EXIT
-del %PHP_SDK_PATH%\snaps.lock
-
-FOR /D %%A IN (*.last) DO (
-	DEL %%A
-)
-
-REM Set the last "snap"
-echo %DIRNAME% > %DIRNAME%.last
-
-:EXIT_LOCKED
-cd %START%
-
-SET LIB=%OLD_LIB%
-SET INCLUDE=%OLD_INCLUDE%
-SET PATH=%OLD_PATH%
-
-SET BRANCH=
-SET DEST=
-SET DIRNAME=
-SET USE_CVS=
-SET LOG_DIR=
-SET NTS_POSTFIX=
-SET PHP_BUILD_DIR=
-SET PHP_EXE=
-SET PHP_VERSION=
-SET SSH_URL=
-SET START=
-SET VC=
-SET ZIP_PATH=

bin/snapshot_5_2.bat

@@ -1,30 +0,0 @@
-@ECHO OFF
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-
-REM change the drive
-%~d0
-
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-
-
-IF "%1" == "" (
-	SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --with-snapshot-template=%PHP_SDK_PATH%\snap_5_2\vc6\x86\template  --with-php-build=%PHP_SDK_PATH%\snap_5_2\vc6\x86\php_build --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared 
-)
-
-IF "%1" == "ts" (
-	SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --with-snapshot-template=%PHP_SDK_PATH%\snap_5_2\vc6\x86\template  --with-php-build=%PHP_SDK_PATH%\snap_5_2\vc6\x86\php_build --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared 
-)
-
-IF "%1" == "nts" (
-	SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --disable-zts --disable-isapi --with-snapshot-template=%PHP_SDK_PATH%\snap_5_2\vc6\x86\template  --with-php-build=%PHP_SDK_PATH%\snap_5_2\vc6\x86\php_build --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared 
-)
-
-SET PHP_MODULE=php5
-
-IF "%2" == "" (
-	CD %PHP_SDK_PATH%\snap_5_2\sources
-	CALL snapshot_src_download.bat 5.2
-)
-
-CD %PHP_SDK_PATH%\snap_5_2\vc6\x86
-CALL snapshot.bat 6 5.2 snap52_vc6 %PHP_SDK_PATH%\snap_5_2\sources\php-5.2-src-latest.zip %4

bin/snapshot_5_2_all.bat

@@ -1,13 +0,0 @@
-@ECHO OFF
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-
-REM change the drive
-%~d0
-
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-
-CD %PHP_SDK_PATH%\snap_5_2\sources
-CALL snapshot_src_download.bat 5.2
-
-CMD /C snapshot_5_2.bat ts nodownload no msi
-CMD /C snapshot_5_2.bat nts nodownload no msi

bin/snapshot_5_3.bat

@@ -1,28 +0,0 @@
-@ECHO OFF
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-
-REM change the drive
-%~d0
-
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-
-SET PHP_MODULE=php5
-
-IF "%1" == "" (
-	SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --disable-isapi --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared
-)
-IF "%1" == "ts" (
-	SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --disable-isapi --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared
-)
-
-IF "%1" == "nts" (
- 	SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --disable-zts --disable-isapi --disable-nsapi --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared
-)
-
-IF "%2" == "" (
-	CD %PHP_SDK_PATH%\snap_5_3\sources
-	CALL snapshot_src_download.bat 5.3
-)
-
-CD %PHP_SDK_PATH%\snap_5_3\vc6\x86
-CALL snapshot.bat 6 5.3 snap53_vc6 %PHP_SDK_PATH%\snap_5_3\sources\php-5.3-src-latest.zip %4

bin/snapshot_5_3_all.bat

@@ -1,14 +0,0 @@
-@ECHO OFF
-
-SET OLDPATH=%PATH%
-CALL d:\php-sdk\rmtools\bin\snap.bat d:\php-sdk\rmtools\config\php53vc9x86.ini
-SET PATH=%OLDPATH%
-SET OLDPATH=%PATH%
-CALL d:\php-sdk\rmtools\bin\snap.bat d:\php-sdk\rmtools\config\php53ntsvc9x86.ini
-SET PATH=%OLDPATH%
-SET OLDPATH=%PATH%
-CALL d:\php-sdk\rmtools\bin\snap.bat d:\php-sdk\rmtools\config\php53vc6x86.ini
-SET PATH=%OLDPATH%
-SET OLDPATH=%PATH%
-CALL d:\php-sdk\rmtools\bin\snap.bat d:\php-sdk\rmtools\config\php53ntsvc6x86.ini
-SET PATH=%OLDPATH%

bin/snapshot_5_3_all.bat.oldsnap

@@ -1,15 +0,0 @@
-@ECHO OFF
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-
-REM change the drive
-%~d0
-
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-
-CD %PHP_SDK_PATH%\snap_5_3\sources
-CALL snapshot_src_download.bat 5.3
-
-CMD /C snapshot_5_3_vc9.bat ts nodownload no msi
-CMD /C snapshot_5_3_vc9.bat nts nodownload no msi
-CMD /C snapshot_5_3.bat ts nodownload no msi
-CMD /C snapshot_5_3.bat nts nodownload no msi

bin/snapshot_5_3_vc9.bat

@@ -1,30 +0,0 @@
-@ECHO OFF
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-
-REM change the drive
-%~d0
-
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-
-CD %PHP_SDK_PATH%\php_5_3\vc9\x86
-
-IF "%1" == "" (
-	SET CONFIGURE_ARGS=--enable-snapshot-build --disable-isapi --enable-debug-pack --disable-isapi  --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared --with-enchant=shared
-)
-IF "%1" == "ts" (
-	SET CONFIGURE_ARGS=--enable-snapshot-build --disable-isapi --enable-debug-pack --disable-isapi  --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared --with-enchant=shared
-)
-
-IF "%1" == "nts" (
- 	SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --disable-zts --disable-isapi  --disable-nsapi --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared --with-enchant=shared
-)
-
-SET PHP_MODULE=php5
-
-IF "%2" == "" (
-	CD %PHP_SDK_PATH%\snap_5_3\sources
-	CALL snapshot_src_download.bat 5.3
-)
-
-CD %PHP_SDK_PATH%\snap_5_3\vc9\x86
-CALL snapshot.bat 9 5.3 snap53_vc9 %PHP_SDK_PATH%\snap_5_3\sources\php-5.3-src-latest.zip  %4

bin/snapshot_5_3_vc9x64.bat

@@ -1,25 +0,0 @@
-@ECHO OFF
-REM %VC9_SHELL%
-
-REM CD "C:\Program Files\Microsoft SDKs\Windows\v6.1\"
-REM CALL "C:\Program Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd" /x86 /xp /release
-
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-
-REM change the drive
-%~d0
-
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-
-SET CONFIGURE_ARGS=--enable-snapshot-build --enable-debug-pack --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared --with-enchant=shared
-SET PHP_MODULE=php5
-
-CD %PHP_SDK_PATH%\snap_5_3\sources
-CALL snapshot_src_download.bat 5.3
-
-REM XP is the minimum version we support
-REM setenv /x86 /xp /release
-
-CD %PHP_SDK_PATH%\snap_5_3\vc9\x64
-CALL snapshot.bat 9x64 PHP_5_3 snap53_vc9x64 %PHP_SDK_PATH%\snap_5_3\sources\php-5.3-src-latest.zip
-

bin/snapshot_6_0.bat

@@ -1,31 +0,0 @@
-@ECHO OFF
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-
-REM change the drive
-%~d0
-
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-
-SET PHP_MODULE=HEAD
-
-IF "%1" == "" (
-	SET CONFIGURE_ARGS=--enable-snapshot-build --disable-isapi --enable-debug-pack --without-sqlite  --without-apache-hooks --without-static-icu  --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared
-)
-IF "%1" == "ts" (
-	SET CONFIGURE_ARGS=--enable-snapshot-build --disable-isapi --enable-debug-pack --without-sqlite  --without-apache-hooks --without-static-icu  --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared
-)
-
-IF "%1" == "nts" (
- 	SET CONFIGURE_ARGS=--enable-snapshot-build --disable-zts --without-sqlite --disable-isapi  --without-apache-hooks --enable-debug-pack --without-static-icu  --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared
-)
-
-SET OLD_PATH=%PATH%
-SET PATH=%PATH%;%PHP_SDK_PATH%\snap_6_0\vc6\x86\deps\bin
-
-IF "%2" == "" (
-	CD %PHP_SDK_PATH%\snap_6_0\sources
-	CALL snapshot_src_download.bat 6.0
-)
-
-CD %PHP_SDK_PATH%\snap_6_0\vc6\x86
-CALL snapshot.bat 6 6.0 snap60_vc6 %PHP_SDK_PATH%\snap_6_0\sources\php-6.0-src-latest.zip %4

bin/snapshot_6_0_all.bat

@@ -1,15 +0,0 @@
-@ECHO OFF
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-
-REM change the drive
-%~d0
-
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-
-CD %PHP_SDK_PATH%\snap_6_0\sources
-CALL snapshot_src_download.bat 6.0
- 
-CMD /C snapshot_6_0_vc9.bat ts nodownload no msi
-CMD /C snapshot_6_0_vc9.bat nts nodownload no msi
-REM CMD /C snapshot_6_0.bat ts nodownload no msi
-REM CMD /C snapshot_6_0.bat nts nodownload no msi

bin/snapshot_6_0_vc9.bat

@@ -1,32 +0,0 @@
-@ECHO OFF
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-
-REM change the drive
-%~d0
-
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-
-SET PHP_MODULE=HEAD
-
-IF "%1" == "" (
-	SET CONFIGURE_ARGS=--enable-snapshot-build --disable-isapi --enable-debug-pack --without-static-icu  --without-sqlite --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared
-)
-
-IF "%1" == "ts" (
-	SET CONFIGURE_ARGS=--enable-snapshot-build --disable-isapi --enable-debug-pack --without-static-icu  --without-sqlite --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared
-)
-
-IF "%1" == "nts" (
- 	SET CONFIGURE_ARGS=--enable-snapshot-build --disable-zts --disable-isapi --enable-debug-pack --without-static-icu --without-sqlite --with-pdo-oci=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=D:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=D:\php-sdk\oracle\instantclient11\sdk,shared
-)
-
-SET OLD_PATH=%PATH%
-SET PATH=%PATH%;%PHP_SDK_PATH%\snap_6_0\vc9\x86\deps\bin
-
-IF "%2" == "" (
-	CD %PHP_SDK_PATH%\snap_6_0\sources
-	CALL snapshot_src_download.bat 6.0
-)
-
-CD %PHP_SDK_PATH%\snap_6_0\vc9\x86
-CALL snapshot.bat 9 6.0 snap60_vc9 %PHP_SDK_PATH%\snap_6_0\sources\php-6.0-src-latest.zip %4

bin/snapshot_installer.bat

@@ -1,124 +0,0 @@
-@echo off
-goto old
-IF "%1"=="" GOTO HELP
-IF "%2"=="" GOTO HELP
-
-IF NOT EXIST %1% (
-	echo ^<%1^> does not exist
-	GOTO EXIT
-)
-
-IF NOT EXIST %2% (
-	echo ^<%2^> does not exist
-	GOTO EXIT
-)
-
-IF "%3%"=="VC9" (
-	if "%4%"== "x64"  set includevc9msm="x86_x64"
-	if "%4%"=="x86" set includevc9msm="x86"
-	if "%4%"=="" set includevc9msm="x86"
-)
-:old
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-SET START=%CD%
-REM change the drive
-%~d0
-echo %PHP_SDK_SCRIPT_PATH%
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-
-SET PHP_INSTALLER_PATH=%PHP_SDK_SCRIPT_PATH%..\win-installer
-SET A=%~n5
-SET MSI_PATH=%A%.msi
-cd %PHP_INSTALLER_PATH%
-IF EXIST Files RD /Q /S Files
-echo %5
-unzip -o -qq -d Files %5
-
-SET php_exe=Files\php.exe
-
-copy %PHP_SDK_SCRIPT_PATH%..\template\php_manual_en.chm Files\
-
-echo generating ... %MSI_PATH%
-
-set phpver=%1
-set phpver=%phpver:~0,3%
-set phpver=%phpver:.=%
-
-echo Building ExtensionsFeatures.wxs
-copy ExtensionsFeatures%phpver%.wxs ExtensionsFeatures.wxs
-
-set suffix=
-set extrants=
-set extrasnaps=
-set buildtype="VC6-x86"
-set includevc9msm=
-
-if (%2)==() goto build
-if %2==nts set extrants="nts-"
-if %2==nts set suffix=NTS
-if %2==VC9 set buildtype="VC9-x86"
-if %2==VC9 set includeVC9msm="x86"
-if %2==x64 set buildtype="VC9-x64"
-if %2==x64 set includeVC9msm="x86_x64"
-if %2==snapshot set extrasnaps="-latest"
-
-if (%3)==() goto build
-if %3==nts set extrants="nts-"
-if %3==nts set suffix=NTS
-if %3==VC9 set buildtype="VC9-x86"
-if %3==VC9 set includeVC9msm="x86"
-if %3==x64 set buildtype="VC9-x64"
-if %3==x64 set includeVC9msm="x86_x64"
-if %3==snapshot set extrasnaps="-latest"
-
-if (%4)==() goto build
-if %4==nts set extrants="nts-"
-if %4==nts set suffix="NTS"
-if %4==VC9 set buildtype="VC9-x86"
-if %4==VC9 set includeVC9msm="x86"
-if %4==x64 set buildtype="VC9-x64"
-if %4==x64 set includeVC9msm="x86_x64"
-if %4==snapshot set extrasnaps="-latest"
-echo WebServerConfig%phpver%%suffix%.wxs ****
-echo %phpver% %suffix%
-
-:build
-set msiname="%MSI_PATH%"
-
-echo Building ExtensionsFeatures.wxs
-copy ExtensionsFeatures%phpver%.wxs ExtensionsFeatures.wxs
-
-echo Building ExtensionsComponents.wxs
-%php_exe% GenExtensionsComponents.wxs.php "%phpver%"
-
-echo Building PHPInstaller%1.wxs
-%php_exe% GenPHPInstaller.wxs.php "PHPInstallerBase%phpver%%suffix%.wxs" "%1" "%includevc9msm%"
-
-echo Building WebServerConfig%1.wxs
-copy WebServerConfig%phpver%%suffix%.wxs WebServerConfig%1.wxs
-
-echo Compiling UI....
-Wix\candle.exe -out PHPInstallerCommon.wixobj PHPInstallerCommon%suffix%%phpver%.wxs
-
-echo Building UI....
-Wix\lit.exe -out PHPInstallerCommon.wixlib PHPInstallerCommon.wixobj 
-
-echo Compiling Installer....
-Wix\candle.exe ExtensionsComponents.wxs ExtensionsFeaturesBuild.wxs WebServerConfig%1.wxs PHPInstaller%1.wxs 
-
-echo Linking Installer....
-Wix\light.exe -out "%msiname%" ExtensionsComponents.wixobj ExtensionsFeaturesBuild.wixobj WebServerConfig%1.wixobj PHPInstaller%1.wixobj PHPInstallerCommon.wixlib -loc WixUI_en-us.wxl
-
-
-
-copy %msiname% %~dp5
-del %msiname%
-
-GOTO EXIT
-:help
-ECHO snapshot_installer ^<php dist files^> ^<destination directory^>
-echo                    create the MSI file using the php version, architecture and compiler information
-GOTO EXIT
-
-:EXIT
-CD %START%

bin/snapshot_src_download.bat

@@ -1,41 +0,0 @@
-@ECHO OFF
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-ECHO %PHP_SDK_SCRIPT_PATH%
-
-REM change the drive
-%~d0
-
-IF "%1"=="5.2" GOTO DOWNLOAD
-IF "%1"=="5.3" GOTO DOWNLOAD
-IF "%1"=="6.0" GOTO DOWNLOAD
-
-GOTO USAGE
-
-:DOWNLOAD
-SET BRANCH=%1
-SET PHP_ARCHIVE_FILENAME=php-%BRANCH%-src-latest.zip
-
-IF EXIST %PHP_ARCHIVE_FILENAME% DEL %PHP_ARCHIVE_FILENAME%
-wget http://windows.php.net/downloads/snaps/php-%BRANCH%/%PHP_ARCHIVE_FILENAME%
-REM unzip -o -qq %PHP_ARCHIVE_FILENAME%
-
-REM Take the last one
-FOR /D %%A IN (php-%BRANCH%-src-*) DO (
-	SET DIRNAME=%%A
-)
-ECHO Downloaded: %DIRNAME%
-
-:DONE
-GOTO EXIT
-
-:USAGE
-echo Usage %~n0 ^<branch name^> (5.2 5.3 or 6.0)
-
-:EXIT
-SET A=
-SET N=
-SET BRANCH=
-SET PHP_ARCHIVE_FILENAME=
-SET DIRNAME=
-SET cnt=

bin/snapshot_trunk_all.bat

@@ -1,8 +0,0 @@
-@ECHO OFF
-
-SET OLDPATH=%PATH%
-CALL d:\php-sdk\rmtools\bin\snap.bat d:\php-sdk\rmtools\config\phptrunkvc9x86.ini
-SET PATH=%OLDPATH%
-SET OLDPATH=%PATH%
-CALL d:\php-sdk\rmtools\bin\snap.bat d:\php-sdk\rmtools\config\phptrunkntsvc9x86.ini
-SET PATH=%OLDPATH%

bin/test.bat

@@ -1,11 +0,0 @@
-@echo off
-set MY=Release\php-5.3.0alpha3-dev-nts-Win32-VC9-x86.zip
-
-FOR %%A IN (%MY%) DO echo %%~dpA
-set USE_INSTALLER=Yes
-IF %USE_INSTALLER%==Yes (
-	FOR  %%A IN (%MY%) DO (
-		echo snapshot_installer.bat %PHP_VERSION%.0 %NTS% %VC_VERS% %ARCH% %%~fA
-		REM CALL snapshot_installer.bat %PHP_VERSION%.0 %NTS% %VC_VERS% %ARCH% %%~dpA
-	)
-)

bin/testsnap53all.bat

@@ -1,27 +0,0 @@
-@ECHO OFF
-REM Run 5.3 Snapshots builds with VC9/VC6
-
-SET PHP_SDK_SCRIPT_PATH=%~dp0
-CALL %PHP_SDK_SCRIPT_PATH%\phpsdk_setvars.bat
-
-%~d0
-
-CD %PHP_SDK_PATH%\php_5_3\sources
-
-
-REM unzip -o -qq %PHP_SDK_PATH%\php_5_3\sources\php-5.3-src-latest.zip
-
-FOR /D %%A IN (php-?.?-src-*) DO (
-	SET DIRNAME=%%A
-)
-ECHO Using %DIRNAME% ...
-
-FOR /D %%A IN (php-?.?-src-*) DO (
-	SET DIRNAME=%%A
-)
-FOR /D %%A IN (php-?.?-src-*) DO (
-	SET DIRNAME=%%A
-)
-
-FOR /F "tokens=4 delims=-" %%A IN ("%DIRNAME%") DO ECHO %%A
-REM snapshot_src_download.bat 5.3

bin/yacc

@@ -1,2 +0,0 @@
-#! /bin/sh
-exec 'c:/progra~1/bison/bin/bison' -y "$@"

doc/phpsdk-local.bat.example

@@ -0,0 +1,20 @@
+@echo off
+
+set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=test password=test
+set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=test password=test
+
+set PHP_SDK_FIREBIRD_PATH=
+if "%PHP_SDK_ARCH%"=="x64" (
+	set PHP_SDK_FIREBIRD_PATH=E:\local_programs\Firebird-2.5.5.26952-0_x64\bin;
+ 	set PDO_FIREBIRD_TEST_DSN=firebird:dbname=127.0.0.1:E:\local_programs\Firebird-2.5.5.26952-0_x64\examples\empbuild\EMPLOYEE.FDB
+ 	set PDO_FIREBIRD_TEST_USER=SYSDBA
+ 	set PDO_FIREBIRD_TEST_PASS=masterkey
+)
+set PATH=%PHP_SDK_FIREBIRD_PATH%%PATH%
+
+set ODBC_TEST_USER=php_test2
+set ODBC_TEST_PASS=php_test2
+set ODBC_TEST_DSN=Driver={SQL Server};Server={W530-PHP-DEV\TEST2014};Database={php_test2};uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
+
+set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
+

doc/phpsdk_pgo_prep_elevated.bat.example

@@ -0,0 +1,47 @@
+
+
+@echo off
+rem These are default ports for the servers used for the training. If these
+rem ports are changed in the config templates, the commands have to be
+rem adjusted as well. New servers have to be added here as well. Run this
+rem file on the elevated shell before starting the PGO environment setup
+rem using the relevant port numbers, especially for unattended PGO builds.
+rem We add opens inbound ports from the default PGO config templates and
+rem and the one increment by 1, just co cover a simple case the port number
+rem was incremented by the auto configuration.
+rem
+rem Alternatively, the firewall can be disabled on the build host.
+rem The commands to disable\enable firewall are
+rem netsh advfirewall set allprofiles state on
+rem netsh advfirewall set allprofiles state off
+@echo on
+
+rem NGINX
+netsh advfirewall firewall add rule name="NGINX for PGO" dir=in action=allow program="C:\php-snap-build\php-sdk\pgo\work\server\nginx\nginx.exe" profile=private
+for /l %%p in (8081, 1, 8091) do (
+	netsh advfirewall firewall add rule name="Open Port %%p for PHP PGO" dir=in action=allow protocol=TCP localport=%%p profile=private
+	netsh advfirewall firewall add rule name="Open Port %%p for PHP PGO" dir=in action=allow protocol=UDP localport=%%p profile=private
+)
+netsh advfirewall firewall add rule name="Open Port 80 for PHP PGO" dir=in action=allow protocol=TCP localport=80 profile=private
+netsh advfirewall firewall add rule name="Open Port 80 for PHP PGO" dir=in action=allow protocol=UDP localport=80 profile=private
+
+rem MariaDB
+netsh advfirewall firewall add rule name="MariaDB for PGO" dir=in action=allow program="c:\php-snap-build\php-sdk\pgo\work\server\mariadb\bin\mysqld.exe" profile=private
+netsh advfirewall firewall add rule name="Open Port 3307 for PHP PGO" dir=in action=allow protocol=TCP localport=3307 profile=private
+netsh advfirewall firewall add rule name="Open Port 3307 for PHP PGO" dir=in action=allow protocol=UDP localport=3307 profile=private
+netsh advfirewall firewall add rule name="Open Port 3308 for PHP PGO" dir=in action=allow protocol=TCP localport=3308 profile=private
+netsh advfirewall firewall add rule name="Open Port 3308 for PHP PGO" dir=in action=allow protocol=UDP localport=3308 profile=private
+
+rem Postgres
+netsh advfirewall firewall add rule name="Open Port 5434 for PHP PGO" dir=in action=allow protocol=TCP localport=5434 profile=private
+netsh advfirewall firewall add rule name="Open Port 5434 for PHP PGO" dir=in action=allow protocol=UDP localport=5434 profile=private
+netsh advfirewall firewall add rule name="Open Port 5435 for PHP PGO" dir=in action=allow protocol=TCP localport=5435 profile=private
+netsh advfirewall firewall add rule name="Open Port 5435 for PHP PGO" dir=in action=allow protocol=UDP localport=5435 profile=private
+
+rem PHP
+netsh advfirewall firewall add rule name="Open Port 9001 for PHP PGO" dir=in action=allow protocol=TCP localport=9001 profile=private
+netsh advfirewall firewall add rule name="Open Port 9001 for PHP PGO" dir=in action=allow protocol=UDP localport=9001 profile=private
+netsh advfirewall firewall add rule name="Open Port 9002 for PHP PGO" dir=in action=allow protocol=TCP localport=9002 profile=private
+netsh advfirewall firewall add rule name="Open Port 9002 for PHP PGO" dir=in action=allow protocol=UDP localport=9002 profile=private
+
+

doc/task.c

@@ -0,0 +1,72 @@
+/**
+ * Run the passed command line hidden, suitable for a scheduled task.
+ * Author: Anatol Belski <ab@php.net>
+ * License: BSD 2-Clause
+ */
+
+#include <windows.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define CMD_PRE "cmd.exe /c "
+#define CMD_PRE_LEN (sizeof(CMD_PRE)-1)
+
+#ifdef DEBUG
+int
+main(int argc, char **argv)
+#else
+int
+APIENTRY WinMain(HINSTANCE inst, HINSTANCE prev_inst, LPTSTR in_cmd, int show)
+#endif
+{
+	STARTUPINFO si;
+	PROCESS_INFORMATION pi;
+	DWORD exit_code;
+
+	char *cmd = NULL;
+	size_t cmd_len = 0, arg_len = 0;
+	char *arg = strchr(GetCommandLine(), ' ');
+
+	if (!arg) {
+		return 3;
+	}
+#ifdef DEBUG
+	printf("passed cmd: '%s'\n", arg);
+#endif
+
+	arg_len = strlen(arg);
+	cmd_len = CMD_PRE_LEN + arg_len + 1;
+
+	cmd = malloc(cmd_len * sizeof(char));
+	memmove(cmd, CMD_PRE, CMD_PRE_LEN);
+	memmove(cmd + CMD_PRE_LEN, arg, arg_len);
+	cmd[cmd_len-1] = '\0';
+#ifdef DEBUG
+	printf("constructed cmd: '%s'\n", cmd);
+#endif
+
+	ZeroMemory( &si, sizeof(si) );
+	si.cb = sizeof(si);
+	si.dwFlags = STARTF_USESHOWWINDOW;
+	si.wShowWindow = SW_HIDE;
+	ZeroMemory( &pi, sizeof(pi) );
+
+	if (CreateProcess(NULL, cmd, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) {
+		CloseHandle( pi.hThread );
+	} else {
+		free(cmd);
+		printf( "Error: CreatePracess 0x%08lx \n", GetLastError() );
+		return 3;
+	}
+
+	WaitForSingleObject( pi.hProcess, INFINITE );
+
+	GetExitCodeProcess(pi.hProcess, &exit_code);
+
+	CloseHandle( pi.hProcess );
+
+	free(cmd);
+
+	return exit_code;
+}
+

doc/unattended-build-task.bat.example

@@ -0,0 +1,26 @@
+
+rem Task batch example.
+rem Create a task, put an action with the following data:
+rem Action: start a program
+rem Program/script: C:\php-sdk\bin\task.exe
+rem Add arguments: "C:\php-sdk\phpsdk-starter.bat -c vc15 -a x64 -t C:\php-sdk\unattended-build-task.bat"
+rem Run the task
+
+set LOG_NAME=%PHP_SDK_VC%-%PHP_SDK_ARCH%-task.log
+
+pushd C:\php-sdk\php72\vc14\x64\php-src
+
+git pull --rebase > %LOG_NAME% 2>&1
+
+call phpsdk_deps -u -s staging >> %LOG_NAME% 2>&1
+
+call buildconf >> %LOG_NAME% 2>&1
+call configure --enable-snapshot-build --enable-debug-pack >> %LOG_NAME% 2>&1
+
+nmake clean >> %LOG_NAME% 2>&1
+nmake >> %LOG_NAME% 2>&1
+
+popd
+
+exit
+