Commit: f7a8446256ff315e94c58b383f9a4d607f76c654
Author: Anatol Belski <[email protected]> Wed, 16 Nov 2016 20:57:12 +0100
Parents: 773e7f70dbad6925070dacf9b47c3e2828db1691
Branches: master
Link:
http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=f7a8446256ff315e94c58b383f9a4d607f76c654
Log:
basic rewrite of snap.bat
Changed paths:
M bin/pecl.bat
M bin/snap.bat
diff --git a/bin/pecl.bat b/bin/pecl.bat
index d9ede9c..b281a93 100644
--- a/bin/pecl.bat
+++ b/bin/pecl.bat
@@ -19,7 +19,7 @@ GOTO EXIT_LOCKED
:skip_help
-if not exist "%PHP_SDK_ROOT_PATH%\data\config\credentials_ftps.php" (
+if not exist "%PHP_RMTOOLS_ROOT_PATH%\data\config\credentials_ftps.php" (
echo FTP config %PHP_SDK_ROOT_PATH%\data\config\credentials_ftps.php
not found
exit /b 3
)
diff --git a/bin/snap.bat b/bin/snap.bat
index a15b7c8..e52a822 100644
--- a/bin/snap.bat
+++ b/bin/snap.bat
@@ -1,103 +1,18 @@
@ECHO OFF
-SET BAT_DIR=%~dp0
-REM --------VC9--------------
-REM SET PSDK_61_DIR=C:\Program Files\Microsoft SDKs\Windows\v6.1
-REM SET VC9_DIR=C:\Program Files (x86)\Microsoft Visual Studio 9.0
-REM SET VC9_SHELL=C:\WINDOWS\system32\cmd.exe /E:ON /V:ON /T:0E /K "C:\Program
Files\Microsoft SDKs\Windows\v6.1\Bin\SetEnv.Cmd"
-REM SET
VC9_INCLUDE=%PSDK_61_DIR%\include;%VC9_DIR%\VC\ATLMFC\INCLUDE;%VC9_DIR%\VC\INCLUDE
-REM SET VC9_LIB=%PSDK_61_DIR%\lib;%VC9_DIR%\VC\ATLMFC\LIB;%VC9_DIR%\VC\LIB
-REM SET
VC9_PATH=%VC9_DIR%\Common7\IDE;%VC9_DIR%\VC\BIN;%VC9_DIR%\Common7\Tools;%VC9_DIR%\VC\VCPackages;%PSDK_61_DIR%\bin;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem
+rem must be on the env already
+if "%PHP_SDK_ROOT_PATH%"=="" (
+ echo PHP SDK is not setup
+ exit /b 3
+)
+call %~dp0rmtools_setvars.bat
-REM SET VC9_X64_INCLUDE=%VC9_DIR%\VC\Include;C:\Program Files\Microsoft
SDKs\Windows\v6.1\Include;C:\Program Files\Microsoft
SDKs\Windows\v6.1\Include\gl;%VC9_DIR%VC\ATLMFC\INCLUDE;
-REM SET VC9_X64_LIB=%VC9_DIR%\VC\Lib\amd64;C:\Program Files\Microsoft
SDKs\Windows\v6.1\Lib\x64;%VC9_DIR%\VC\ATLMFC\LIB\AMD64;
-REM SET
VC9_X64_PATH=%VC9_DIR%\VC\Bin\x86_amd64;%VC9_DIR%\VC\Bin;%VC9_DIR%\VC\vcpackages;%VC9_DIR%\Common7\IDE;C:\Program
Files\Microsoft
SDKs\Windows\v6.1\Bin;C:\WINDOWS\Microsoft.NET\Framework64\v3.5;C:\WINDOWS\Microsoft.NET\Framework\v3.5;C:\WINDOWS\Microsoft.NET\Framework64\v2.0.50727;C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727;C:\Perl\site\bin;C:\Perl\bin;C:\Program
Files\PHP\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;c:\win2k3cd;C:\Program
Files\cvsnt;C:\Program Files\WinSCP\;C:\Program Files\CVSNT\
+if not exist "%PHP_RMTOOLS_ROOT_PATH%\data\config\credentials_ftps.php" (
+ echo FTP config %PHP_SDK_ROOT_PATH%\data\config\credentials_ftps.php
not found
+ exit /b 3
+)
-REM SET OLD_PATH=%PATH%
-REM SET PATH=%PATH%;%VC9_PATH%
-REM SET LIB=%VC9_LIB%
-REM SET INCLUDE=%VC9_INCLUDE%
-
-REM SET BISON_SIMPLE=c:\php-sdk\bin\bison.simple
-REM c:\php-sdk\php\php.exe -d extension_dir=c:\php-sdk\php\ext -d
extension=php_openssl.dll -d extension=php_curl.dll
%BAT_DIR%\..\script\snap.php %*
-REM SET PATH=%OLD_PATH%
-
-
-REM --------VC11--------------
-REM SET VC11_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual
Studio 11.0\VC\vcvarsall.bat"" x86
-
-REM SET PSDK_80_DIR=C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0
-REM SET VC11_DIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0
-
-REM SET VC11_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows
Kits\8.0\include\shared;C:\Program Files (x86)\Windows
Kits\8.0\include\um;C:\Program Files (x86)\Windows Kits\8.0\include\winrt;
-REM SET VC11_LIB=C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\8.0\lib\win8\um\x86;
-REM SET
LIBPATH=C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program
Files (x86)\Microsoft Visual Studio 11.0\VC\LIB;C:\Program Files
(x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows
Kits\8.0\References\CommonConfiguration\Neutral;C:\Program Files
(x86)\Microsoft
SDKs\Windows\v8.0\ExtensionSDKs\Microsoft.VCLibs\11.0\References\CommonConfiguration\neutral;
-REM SET INCLUDE=%VC11_INCLUDE%
-REM SET LIB=%VC11_LIB%
-
-REM SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\
-REM SET VisualStudioVersion=11.0
-REM SET VS110COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio
11.0\Common7\Tools\
-REM SET VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 11.0\
-REM SET DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio
11.0\Common7\IDE\
-REM SET ExtensionSdkDir=C:\Program Files (x86)\Microsoft
SDKs\Windows\v8.0\ExtensionSDKs
-REM SET WindowsSdkDir=C:\Program Files (x86)\Windows Kits\8.0\
-REM SET WindowsSdkDir_35=C:\Program Files (x86)\Microsoft
SDKs\Windows\v7.0A\Bin\
-REM SET WindowsSdkDir_old=C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\
-
-REM SET VC11_PATH=C:\Program Files (x86)\Microsoft Visual Studio
11.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files
(x86)\Microsoft SDKs\F#\3.0\Framework\v4.0\;C:\Program Files (x86)\Microsoft
Visual Studio 11.0\VSTSDB\Deploy;C:\Program Files (x86)\Microsoft Visual Studio
11.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio
11.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Program
Files (x86)\Microsoft Visual Studio 11.0\VC\VCPackages;C:\Program Files
(x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio
11.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows
Kits\8.0\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX
4.0 Tools;C:\Program Files (x86)\Microsoft
SDKs\Windows\v7.0A\Bin\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program
Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft
ASP.NET\ASP.NET WebPages\v1.0\;C:\Program Files\Microsoft SQL
Server\110\Tools\Binn\;C:\Program Files (x86)\Windows Kits\8.0\Windows
Performance Toolkit\
-REM SET OLD_PATH=%PATH%
-REM SET PATH=%PATH%;%VC11_PATH%
-
-REM SET VC11_X64_PATH=C:\Program Files (x86)\Microsoft Visual Studio
11.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files
(x86)\Microsoft Visual Studio
11.0\VC\BIN\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Windows\Microsoft.NET\Framework64\v3.5;C:\Program
Files (x86)\Microsoft Visual Studio 11.0\VC\VCPackages;C:\Program Files
(x86)\Microsoft Visual Studio 11.0\Common7\IDE;C:\Program Files (x86)\Microsoft
Visual Studio 11.0\Common7\Tools;C:\Program Files (x86)\HTML Help
Workshop;C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team
Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio
11.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows
Kits\8.0\bin\x64;C:\Program Files (x86)\Windows Kits\8.0\bin\x86;C:\Program
Files (x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX 4.0 Tools\x64;C:\Program
Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;C:\Program Files
(x86)\Microsoft SDKs\Windows\v8.0A\bin\NETFX4.0 Tools;C:\Program Files
(x86)\Microsoft
SDKs\Windows\v7.0A\Bin\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program
Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft
ASP.NET\ASP.NET Web Pages\v1.0\;C:\Program Files\Microsoft SQL
Server\110\Tools\Binn\;C:\Program Files (x86)\Windows Kits\8.0\Windows
Performance Toolkit\;C:\apps\apache24\php_deps
-REM SET VC11_X64_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows
Kits\8.0\include\shared;C:\Program Files (x86)\Windows
Kits\8.0\include\um;C:\Program Files (x86)\Windows Kits\8.0\include\winrt;
-REM SET VC11_X64_LIB=C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio
11.0\VC\ATLMFC\LIB\amd64;C:\Program Files (x86)\Windows
Kits\8.0\lib\win8\um\x64;
-REM SET
VC11_X64_LIBPATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Windows\Microsoft.NET\Framework64\v3.5;C:\Program
Files (x86)\Microsoft Visual Studio 11.0\VC\LIB\amd64;C:\Program Files
(x86)\Microsoft Visual Studio 11.0\VC\ATLMFC\LIB\amd64;C:\Program Files
(x86)\Windows Kits\8.0\References\CommonConfiguration\Neutral;C:\Program Files
(x86)\Microsoft
SDKs\Windows\v8.0\ExtensionSDKs\Microsoft.VCLibs\11.0\References\CommonConfiguration\neutral;
-REM SET VC11_X64_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual
Studio 11.0\VC\vcvarsall.bat"" amd64
-
-
-REM --------VC14--------------
-SET VC14_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\vcvarsall.bat"" x86
-SET PSDK_81_DIR=C:\Program Files (x86)\Windows Kits\8.1\
-SET VC14_DIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\
-
-SET DevEnvDir=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\
-SET VC14_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows
Kits\10\include\10.0.10240.0\ucrt;C:\Program Files (x86)\Windows
Kits\NETFXSDK\4.6.1\include\um;C:\Program Files (x86)\Windows
Kits\10\include\10.0.10240.0\shared;C:\Program Files (x86)\Windows
Kits\10\include\10.0.10240.0\um;C:\Program Files (x86)\Windows
Kits\10\include\10.0.10240.0\winrt;
-
-SET VC14_LIB=C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows
Kits\10\lib\10.0.10240.0\ucrt\x86;C:\Program Files (x86)\Windows
Kits\NETFXSDK\4.6.1\lib\um\x86;C:\Program Files (x86)\Windows
Kits\10\lib\10.0.10240.0\um\x86;
-
-SET LIBPATH=C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files
(x86)\Microsoft Visual Studio 14.0\VC\LIB;C:\Program Files (x86)\Microsoft
Visual Studio
14.0\VC\ATLMFC\LIB;References\CommonConfiguration\Neutral;\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral;
-
-SET INCLUDE=%VC14_INCLUDE%
-SET LIB=%VC14_LIB%
-
-SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-SET VisualStudioVersion=14.0
-SET UniversalCRTSdkDir=C:\Program Files (x86)\Windows Kits\10\
-SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\
-SET VS140COMNTOOLS=C:\Program Files (x86)\Microsoft Visual Studio
14.0\Common7\Tools\
-SET VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\
-SET WindowsSdkDir=C:\Program Files (x86)\Windows Kits\8.1\
-SET WindowsSDK_ExecutablePath_x64=C:\Program Files (x86)\Microsoft
SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\x64\
-SET WindowsSDK_ExecutablePath_x86=C:\Program Files (x86)\Microsoft
SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools\
-
-SET VC14_PATH=C:\Program Files (x86)\Microsoft Visual Studio
14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files
(x86)\MSBuild\14.0\bin;C:\Program Files (x86)\Microsoft Visual Studio
14.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio
14.0\Common7\Tools;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program
Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files
(x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio
14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows
Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX
4.6.1 Tools\;C:\Program Files (x86)\Mail
Enable\BIN;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program
Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft
ASP.NET\ASP.NET Web Pages\v1.0\;C:\Program Files\Microsoft SQL
Server\110\Tools\Binn\;C:\apps\bin;C:\Program Files\TortoiseSVN\bin;C:\Program
Files (x86)\Mail Enable\BIN64;C:\Program Files\Microsoft SQL
Server\120\Tools\Binn\;%USERPROFILE%\.dnx\bin;C:\Program Files\Microsoft
DNX\Dnvm\;C:\Program Files (x86)\Windows Kits\10\Windows Performance
Toolkit\;C:\Users\anatol\.dnx\bin;C:\Program Files (x86)\CMake 2.8\bin
-
-SET OLD_PATH=%PATH%
-SET PATH=%PATH%;%VC14_PATH%
-
-SET VC14_X64_PATH=C:\Program Files (x86)\Microsoft Visual Studio
14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files
(x86)\MSBuild\14.0\bin\amd64;C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\BIN\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program
Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files
(x86)\Microsoft Visual Studio 14.0\Common7\IDE;C:\Program Files (x86)\Microsoft
Visual Studio 14.0\Common7\Tools;C:\Program Files (x86)\HTML Help
Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team
Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio
14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows
Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files
(x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files
(x86)\Mail
Enable\BIN;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program
Files\Microsoft\Web Platform Installer\;C:\Program Files (x86)\Microsoft
ASP.NET\ASP.NET Web Pages\v1.0\;C:\Program Files\Microsoft SQL
Server\110\Tools\Binn\;C:\apps\bin;C:\Program Files\TortoiseSVN\bin;C:\Program
Files (x86)\Mail Enable\BIN64;C:\Program Files\Microsoft SQL
Server\120\Tools\Binn\;%USERPROFILE%\.dnx\bin;C:\Program Files\Microsoft
DNX\Dnvm\;C:\Program Files (x86)\Windows Kits\10\Windows Performance
Toolkit\;C:\Users\anatol\.dnx\bin;C:\Program Files (x86)\CMake 2.8\bin
-
-SET VC14_X64_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows
Kits\10\include\10.0.10240.0\ucrt;C:\Program Files (x86)\Windows
Kits\NETFXSDK\4.6.1\include\um;C:\Program Files (x86)\Windows
Kits\10\include\10.0.10240.0\shared;C:\Program Files (x86)\Windows
Kits\10\include\10.0.10240.0\um;C:\Program Files (x86)\Windows
Kits\10\include\10.0.10240.0\winrt;
-
-SET VC14_X64_LIB=C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\ATLMFC\LIB\amd64;C:\Program Files (x86)\Windows
Kits\10\lib\10.0.10240.0\ucrt\x64;C:\Program Files (x86)\Windows
Kits\NETFXSDK\4.6.1\lib\um\x64;C:\Program Files (x86)\Windows
Kits\10\lib\10.0.10240.0\um\x64;
-
-SET
VC14_X64_LIBPATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program
Files (x86)\Microsoft Visual Studio 14.0\VC\LIB\amd64;C:\Program Files
(x86)\Microsoft Visual Studio
14.0\VC\ATLMFC\LIB\amd64;References\CommonConfiguration\Neutral;\Microsoft.VCLibs\14.0\References\CommonConfiguration\neutral;
-SET VC14_X64_SHELL=%comspec% /k ""C:\Program Files (x86)\Microsoft Visual
Studio 14.0\VC\vcvarsall.bat"" amd64
-
-
-REM --------BUILD--------------
-SET BISON_SIMPLE=c:\php-sdk\bin\bison.simple
-c:\php-sdk\php\php.exe -d extension_dir=c:\php-sdk\php\ext -d
extension=php_openssl.dll -d extension=php_curl.dll
%BAT_DIR%\..\script\snap.php %*
-SET PATH=%OLD_PATH%
+@ECHO ON
+%PHP_SDK_PHP_CMD% %PHP_RMTOOLS_SCRIPT_PATH%\snap.php %*
+@ECHO OFF--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
